collectd.git
16 years agosrc/utils_cmd_putnotif.[ch]: Added a new module which handles parsing of notification...
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.

16 years agoTODO: Updated the todo file.
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.

16 years agosrc/liboconfig/parser.y: Updated copyright information.
Florian Forster [Wed, 23 Jan 2008 11:55:03 +0000 (12:55 +0100)]
src/liboconfig/parser.y: Updated copyright information.

16 years agosrc/{common,network}.[ch]: Updated copyright information.
Florian Forster [Wed, 23 Jan 2008 11:54:41 +0000 (12:54 +0100)]
src/{common,network}.[ch]: Updated copyright information.

16 years agoTODO: Adjusted todo list.
Florian Forster [Wed, 23 Jan 2008 11:40:44 +0000 (12:40 +0100)]
TODO: Adjusted todo list.

16 years agonetwork plugin: Added support for sending and receiving notifications.
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.

16 years agosrc/utils_threshold.c: Check that the <Threshold> block does not have any arguments.
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.

16 years agoliboconfig: Allow the argument list of blocks to be empty.
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.

16 years agocollectd: Added ``associative'' members to the notification_t structure.
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.

16 years agocollectd.conf(5), collectd-exec(5): Documented the `NotificationExec' and `NagiosExec...
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.

16 years agoChangeLog: Documented the new features in the master branch so far.
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.

16 years agoAUTHORS: Added Richard Jones.
Florian Forster [Wed, 23 Jan 2008 08:33:12 +0000 (09:33 +0100)]
AUTHORS: Added Richard Jones.

16 years agoFixed some compiler warnings identified by gcc's -Wextra option.
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>
16 years agoMerge branch 'pull/master'
Florian Forster [Mon, 21 Jan 2008 17:30:48 +0000 (18:30 +0100)]
Merge branch 'pull/master'

16 years agoMerge branch 'collectd-4.2'
Florian Forster [Mon, 21 Jan 2008 17:30:43 +0000 (18:30 +0100)]
Merge branch 'collectd-4.2'

16 years agoMerge branch 'pull/collectd-4.2' into 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

16 years agoMerge branch 'ff/manpage'
Florian Forster [Mon, 21 Jan 2008 17:29:34 +0000 (18:29 +0100)]
Merge branch 'ff/manpage'

16 years agotypes.db(5): Added a manpage documenting the format of the TypesDB file.
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>
16 years agoMerge branch 'collectd-4.2'
Florian Forster [Mon, 21 Jan 2008 17:28:51 +0000 (18:28 +0100)]
Merge branch 'collectd-4.2'

16 years agoMerge branch 'collectd-4.1' into 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

16 years agocollectd-exec(5): Improved description of the value-list identifier.
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>
16 years agoTODO: Added some notes on what needs to be done before 4.3
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.

16 years agocollectd-exec(5): Documented the changes due to notifications and the Nagios plugin...
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.

16 years agoAdded support for more than one TypesDB file.
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>
16 years agoMerge branch 'pull/master'
Florian Forster [Mon, 21 Jan 2008 10:12:50 +0000 (11:12 +0100)]
Merge branch 'pull/master'

16 years agoMerge branch 'collectd-4.2'
Florian Forster [Mon, 21 Jan 2008 10:12:29 +0000 (11:12 +0100)]
Merge branch 'collectd-4.2'

