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: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.
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 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 [Mon, 18 Feb 2008 22:11:52 +0000 (23:11 +0100)]
src/configfile.c: Fix another access of free'd memory.
This led to a crash with the default config of the Debian package.
Florian Forster [Mon, 18 Feb 2008 22:10:52 +0000 (23:10 +0100)]
liboconfig: Make sure that option-strings can always be freed.
This resolved a nasty crash when including files.
Florian Forster [Mon, 18 Feb 2008 20:24:56 +0000 (21:24 +0100)]
Bumped version to 4.3.0; Updated ChangeLog.
Florian Forster [Mon, 18 Feb 2008 20:19:32 +0000 (21:19 +0100)]
exec plugin: Removed the Nagios logic from the plugin.
Instead point users to the `exec-nagios.px' script in collectd-exec(5).
Sebastian Harl [Sun, 17 Feb 2008 19:23:46 +0000 (20:23 +0100)]
migrate-3-4.px: Do not translate the disk names used by hddtemp.
In version 4, hddtemp still uses major/minor device numbers to identify disks.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Mon, 18 Feb 2008 19:53:54 +0000 (20:53 +0100)]
Merge branch 'collectd-4.2'
Florian Forster [Mon, 18 Feb 2008 19:53:44 +0000 (20:53 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Florian Forster [Mon, 18 Feb 2008 19:53:32 +0000 (20:53 +0100)]
Merge branch 'sh/hddtemp'
Sebastian Harl [Sun, 17 Feb 2008 19:22:49 +0000 (20:22 +0100)]
hddtemp plugin, collectd.conf(5): Added "TranslateDevicename" config option.
If enabled, translate the disk names to major/minor device numbers. For
backwards compatibility this defaults to true but it it recommended to disable
it as it will probably be removed in the next major version. Any other parts
of collectd have changed in a similar way with version 4.0, so hddtemp should
do so as well.
This option is disabled in new versions of the config file.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Mon, 18 Feb 2008 19:41:38 +0000 (20:41 +0100)]
rrdtool plugin: Sort the list of user defined `RRATimespan's.
This is required by the logic calculating the RRA sized.
Florian Forster [Mon, 18 Feb 2008 17:30:10 +0000 (18:30 +0100)]
Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
Sebastian Harl [Sat, 16 Feb 2008 13:09:36 +0000 (14:09 +0100)]
perl plugin: Do not abort while preparing the stack for a subroutine call.
Else the stack would probably be left in an inconsistent case and might even
leak memory.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sat, 16 Feb 2008 13:08:59 +0000 (14:08 +0100)]
collectd.conf(5): Added a note that libvirt's RefreshInterval may be disabled.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sat, 16 Feb 2008 13:08:24 +0000 (14:08 +0100)]
README: Added libxml2 to the list of prerequisites.
The libvirt plugin uses this library to parse data provided by libvirt.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sat, 16 Feb 2008 13:07:47 +0000 (14:07 +0100)]
README: Fixed a typo.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sat, 16 Feb 2008 13:07:18 +0000 (14:07 +0100)]
Updated collectd.conf.in.
* Missing plugins and config options have been added.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sat, 16 Feb 2008 13:06:25 +0000 (14:06 +0100)]
contrib/README: Removed the section about PerlLib/.
This subdirectory no longer exists - it has been moved to bindings/perl/.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Fri, 15 Feb 2008 07:04:47 +0000 (08:04 +0100)]
Makefile.am: Create `$(localstatedir)/log' so the logfile plugin works out-of-the-box.
And don't search for `.svn' directories anymore - they're long gone.
Florian Forster [Mon, 11 Feb 2008 11:47:18 +0000 (12:47 +0100)]
exec plugin: Changed the format in which notifications are passed to the programs.
Using a `Message:' header field restricts us to one-line messages, which is
probably not very farsighted.
Florian Forster [Mon, 11 Feb 2008 11:35:02 +0000 (12:35 +0100)]
exec plugin: Disabled the `NagiosExec' option.
All references to this option have been removed from the manpages, too.
Florian Forster [Mon, 11 Feb 2008 11:21:24 +0000 (12:21 +0100)]
collectd.conf(5), ChangeLog: Documented the new `Include' features.
Florian Forster [Mon, 11 Feb 2008 11:01:06 +0000 (12:01 +0100)]
src/configfile.c: Use wordexp(3) to expand shell wildcards if available.
Florian Forster [Mon, 11 Feb 2008 10:18:58 +0000 (11:18 +0100)]
contrib/migrate-3-4.px: Handle `hddtemp' graphs correctly.
Florian Forster [Sun, 10 Feb 2008 15:40:58 +0000 (16:40 +0100)]
contrib/exec-nagios.px: Added a Perl script which handles Nagios plugins.
It handles most of the Nagios plugin API, including multi-line output (a
Nagios 3 feature) and performance data. It's basic on purpose so that easy
stuff is possible but complex stuff is about as hard as rewriting the plugin ;)
Florian Forster [Sun, 10 Feb 2008 15:10:40 +0000 (16:10 +0100)]
contrib/exec-munin.px: Fix a typo in the config handling functions.
Florian Forster [Sat, 9 Feb 2008 17:07:08 +0000 (18:07 +0100)]
src/utils_ignorelist.c: Remove an annoying debug message.
Florian Forster [Sat, 9 Feb 2008 17:06:48 +0000 (18:06 +0100)]
configure: Fix a syntax error.
Florian Forster [Sat, 9 Feb 2008 16:46:48 +0000 (17:46 +0100)]
Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
Sebastian Harl [Tue, 5 Feb 2008 23:00:49 +0000 (00:00 +0100)]
configure: Correctly handle all cases when using AC_ARG_WITH().
In a lot of cases only "$withval" != "yes" and "no" had been handled when the
option had been given. Therefore, the option had been ignored if no argument
had been passed to the option, making --with-<option> and / or
--without-<option> a no-op. This patch fixes this issue.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 5 Feb 2008 21:26:23 +0000 (22:26 +0100)]
contrib/examples/: Added an example for a notification callback.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 5 Feb 2008 21:25:06 +0000 (22:25 +0100)]
collectd(1), README: Document notifications and related plugins.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 5 Feb 2008 09:45:42 +0000 (10:45 +0100)]
collectdmon(1): Added a section about supported signals.
Documented the effects of the SIGINT, SIGTERM and SIGHUP signals.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 5 Feb 2008 09:44:57 +0000 (10:44 +0100)]
README: Added "uuid" plugin to the list of available plugins.
* Added an optional dependency on libhal.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 5 Feb 2008 09:44:00 +0000 (10:44 +0100)]
README: Updated package description.
Added a note about the monitoring support (this has been copied from the
Debian package description).
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Sat, 9 Feb 2008 16:44:34 +0000 (17:44 +0100)]
src/configfile.c: Extend the `Include' statement to handle directories, too.
Directories are included recursively. Files and directories begnning with a dot
are ignored. Symlinks are followed. You can crash collectd by looping the
symlinks.
Sebastian Harl [Thu, 31 Jan 2008 21:21:41 +0000 (22:21 +0100)]
configure: Warn if librrd is not thread safe.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 29 Jan 2008 01:14:33 +0000 (02:14 +0100)]
plugin.c: Use an AVL tree to store the data sets.
The list of data sets is queried quite frequently but hardly ever modified.
Using an AVL tree instead of a linked list improves the search time from O(n)
to O(log n).
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 27 Jan 2008 22:26:41 +0000 (23:26 +0100)]
exec plugin: Fixed a possible (though very improbable) memory leak.
In case of an error, the program_list_and_notification_t pointer has not been
freed before calling pthread_exit() from exec_notification_one().
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 29 Jan 2008 01:12:17 +0000 (02:12 +0100)]
Collectd.pm: Use $interval_g instead of a hard-coded value.
The hard-coded value was still legacy code from the time before the global
variables have been exported to Perl.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 29 Jan 2008 01:11:00 +0000 (02:11 +0100)]
perl.c: Unregister notifications in perl_shutdown().
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 29 Jan 2008 01:10:13 +0000 (02:10 +0100)]
perl plugin: Fixed a bug in Collectd::plugin_unregister_data_set().
The function tried to access a nonexistent second argument.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Mon, 28 Jan 2008 11:23:55 +0000 (12:23 +0100)]
collectd-perl(5): Added documentation for the notification support.
Some minor errors have been fixed as well and the ChangeLog has been updated.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Mon, 28 Jan 2008 11:23:10 +0000 (12:23 +0100)]
perl plugin: Exported plugin_dispatch_notification() to Perl.
This adds the following function to collectd's Perl API:
Collectd::plugin_dispatch_notification:
submit a notification to collectd's notification mechanism
arguments:
notif - notification
A notification is a reference to a hash with the following members:
severity => $severity (default: NOTIF_FAILURE)
time => $time (default: time (NULL))
message => $msg
host => $host (default: hostname_g)
plugin => $plugin
type => $type
plugin_instance => $instance
type_instance => $type_instance
The severity should be any of the Collectd::NOTIF_* constants.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Mon, 28 Jan 2008 11:20:29 +0000 (12:20 +0100)]
perl plugin: Added support to dispatch notifications to Perl plugins.
Perl plugin may now register a callback of type Collectd::TYPE_NOTIF which
accepts a single hash argument with the following members:
severity
time
message
host
plugin
plugin_instance
type
type_instance
Severity may be any of the following values (exported by the "notif" tag):
Collectd::NOTIF_FAILURE
Collectd::NOTIF_WARNING
Collectd::NOTIF_OKAY
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 27 Jan 2008 22:04:13 +0000 (23:04 +0100)]
ChangeLog: Describe changes to the perl plugin in more detail.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 27 Jan 2008 15:13:44 +0000 (16:13 +0100)]
configure.in: Fixed handling of the --with-perl-bindings option.
This option could not be disabled so far as this case has not been handled in
the configure script. This patch fixes this issue.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Wed, 23 Jan 2008 19:54:10 +0000 (20:54 +0100)]
Merge branch 'collectd-4.2'
Florian Forster [Wed, 23 Jan 2008 19:53:57 +0000 (20:53 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Florian Forster [Wed, 23 Jan 2008 19:30:06 +0000 (20:30 +0100)]
network plugin: Have two different threads for handling incoming packets.
One that only receives and enqueues packets and one which parses the packets
and dispatches them to the daemon. This should solve problems with (too) short
socket buffers and (very) heavy load.
Florian Forster [Wed, 23 Jan 2008 18:28:38 +0000 (19:28 +0100)]
Collectd::Unixsock: Added license information.
The copyright information in some changed files has been updated, too.
Florian Forster [Wed, 23 Jan 2008 18:08:26 +0000 (19:08 +0100)]
TODO: Removed the remark about the `libvirt' plugin.
Now it builds flawlessly. Apparently it was some leftover file in my build tree
that caused this weird problem.
Florian Forster [Wed, 23 Jan 2008 17:17:01 +0000 (18:17 +0100)]
TODO: Updated the todo file.
Florian Forster [Wed, 23 Jan 2008 17:14:27 +0000 (18:14 +0100)]
src/utils_threshold.c: Implemented `warning' and `failure' thresholds.
The options `Min' and `Max' have been renamed to `FailureMin', `FailureMax',
`WarningMin', and `WarningMax'.
Florian Forster [Wed, 23 Jan 2008 16:32:56 +0000 (17:32 +0100)]
logfile plugin: Only print the host field (and other fields) of a notification if they hold any information.
Florian Forster [Wed, 23 Jan 2008 16:07:35 +0000 (17:07 +0100)]
exec plugin: Implemented the `PUTNOTIF' command for external applications, too.
Also changed the manpage so that lines without the `PUTVAL' are mentioned as
being deprecated.
Florian Forster [Wed, 23 Jan 2008 14:48:34 +0000 (15:48 +0100)]
Collectd::Unixsock: Added the `putnotif' method to dispatch notifications.
Florian Forster [Wed, 23 Jan 2008 13:54:54 +0000 (14:54 +0100)]
Merge branch 'collectd-4.2'
Florian Forster [Wed, 23 Jan 2008 13:54:41 +0000 (14:54 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Florian Forster [Wed, 23 Jan 2008 13:31:11 +0000 (14:31 +0100)]
collectd-unixsock(5): Copied Sebastian's additions from collectd-exec(5).
Florian Forster [Wed, 23 Jan 2008 13:27:05 +0000 (14:27 +0100)]
collectd-unixsock(5): Documented the PUTNOTIF command.
Florian Forster [Wed, 23 Jan 2008 12:57:29 +0000 (13:57 +0100)]
Merge branch 'collectd-4.1' of octo@verplant.org:/var/lib/git/collectd into collectd-4.1
Florian Forster [Wed, 23 Jan 2008 12:53:08 +0000 (13:53 +0100)]
src/common.h: Fixed many typos in the header file.
Florian Forster [Wed, 23 Jan 2008 12:52:38 +0000 (13:52 +0100)]
unixsock plugin: Imported the new `putnotif' command from the appropriate module.
Florian Forster [Wed, 23 Jan 2008 12:51:29 +0000 (13:51 +0100)]
src/utils_cmd_putnotif.[ch]: Added a new module which handles parsing of notifications from some command line or similar.
Of course, this is similar to the `utils_cmd_putval' module.
Florian Forster [Wed, 23 Jan 2008 12:47:53 +0000 (13:47 +0100)]
TODO: Updated the todo file.
Added the goal to remove the cache from the unixsock plugin.
Florian Forster [Wed, 23 Jan 2008 11:55:03 +0000 (12:55 +0100)]
src/liboconfig/parser.y: Updated copyright information.
Florian Forster [Wed, 23 Jan 2008 11:54:41 +0000 (12:54 +0100)]
src/{common,network}.[ch]: Updated copyright information.
Florian Forster [Wed, 23 Jan 2008 11:40:44 +0000 (12:40 +0100)]
TODO: Adjusted todo list.
Florian Forster [Wed, 23 Jan 2008 11:40:24 +0000 (12:40 +0100)]
network plugin: Added support for sending and receiving notifications.
Notifications are sent ``out of band'', i. e. each notification is one packet
and they are not mixed with performance data values.
Right now there is no configuration option to prevent listening sockets from
receiving notifications nor to prevent sending sockets from sending
notifications. This may be an option for the future, though.
Florian Forster [Wed, 23 Jan 2008 10:26:58 +0000 (11:26 +0100)]
src/utils_threshold.c: Check that the <Threshold> block does not have any arguments.
Florian Forster [Wed, 23 Jan 2008 10:22:53 +0000 (11:22 +0100)]
liboconfig: Allow the argument list of blocks to be empty.
This way the `<Threshold>' block doesn't need a bogus argument just to make the
parser happy.
Florian Forster [Wed, 23 Jan 2008 09:40:14 +0000 (10:40 +0100)]
collectd: Added ``associative'' members to the notification_t structure.
A notification does not need to be related to any performance data collected by
collectd, but now it *may* be related. This is used in the threshold stuff
already and passed via ExecNotification in the exec plugin, too.
The new `notification_init' function in `src/common.c' and the
`NOTIFICATION_INIT_VL' macro simplify the initialization of these new fields.
Florian Forster [Wed, 23 Jan 2008 08:42:33 +0000 (09:42 +0100)]
collectd.conf(5), collectd-exec(5): Documented the `NotificationExec' and `NagiosExec' options.
Florian Forster [Wed, 23 Jan 2008 08:34:02 +0000 (09:34 +0100)]
ChangeLog: Documented the new features in the master branch so far.
Also extended the TODO list a bit more, as things came to mind.
Florian Forster [Wed, 23 Jan 2008 08:33:12 +0000 (09:33 +0100)]
AUTHORS: Added Richard Jones.
Sebastian Harl [Tue, 22 Jan 2008 18:11:00 +0000 (19:11 +0100)]
Fixed some compiler warnings identified by gcc's -Wextra option.
The following issues have been addressed:
* comparison between signed and unsigned - this was found in several places
throughout the code and has been fixed in various ways
* missing initializer - an incomplete initializer has been used for two
struct instances in perl.c
* unused parameter - when applicable, the parameter has been removed; in
thirteen cases the parameter is required by different library API's and in
two cases the parameter was left in place to retain a consistent interface
within the affected modules; as __attribute__((unused)) is a GNU extension,
it has not been used to document those exceptions
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Tue, 22 Jan 2008 10:06:15 +0000 (11:06 +0100)]
apache plugin: Improved some error messages and fixed-buffer string copying.
Return an error when initialization fails. This includes the case when no URL
is configured. The user is informed about this as clear as possible.
Also, `strncpy' and `snprintf' now are followed by a forced NULL-termination of
the strings to be on the save side. This also changes the plugin to look more
like the other plugins which mostly do this already.
Sebastian Harl [Tue, 22 Jan 2008 08:34:03 +0000 (09:34 +0100)]
apache plugin: Do not initialize the plugin if no URL has been specified.
There is no need to initialize curl, if the plugin will not be used anyway.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Mon, 21 Jan 2008 17:30:48 +0000 (18:30 +0100)]
Merge branch 'pull/master'
Florian Forster [Mon, 21 Jan 2008 17:30:43 +0000 (18:30 +0100)]
Merge branch 'collectd-4.2'
Florian Forster [Mon, 21 Jan 2008 17:30:26 +0000 (18:30 +0100)]
Merge branch 'pull/collectd-4.2' into collectd-4.2
Florian Forster [Mon, 21 Jan 2008 17:29:34 +0000 (18:29 +0100)]
Merge branch 'ff/manpage'
Sebastian Harl [Sun, 20 Jan 2008 21:17:23 +0000 (22:17 +0100)]
types.db(5): Added a manpage documenting the format of the TypesDB file.
Appropriate pointers have been added to other manpages where appropriate.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Mon, 21 Jan 2008 17:28:51 +0000 (18:28 +0100)]
Merge branch 'collectd-4.2'
Florian Forster [Mon, 21 Jan 2008 17:28:27 +0000 (18:28 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Sebastian Harl [Fri, 18 Jan 2008 11:29:19 +0000 (12:29 +0100)]
collectd-exec(5): Improved description of the value-list identifier.
A short note about valid values for the plugin and type names and the
respective instance names as well as a pointer to types.db has been added.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Mon, 21 Jan 2008 17:27:16 +0000 (18:27 +0100)]
TODO: Added some notes on what needs to be done before 4.3
It's only what I had in mind right now and not a complete list.
Florian Forster [Mon, 21 Jan 2008 17:16:55 +0000 (18:16 +0100)]
collectd-exec(5): Documented the changes due to notifications and the Nagios plugin support.
Sebastian Harl [Sun, 20 Jan 2008 21:14:23 +0000 (22:14 +0100)]
Added support for more than one TypesDB file.
The "TypesDB" config option now accepts more than one filename. Each file will
be read in the specified order. If no filename has been given, the default
file will _not_ be read (I doubt this is a useful feature but it's imho the
most reasonable behavior).
This may, for example, be used to specify an additional file containing custom
data-set definitions. See the thread "Thought about exec and types.db" on the
mailing-list ([1]).
[1] http://mailman.verplant.org/pipermail/collectd/2008-January/001450.html
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Mon, 21 Jan 2008 10:12:50 +0000 (11:12 +0100)]
Merge branch 'pull/master'
Florian Forster [Mon, 21 Jan 2008 10:12:29 +0000 (11:12 +0100)]
Merge branch 'collectd-4.2'
Florian Forster [Mon, 21 Jan 2008 10:01:03 +0000 (11:01 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Sebastian Harl [Sun, 20 Jan 2008 22:11:53 +0000 (23:11 +0100)]
network plugin: Made network_receive() static.
This function is not exported to any other module.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 20 Jan 2008 21:54:55 +0000 (22:54 +0100)]
logfile plugin: Added Florian to the list of copyright holders.
Most of the current version has been written by him.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>