16 years agoMerge branch 'collectd-4.1' into collectd-4.2 collectd-4.2.4
Florian Forster [Mon, 21 Jan 2008 10:01:03 +0000 (11:01 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2

16 years agonetwork plugin: Made network_receive() static. collectd-4.1.6
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>
16 years agologfile plugin: Added Florian to the list of copyright holders.
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>
16 years agocollectd-perl(5): Added a note about submitting plugins.
Sebastian Harl [Sun, 20 Jan 2008 21:48:48 +0000 (22:48 +0100)]
collectd-perl(5): Added a note about submitting plugins.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoBumped version to 4.2.4; Updated ChangeLog.
Florian Forster [Mon, 21 Jan 2008 09:41:29 +0000 (10:41 +0100)]
Bumped version to 4.2.4; Updated ChangeLog.

16 years agoMerge branch 'collectd-4.1' into collectd-4.2
Florian Forster [Mon, 21 Jan 2008 09:40:33 +0000 (10:40 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2

Conflicts:

ChangeLog

16 years agoChangeLog: Fixed the date of the 4.1.6 release.
Florian Forster [Mon, 21 Jan 2008 09:39:50 +0000 (10:39 +0100)]
ChangeLog: Fixed the date of the 4.1.6 release.

16 years agoMerge branch 'collectd-4.1' into collectd-4.2
Florian Forster [Mon, 21 Jan 2008 09:36:57 +0000 (10:36 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2

Conflicts:

ChangeLog
version-gen.sh

16 years agoBumped version to 4.1.6; Updated ChangeLog.
Florian Forster [Fri, 11 Jan 2008 10:24:19 +0000 (11:24 +0100)]
Bumped version to 4.1.6; Updated ChangeLog.

16 years agoMerge branch 'collectd-4.2'
Florian Forster [Thu, 10 Jan 2008 08:49:02 +0000 (09:49 +0100)]
Merge branch 'collectd-4.2'

16 years agoMerge branch 'collectd-4.1' into collectd-4.2
Florian Forster [Thu, 10 Jan 2008 08:48:52 +0000 (09:48 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2

16 years agosrc/configfile.c: Updated the copyright notice for 2008.
Florian Forster [Thu, 10 Jan 2008 08:48:24 +0000 (09:48 +0100)]
src/configfile.c: Updated the copyright notice for 2008.

16 years agolibvirt plugin: Updated the copyright notice for 2008.
Florian Forster [Thu, 10 Jan 2008 08:47:20 +0000 (09:47 +0100)]
libvirt plugin: Updated the copyright notice for 2008.

16 years agolibvirt plugin: Fix the HostnameFormat option.
Richard Jones [Thu, 10 Jan 2008 08:43:32 +0000 (09:43 +0100)]
libvirt plugin: Fix the HostnameFormat option.

The attached patch fixes HostnameFormat in libvirt driver.

The intended use for this was:

   HostnameFormat "name"

generating hostnames like "<guestname>" (the default case), and:

   HostnameFormat "hostname name"

generating hostnames like "<hostname>:<guestname>".

Somewhere along the way, however, that code got broken so it always adds a ":"
before the name, and doesn't concatenate any more, so you'd get weird hostnames
appearing like ":guest" which was supposed to be "hostname:guest".

The patch just reverts back to my original code.

Rich.

16 years agobindings/Makefile.am: Replaced "make -C" with "cd && make".
Sebastian Harl [Wed, 9 Jan 2008 07:33:52 +0000 (08:33 +0100)]
bindings/Makefile.am: Replaced "make -C" with "cd && make".

BSD make does not support "make -C".

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agobindings/Makefile.am: Removed a bashism.
Sebastian Harl [Sun, 6 Jan 2008 19:11:29 +0000 (20:11 +0100)]
bindings/Makefile.am: Removed a bashism.

Brace expansion using { and } is not defined by POSIX but rather a bash
extension and should thus not be used for portability reasons.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agocollectd.conf(5): Added a note about the availability of the "debug" loglevel.
Sebastian Harl [Wed, 9 Jan 2008 07:29:36 +0000 (08:29 +0100)]
collectd.conf(5): Added a note about the availability of the "debug" loglevel.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoMerge branch 'collectd-4.2'
Florian Forster [Tue, 8 Jan 2008 10:25:27 +0000 (11:25 +0100)]
Merge branch 'collectd-4.2'

16 years agocollectd.conf(5): Fix a messed up merge.
Florian Forster [Tue, 8 Jan 2008 10:25:20 +0000 (11:25 +0100)]
collectd.conf(5): Fix a messed up merge.

16 years agoMerge branch 'collectd-4.2'
Florian Forster [Tue, 8 Jan 2008 10:23:36 +0000 (11:23 +0100)]
Merge branch 'collectd-4.2'

16 years agoMerge branch 'collectd-4.1' into collectd-4.2
Florian Forster [Tue, 8 Jan 2008 10:23:28 +0000 (11:23 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2

Conflicts:

src/collectd.conf.pod

16 years agocollectd.conf(5): Documented the fact that the configuration is processes from top...
Florian Forster [Tue, 8 Jan 2008 10:08:41 +0000 (11:08 +0100)]
collectd.conf(5): Documented the fact that the configuration is processes from top to bottom.

16 years agocollectd.conf(5): Added a note about plugin loading order.
Luke Heberling [Thu, 13 Dec 2007 07:03:03 +0000 (08:03 +0100)]
collectd.conf(5): Added a note about plugin loading order.

16 years agosrc/configfile.c: Improve the "Plugin `%s' did not register a callback." warning.
Florian Forster [Tue, 8 Jan 2008 09:52:44 +0000 (10:52 +0100)]
src/configfile.c: Improve the "Plugin `%s' did not register a callback." warning.

16 years agounixsock plugin: Actually set the permissions for the socket.
Evgeny Chukreev [Sun, 6 Jan 2008 09:00:06 +0000 (10:00 +0100)]
unixsock plugin: Actually set the permissions for the socket.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agosrc/utils_cache.c: Call `ut_check_interesting' before sending OKAY notifications...
Florian Forster [Fri, 28 Dec 2007 20:13:35 +0000 (21:13 +0100)]
src/utils_cache.c: Call `ut_check_interesting' before sending OKAY notifications, too.

16 years agoexec plugin: The execution of notification handling programs seems to work now.
Florian Forster [Fri, 28 Dec 2007 20:02:55 +0000 (21:02 +0100)]
exec plugin: The execution of notification handling programs seems to work now.

16 years agosrc/utils_{cache,threshold}.c: Adapted to the new AVL interface.
Florian Forster [Fri, 28 Dec 2007 18:16:45 +0000 (19:16 +0100)]
src/utils_{cache,threshold}.c: Adapted to the new AVL interface.

16 years agoMerge branch 'collectd-4.2'
Florian Forster [Fri, 28 Dec 2007 18:04:45 +0000 (19:04 +0100)]
Merge branch 'collectd-4.2'

Conflicts:

bindings/Makefile.am

16 years agoBumped version to 4.2.3; Updated ChangeLog. collectd-4.2.3
Florian Forster [Fri, 28 Dec 2007 17:33:54 +0000 (18:33 +0100)]
Bumped version to 4.2.3; Updated ChangeLog.

16 years agobuild system: Yet another way to solve the src-dir vs. build-dir issue.
Florian Forster [Fri, 28 Dec 2007 17:21:01 +0000 (18:21 +0100)]
build system: Yet another way to solve the src-dir vs. build-dir issue.

16 years agoconfigure.in: Copy sources of the Perl bindings to the build directory.
Sebastian Harl [Thu, 27 Dec 2007 15:40:30 +0000 (16:40 +0100)]
configure.in: Copy sources of the Perl bindings to the build directory.

As the Perl build system around ExtUtils::MakeMaker doesn't know how to
separate source and build directories, all relevant source files have to be
available in the build directory.

This is an alternative patch for the problem reported by Michael Tiernan.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoRevert "bindings/Makefile.am: Fix a bug that happened when src and build directory...
Sebastian Harl [Thu, 27 Dec 2007 15:39:46 +0000 (16:39 +0100)]
Revert "bindings/Makefile.am: Fix a bug that happened when src and build directory are not the same."

This reverts commit 61f5c1a972626212aab60c4d50f45097485b8e51 which had the
following problems:

 * parts of the build process took place in the source directory (which should
   be read-only though)

 * the "perl" target should not be renamed - the name is used in
   @PERL_BINDINGS@ to identify the bindings that are supposed to be built

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoutils_mount.c: Fixed an unused variable warning on some systems.
Sebastian Harl [Wed, 19 Dec 2007 19:37:30 +0000 (20:37 +0100)]
utils_mount.c: Fixed an unused variable warning on some systems.

This warning appeared on systems using listmntent() or getv?fsstat() when
compiling with debugging disabled only. It was caused by the declaration of a
character array for use with sstrerror() inside a call to DEBUG().

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agosrc/Makefile.am: Use curl CFLAGS when building the nginx plugin.
Sebastian Harl [Wed, 19 Dec 2007 19:36:40 +0000 (20:36 +0100)]
src/Makefile.am: Use curl CFLAGS when building the nginx plugin.

Else curl/curl.h cannot be found in non-standard places at build time.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoUpdated the changelog.
Florian Forster [Thu, 27 Dec 2007 10:17:46 +0000 (11:17 +0100)]
Updated the changelog.

16 years agoMerge branch 'collectd-4.1' into collectd-4.2
Florian Forster [Thu, 27 Dec 2007 10:15:30 +0000 (11:15 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2

Conflicts:

ChangeLog
version-gen.sh

16 years agoBumped version to 4.1.5; Updated ChangeLog. collectd-4.1.5
Florian Forster [Thu, 27 Dec 2007 09:34:39 +0000 (10:34 +0100)]
Bumped version to 4.1.5; Updated ChangeLog.

16 years agosensors plugin: While I was at it I reorganized the code a little so it's easier...
Florian Forster [Wed, 26 Dec 2007 14:34:18 +0000 (15:34 +0100)]
sensors plugin: While I was at it I reorganized the code a little so it's easier to read.

For instance I moved the name to type conversion out of the main loop and into
a separate function, likewise the chip to string representation conversion. The
`submit' function is now very careful that all strings are null terminated and
that no buffer overflow may occur.

16 years agosensors plugin: Implemented support for libsensors3.
Florian Forster [Tue, 25 Dec 2007 17:11:47 +0000 (18:11 +0100)]
sensors plugin: Implemented support for libsensors3.

16 years agoexec plugin: Added the possibility to execute programs upon notifications (EXPERIMENTAL)
Florian Forster [Tue, 25 Dec 2007 13:35:38 +0000 (14:35 +0100)]
exec plugin: Added the possibility to execute programs upon notifications (EXPERIMENTAL)

16 years agosrc/utils_cache.c: Added the creation of an `OKAY' notification.
Florian Forster [Sun, 23 Dec 2007 10:44:01 +0000 (11:44 +0100)]
src/utils_cache.c: Added the creation of an `OKAY' notification.

It is generated when a value was missing and is received again.

16 years agologfile plugin: Added a notification plugin.
Florian Forster [Sun, 23 Dec 2007 10:43:22 +0000 (11:43 +0100)]
logfile plugin: Added a notification plugin.

16 years agosrc/plugin.c: Notification callbacks were added to the wrong linked list.
Florian Forster [Sun, 23 Dec 2007 10:43:02 +0000 (11:43 +0100)]
src/plugin.c: Notification callbacks were added to the wrong linked list.

16 years agosrc/utils_cache.[ch]: Implemented uc_[gs]et_state to receive and set the state of...
Florian Forster [Thu, 20 Dec 2007 21:37:39 +0000 (22:37 +0100)]
src/utils_cache.[ch]: Implemented uc_[gs]et_state to receive and set the state of a value.

This is most likely very buggy. The intention is that this is used in the
threshold module to decide wether or not so send a notification, i. e. if the
problem existed before or not.

16 years agosrc/utils_threshold.h: Documented the public functions.
Florian Forster [Wed, 19 Dec 2007 14:07:33 +0000 (15:07 +0100)]
src/utils_threshold.h: Documented the public functions.

16 years agosrc/utils_threshold.c: Implemented the new `Persist' option.
Florian Forster [Wed, 19 Dec 2007 14:07:10 +0000 (15:07 +0100)]
src/utils_threshold.c: Implemented the new `Persist' option.

The idea is that, if the option is set to `true', many notifications will be
sent, until the problem vanishes again. If set to `false' only one notification
will be sent upon a state change.
This, however, is not implemented yet.

16 years agobindings/Makefile.am: Fix a bug that happened when src and build directory are not...
Florian Forster [Wed, 19 Dec 2007 13:33:39 +0000 (14:33 +0100)]
bindings/Makefile.am: Fix a bug that happened when src and build directory are not the same.

Thanks to Michael Tiernan for reporting this bug.

16 years agosrc/utils_threshold.c: Corrected and improved the handling of the `invert' setting.
Florian Forster [Wed, 19 Dec 2007 13:13:15 +0000 (14:13 +0100)]
src/utils_threshold.c: Corrected and improved the handling of the `invert' setting.

16 years agocollectd.conf(5): Wrote some more about the threshold configuration..
Florian Forster [Mon, 17 Dec 2007 22:06:29 +0000 (23:06 +0100)]
collectd.conf(5): Wrote some more about the threshold configuration..

..in its current state.

16 years agocollectd.conf(5): Started documenting the threshold thingy.
Florian Forster [Mon, 17 Dec 2007 14:48:36 +0000 (15:48 +0100)]
collectd.conf(5): Started documenting the threshold thingy.

16 years agoutils_{cache,threshold}.[ch]: Implemented the ``check interesting'' function.
Florian Forster [Mon, 17 Dec 2007 14:37:01 +0000 (15:37 +0100)]
utils_{cache,threshold}.[ch]: Implemented the ``check interesting'' function.

The cache now checks if a missing value would be ``interesting'', i. e. if a
threshold is configured for it. If so, a notification is send and the entry is
_not_ removed from the cache. Otherwise, no notification is sent and the entry
is removed.
The changes have been tested a little and should basically work.

16 years agoBumped version to 4.2.2; Updated ChangeLog. collectd-4.2.2
Florian Forster [Sat, 15 Dec 2007 11:25:51 +0000 (12:25 +0100)]
Bumped version to 4.2.2; Updated ChangeLog.

16 years agoMerge branch 'collectd-4.1' into collectd-4.2
Florian Forster [Sat, 15 Dec 2007 11:15:37 +0000 (12:15 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2

16 years agoMerge branch 'master' of octo@verplant.org:/var/lib/git/collectd
Florian Forster [Sat, 15 Dec 2007 11:11:17 +0000 (12:11 +0100)]
Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd

16 years agosrc/utils_cache.[ch]: Added the `uc_check_timeout' function.
Florian Forster [Sat, 15 Dec 2007 11:11:06 +0000 (12:11 +0100)]
src/utils_cache.[ch]: Added the `uc_check_timeout' function.

This function is called before the read plugins. It checks if values are
missing, i. e. have not been reported for longer than twice their ``interval''.
In this case a notification is created, though this is probably not the final
behavior.
This code is highly experimental.

16 years agoMerge branch 'collectd-4.2'
Florian Forster [Thu, 13 Dec 2007 07:16:16 +0000 (08:16 +0100)]
Merge branch 'collectd-4.2'

Conflicts:

src/utils_llist.c

16 years agosrc/utils_avltree.[ch]: Change avl_insert to return >0 if the key is already in the...
Luke Heberling [Thu, 13 Dec 2007 07:15:38 +0000 (08:15 +0100)]
src/utils_avltree.[ch]: Change avl_insert to return >0 if the key is already in the tree.

I'd like to be able to tell when avl_insert fails because of a duplicate key as
opposed to when it fails due to out of memory or other condition.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agosrc/utils_avltree.c: Fix avl_get to work as documented.
Luke Heberling [Thu, 13 Dec 2007 07:09:16 +0000 (08:09 +0100)]
src/utils_avltree.c: Fix avl_get to work as documented.

The documentation in the header file for avl_get states that value may be null,
but the code in the source file asserts otherwise. This patch changes the code
to reflect the documentation.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agorc/utils_llist.c: Fix a bug in llist_prepend.
Luke Heberling [Thu, 13 Dec 2007 07:06:26 +0000 (08:06 +0100)]
rc/utils_llist.c: Fix a bug in llist_prepend.

Copy the element to the tail if it's the first element.

16 years agocollectd.conf(5): Added a note about plugin loading order.
Luke Heberling [Thu, 13 Dec 2007 07:03:03 +0000 (08:03 +0100)]
collectd.conf(5): Added a note about plugin loading order.

16 years agologfile plugin: fix the `Timestamp' configuration option.
Luke Heberling [Thu, 13 Dec 2007 07:01:16 +0000 (08:01 +0100)]
logfile plugin: fix the `Timestamp' configuration option.

16 years agonginx plugin: Use strcmp rather than strcpy to compare strings.
Saulius Grigaliunas [Thu, 13 Dec 2007 06:58:51 +0000 (07:58 +0100)]
nginx plugin: Use strcmp rather than strcpy to compare strings.

I believe I found a typo in nginx.c which prevents collectd with nginx plugin
from working. Collectd segfaults at startup. Here is a tiny patch to correct
the issue. When applied, everything works as expected.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agoMerge branch 'master' of octo@verplant.org:/var/lib/git/collectd
Florian Forster [Wed, 12 Dec 2007 08:05:55 +0000 (09:05 +0100)]
Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd

16 years agosrc/utils_llist.[ch]: Changed the semantic so module doesn't copy the `key'.
Luke Heberling [Wed, 12 Dec 2007 07:43:34 +0000 (08:43 +0100)]
src/utils_llist.[ch]: Changed the semantic so module doesn't copy the `key'.

Whilst looking at my implementation of the plugins we've discussed which are
now using dual avl trees, I saw that the utils_llist module would be a more
efficient substitute for the second avl tree. However, it would need to know
its size and would preferably not duplicate and own the key for each item.
Here's a patch which does this. These changes might make it easier for future
plugins to use the linked list for similar purposes, similar to the way the avl
tree does not impose any lifetime on its keys.

Signed-off-by: Florian Forster <octo@huhu.verplant.org>
16 years agosrc/plugin.[ch]: Removed the complain functions.
Florian Forster [Sun, 9 Dec 2007 15:42:14 +0000 (16:42 +0100)]
src/plugin.[ch]: Removed the complain functions.

16 years agoiptables plugin: Removed the `complain' stuff.
Florian Forster [Sun, 9 Dec 2007 15:41:53 +0000 (16:41 +0100)]
iptables plugin: Removed the `complain' stuff.

16 years agoapcups plugin: Removed the `complain' stuff.
Florian Forster [Sun, 9 Dec 2007 14:33:58 +0000 (15:33 +0100)]
apcups plugin: Removed the `complain' stuff.

16 years agocpu plugin: Removed the `complain' stuff.
Florian Forster [Sun, 9 Dec 2007 14:32:13 +0000 (15:32 +0100)]
cpu plugin: Removed the `complain' stuff.

16 years agodisk plugin: Removed the `complain' stuff.
Florian Forster [Sun, 9 Dec 2007 14:30:29 +0000 (15:30 +0100)]
disk plugin: Removed the `complain' stuff.

16 years agoMerge branch 'ps/reuse'
Florian Forster [Sun, 9 Dec 2007 10:54:52 +0000 (11:54 +0100)]
Merge branch 'ps/reuse'

16 years agocontrib/network-proxy.py: Added a simply (unicast) proxy for collectd traffic.
Pavel Shramov [Sun, 9 Dec 2007 10:51:28 +0000 (11:51 +0100)]
contrib/network-proxy.py: Added a simply (unicast) proxy for collectd traffic.

16 years agontpd plugin: Added the `ReverseLookups' option to disable reverse lookups.
Florian Forster [Sun, 9 Dec 2007 10:20:13 +0000 (11:20 +0100)]
ntpd plugin: Added the `ReverseLookups' option to disable reverse lookups.

Thanks to Simon Richter for pointing this out.

16 years agoMerge branch 'ps/reuse'
Florian Forster [Sat, 8 Dec 2007 12:02:41 +0000 (13:02 +0100)]
Merge branch 'ps/reuse'