collectd.git
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 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>
17 years agocollectd-perl(5): Fixed a typo.
Sebastian Harl [Mon, 12 Nov 2007 15:38:13 +0000 (16:38 +0100)]
collectd-perl(5): Fixed a typo.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
17 years agocollectd2html.pl: Cleaned up Eddy's patch.
Sebastian Harl [Mon, 12 Nov 2007 12:05:54 +0000 (13:05 +0100)]
collectd2html.pl: Cleaned up Eddy's patch.

 * Use Perl's undef to identify invalid values.
 * Renamed the "host-is" command line option to "host".

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
17 years agorrdtool plugin: Fix a memory leak..
Florian Forster [Wed, 14 Nov 2007 10:37:00 +0000 (11:37 +0100)]
rrdtool plugin: Fix a memory leak..

..in a VERY uncommon/rare case.

17 years agosrc/utils_avltree.[ch]: Rename all types and functions to use the prefix `c_avl_'.
Florian Forster [Fri, 12 Oct 2007 08:13:11 +0000 (10:13 +0200)]
src/utils_avltree.[ch]: Rename all types and functions to use the prefix `c_avl_'.

The prefix `avl_' clashed with an AVL implementation on Solaris 10..

17 years agoBumped version to 4.2.1; Updated ChangeLog. collectd-4.2.1
Florian Forster [Thu, 8 Nov 2007 20:55:13 +0000 (21:55 +0100)]
Bumped version to 4.2.1; Updated ChangeLog.

17 years agoMerge branch 'collectd-4.1' into collectd-4.2
Florian Forster [Thu, 8 Nov 2007 18:49:17 +0000 (19:49 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2

Conflicts:

ChangeLog
contrib/PerlLib/Collectd.pm
version-gen.sh

17 years agoBumped version to 4.1.4; Updated ChangeLog collectd-4.1.4
Florian Forster [Thu, 8 Nov 2007 09:49:54 +0000 (10:49 +0100)]
Bumped version to 4.1.4; Updated ChangeLog

17 years agocontrib/collection.cgi: Fix the types related to the processes plugin.
Florian Forster [Wed, 7 Nov 2007 16:52:01 +0000 (16:52 +0000)]
contrib/collection.cgi: Fix the types related to the processes plugin.

17 years agocontrib/collection.cgi: Fix the ps_rss graph.
Florian Forster [Wed, 7 Nov 2007 09:33:51 +0000 (09:33 +0000)]
contrib/collection.cgi: Fix the ps_rss graph.

17 years agocontrib/collection.cgi: Add some missing types and labels.
Florian Forster [Wed, 7 Nov 2007 09:29:23 +0000 (09:29 +0000)]
contrib/collection.cgi: Add some missing types and labels.

17 years agoMerge branch 'collectd-4.1' into collectd-4.2
Florian Forster [Tue, 6 Nov 2007 16:40:35 +0000 (16:40 +0000)]
Merge branch 'collectd-4.1' into collectd-4.2

Conflicts:

contrib/README
src/snmp.c
src/types.db

17 years agosnmp plugin: Don't try to free the request PDU - it segfaults for some reason.
Florian Forster [Tue, 6 Nov 2007 16:37:53 +0000 (16:37 +0000)]
snmp plugin: Don't try to free the request PDU - it segfaults for some reason.

According to other code I've seen this is never done by anyone else, so this
must mean that the snmp library takes care of this somehow. Man, I love well
documented libraries!

17 years agosnmp plugin: Be even more eager to free PDU structures.
Florian Forster [Tue, 6 Nov 2007 16:20:29 +0000 (16:20 +0000)]
snmp plugin: Be even more eager to free PDU structures.

17 years agosnmp plugin: (Hopefully) fix a memory leak.
Florian Forster [Tue, 6 Nov 2007 15:53:49 +0000 (15:53 +0000)]
snmp plugin: (Hopefully) fix a memory leak.

17 years agocontrib/snmp-data.conf: Added even more UPS stuff.
Florian Forster [Tue, 6 Nov 2007 15:33:58 +0000 (15:33 +0000)]
contrib/snmp-data.conf: Added even more UPS stuff.

17 years agocontrib/fedora/collectd.spec: Updated for version 4.2.0
Iain Lea [Tue, 6 Nov 2007 07:17:15 +0000 (08:17 +0100)]
contrib/fedora/collectd.spec: Updated for version 4.2.0

17 years agoexec plugin: Set PID of failed programs back to zero.
Florian Forster [Sun, 4 Nov 2007 13:20:43 +0000 (14:20 +0100)]
exec plugin: Set PID of failed programs back to zero.

Otherwise the program will not be executed ever again after it failed once.

17 years agocontrib/exec-munin.px: Added a simple Perl script which makes it possible to use...
Florian Forster [Sat, 3 Nov 2007 15:28:35 +0000 (16:28 +0100)]
contrib/exec-munin.px: Added a simple Perl script which makes it possible to use Munin plugins in collectd.

The script has an embedded POD documentation.

17 years agoMerge branch 'pull/collectd-4.1' into collectd-4.1
Florian Forster [Thu, 1 Nov 2007 09:07:03 +0000 (10:07 +0100)]
Merge branch 'pull/collectd-4.1' into collectd-4.1

17 years agotcpconns plugin: Done complain when reading one of the files fails.
Florian Forster [Thu, 1 Nov 2007 09:06:52 +0000 (10:06 +0100)]
tcpconns plugin: Done complain when reading one of the files fails.

This should remove an error message on non-IPv6-enabled hosts..

17 years agocontrib/snmp-data.conf: Added some more RMSes and UPS stuff.
Florian Forster [Tue, 30 Oct 2007 17:15:58 +0000 (17:15 +0000)]
contrib/snmp-data.conf: Added some more RMSes and UPS stuff.

17 years agoMerge branch 'collectd-4.1' into collectd-4.2
Florian Forster [Tue, 30 Oct 2007 16:19:04 +0000 (16:19 +0000)]
Merge branch 'collectd-4.1' into collectd-4.2

Conflicts:

src/collectd-snmp.pod

17 years agotypes.db: Fix a typo: s/humitidy/humidity/
Florian Forster [Tue, 30 Oct 2007 16:17:43 +0000 (16:17 +0000)]
types.db: Fix a typo: s/humitidy/humidity/

17 years agotypes.db: Ordered the entries alphabetically and added `voltage_threshold'.
Florian Forster [Tue, 30 Oct 2007 08:50:01 +0000 (09:50 +0100)]
types.db: Ordered the entries alphabetically and added `voltage_threshold'.

17 years agorrdtool plugin: Wait for the ``queue thread'' to exit _after_ signaling it to exit..
Florian Forster [Fri, 12 Oct 2007 20:59:15 +0000 (22:59 +0200)]
rrdtool plugin: Wait for the ``queue thread'' to exit _after_ signaling it to exit..

17 years agocollectd-snmp(5): Fix typos.
Florian Forster [Mon, 29 Oct 2007 16:42:13 +0000 (17:42 +0100)]
collectd-snmp(5): Fix typos.

17 years agocollectd.conf: Added nginx module.
Sebastian Harl [Sun, 28 Oct 2007 14:40:28 +0000 (15:40 +0100)]
collectd.conf: Added nginx module.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
17 years agoperl plugin: Set $0 to "collectd".
Sebastian Harl [Sun, 28 Oct 2007 09:50:24 +0000 (10:50 +0100)]
perl plugin: Set $0 to "collectd".

perl_parse() has to set it to "-e" which is not very meaningful. It would
be even nicer to set it to argv[0] but this is not available from inside
the plugin.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
17 years agocollectd.h: Removed legacy definition of operation modes.
Sebastian Harl [Sun, 28 Oct 2007 08:58:18 +0000 (09:58 +0100)]
collectd.h: Removed legacy definition of operation modes.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
17 years agoplugin.h: Make DEBUG() a noop when compiling without debugging support.
Sebastian Harl [Sun, 28 Oct 2007 08:57:17 +0000 (09:57 +0100)]
plugin.h: Make DEBUG() a noop when compiling without debugging support.

This saves a couple of useless calls to plugin_log() which the compiler
does not detect and remove itself.

A couple of DEBUG()'s in the apcups, hddtemp, mbmon and ntpd plugins have
been upgraded to INFO()'s. All of them provide error messages of failed
system / libc calls which should be available to the user somehow.
Besides, they use a local string buffer which generates an "unused
variable" warning if DEBUG() expands to a noop.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
17 years agoChangeLog: Fix some spelling errors.
Florian Forster [Sat, 27 Oct 2007 10:00:18 +0000 (12:00 +0200)]
ChangeLog: Fix some spelling errors.

17 years agoBuild system: Removed the check for `libm'. collectd-4.2.0
Florian Forster [Sat, 27 Oct 2007 09:21:52 +0000 (11:21 +0200)]
Build system: Removed the check for `libm'.

It didn't work (there's no `ext' function) and wasn't used anywhere..

17 years agoMerge branch 'collectd-4.1'
Florian Forster [Sat, 27 Oct 2007 09:09:25 +0000 (11:09 +0200)]
Merge branch 'collectd-4.1'

17 years agoBumped version to 4.2.0; Updated ChangeLog.
Florian Forster [Sat, 27 Oct 2007 09:02:03 +0000 (11:02 +0200)]
Bumped version to 4.2.0; Updated ChangeLog.

17 years agoBuild system: Changed the detection of the sensors library to work like other libraries.
Florian Forster [Sat, 27 Oct 2007 08:52:38 +0000 (10:52 +0200)]
Build system: Changed the detection of the sensors library to work like other libraries.

17 years agoREADME: Added section about configuring, building and installing collectd.
Sebastian Harl [Fri, 26 Oct 2007 13:07:50 +0000 (15:07 +0200)]
README: Added section about configuring, building and installing collectd.

This section contains basic information about the "--enabled-<plugin>"
configuration option as well as adopting the installation target.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
17 years agocollectd.conf(5): Fix a typo.
Florian Forster [Fri, 26 Oct 2007 12:39:27 +0000 (14:39 +0200)]
collectd.conf(5): Fix a typo.

17 years agoChangeLog: Added a note about the new nginx plugin.
Florian Forster [Fri, 26 Oct 2007 08:52:48 +0000 (10:52 +0200)]
ChangeLog: Added a note about the new nginx plugin.

17 years agosrc/common.c: Serialize access to `strerror' if `strerror_r' doesn't exist.
Florian Forster [Fri, 26 Oct 2007 08:50:43 +0000 (10:50 +0200)]
src/common.c: Serialize access to `strerror' if `strerror_r' doesn't exist.

Apparently this is a problem under Solaris 9..

17 years agoBuild system: Fixed a bug in the detection of the snmp library.
Ronan Cadet [Fri, 26 Oct 2007 08:28:37 +0000 (10:28 +0200)]
Build system: Fixed a bug in the detection of the snmp library.

Hello,

During the creation of a rpm on Mandriva 2007.1 from tar.bz2 sources, and by
activate almost all options, I found something that seems a bug to me in the
configure file, line 33251 (concerning the snmp plugin)

17 years agoMerge branch 'collectd-4.1'
Florian Forster [Fri, 26 Oct 2007 08:08:28 +0000 (10:08 +0200)]
Merge branch 'collectd-4.1'

17 years agologfile plugin: Implemented an option to prefix logged lines with a timestamp.
Florian Forster [Fri, 26 Oct 2007 08:07:58 +0000 (10:07 +0200)]
logfile plugin: Implemented an option to prefix logged lines with a timestamp.

17 years agoBuild system: Set the appropriate CPPFLAGS and LDFLAGS when checking for librrd and...
Florian Forster [Thu, 25 Oct 2007 21:13:27 +0000 (23:13 +0200)]
Build system: Set the appropriate CPPFLAGS and LDFLAGS when checking for librrd and it's header.

17 years agorrdtool plugin: Include the `rrd.h' header file in `rrdtool.c', not `collectd.h'.
Florian Forster [Thu, 25 Oct 2007 21:11:54 +0000 (23:11 +0200)]
rrdtool plugin: Include the `rrd.h' header file in `rrdtool.c', not `collectd.h'.

This caused an error when --with-rrdtool was used to have the header file in a
non-standard directory, because the appropriate CFLAGS were not passed to all
plugins.

17 years agotypes.db: Raise the maximum value of `ps_cputime' from 1s/1s to 16s/1s..
Florian Forster [Thu, 25 Oct 2007 18:05:08 +0000 (20:05 +0200)]
types.db: Raise the maximum value of `ps_cputime' from 1s/1s to 16s/1s..

This should work with machines with up to 16 processors..

17 years agoChangeLog: Documented the new tcpconns plugin and the changes to the snmp plugin.
Florian Forster [Thu, 25 Oct 2007 13:32:26 +0000 (15:32 +0200)]
ChangeLog: Documented the new tcpconns plugin and the changes to the snmp plugin.

17 years agoREADME: Improved the dependency list a little.
Florian Forster [Thu, 25 Oct 2007 09:42:37 +0000 (11:42 +0200)]
README: Improved the dependency list a little.

17 years agoChangeLog: Fixed many many typos.
Florian Forster [Thu, 25 Oct 2007 09:36:00 +0000 (11:36 +0200)]
ChangeLog: Fixed many many typos.

17 years agoFixed some typos in the manpages.
Sebastian Harl [Wed, 24 Oct 2007 22:29:28 +0000 (00:29 +0200)]
Fixed some typos in the manpages.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
17 years agoMerge branch 'collectd-4.1'
Florian Forster [Wed, 24 Oct 2007 19:36:44 +0000 (21:36 +0200)]
Merge branch 'collectd-4.1'

Conflicts:

ChangeLog
contrib/PerlLib/Collectd.pm

17 years agoBumped version to 4.1.3; Updated ChangeLog. collectd-4.1.3
Florian Forster [Wed, 24 Oct 2007 18:51:51 +0000 (20:51 +0200)]
Bumped version to 4.1.3; Updated ChangeLog.

17 years agocontrib/PerlLib/Collectd.pm: Bumped version to 4.1.3.
Florian Forster [Wed, 24 Oct 2007 18:49:33 +0000 (20:49 +0200)]
contrib/PerlLib/Collectd.pm: Bumped version to 4.1.3.

17 years agoMerge branch 'collectd-4.1'
Florian Forster [Wed, 24 Oct 2007 18:11:05 +0000 (20:11 +0200)]
Merge branch 'collectd-4.1'

17 years agoconfigure.in: Added "rrdtool" to the module summary.
Sebastian Harl [Mon, 22 Oct 2007 22:05:17 +0000 (00:05 +0200)]
configure.in: Added "rrdtool" to the module summary.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
17 years agocollectd-perl(5): Added note about multi-threading.
Sebastian Harl [Mon, 22 Oct 2007 22:04:38 +0000 (00:04 +0200)]
collectd-perl(5): Added note about multi-threading.

A new section "BUGS" has been added to the manpage with a short note about
Perl and multithreading.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
17 years agoperl plugin: Improved value list conversion.
Sebastian Harl [Sat, 20 Oct 2007 13:42:33 +0000 (15:42 +0200)]
perl plugin: Improved value list conversion.

The perl plugin used to store an internal list of data-source types for
each data-set registered by Perl plugins to get fast access to this
information (which is required to correctly convert a Perl data-set to a
data_set_t struct). However, this prevented Perl plugins to use data-sets
defined in types.db. This patch fixes this issue by requesting the
data-set definition from collectd.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
17 years agoperl plugin: Fixed handling of erroneous configuration options.
Sebastian Harl [Tue, 16 Oct 2007 23:14:18 +0000 (01:14 +0200)]
perl plugin: Fixed handling of erroneous configuration options.

An empty block was used instead of returning from the perl_config_*()
functions in case of an error. I wonder how that has happened... :-/

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
17 years agoperl plugin: Improved "IncludeDir" configuration option.
Sebastian Harl [Tue, 16 Oct 2007 23:13:35 +0000 (01:13 +0200)]
perl plugin: Improved "IncludeDir" configuration option.

The "Do not initialize the Perl interpreter until loading a module."
commit removed support for adding include directories after the Perl
interpreter has been initialized. This patch re-enables it.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
17 years agocollectd-perl(5): Updated documentation.
Sebastian Harl [Tue, 16 Oct 2007 23:12:37 +0000 (01:12 +0200)]
collectd-perl(5): Updated documentation.

 * moved configuration documentation from collectd.conf(5) to
   collectd-perl(5)

 * added documentation for the EnableDebugger configuration option

 * added documentation about how to write own plugins

 * added exports and examples section

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
17 years agocollectd.conf.in: Fixed some missing quotes and words..
Florian Forster [Wed, 24 Oct 2007 17:59:22 +0000 (19:59 +0200)]
collectd.conf.in: Fixed some missing quotes and words..

17 years agoMerge branch 'ad/memcached'
Florian Forster [Wed, 24 Oct 2007 17:57:56 +0000 (19:57 +0200)]
Merge branch 'ad/memcached'

17 years agoAUTHORS, ChangeLog: Added notes about the memcached plugin.
Florian Forster [Wed, 24 Oct 2007 17:57:35 +0000 (19:57 +0200)]
AUTHORS, ChangeLog: Added notes about the memcached plugin.

17 years agocollectd.conf.in: Added the `memcached' plugin.
Florian Forster [Wed, 24 Oct 2007 17:50:35 +0000 (19:50 +0200)]
collectd.conf.in: Added the `memcached' plugin.

17 years agoMerge branch 'pull/master'
Florian Forster [Wed, 24 Oct 2007 17:21:33 +0000 (19:21 +0200)]
Merge branch 'pull/master'

17 years agocollectd.conf(5): Documented the new memcached plugin.
Florian Forster [Tue, 23 Oct 2007 15:05:55 +0000 (17:05 +0200)]
collectd.conf(5): Documented the new memcached plugin.

17 years agoMerge branch 'master' into ad/memcached
Florian Forster [Tue, 23 Oct 2007 14:34:17 +0000 (16:34 +0200)]
Merge branch 'master' into ad/memcached

Conflicts:

src/types.db

17 years agocollectd.conf(5): Documented the new nginx plugin.
Florian Forster [Tue, 23 Oct 2007 14:33:49 +0000 (16:33 +0200)]
collectd.conf(5): Documented the new nginx plugin.

17 years agomemcached plugin: Corrected the copyright notice and removed unnecessary header files.
Florian Forster [Tue, 23 Oct 2007 14:20:09 +0000 (16:20 +0200)]
memcached plugin: Corrected the copyright notice and removed unnecessary header files.

17 years agoemail plugin: Include `stddef.h' which defines the `offsetof' macro.
Florian Forster [Tue, 23 Oct 2007 14:10:47 +0000 (16:10 +0200)]
email plugin: Include `stddef.h' which defines the `offsetof' macro.

17 years agomemcached plugin: Some of the data definitions have been torn appart.
Florian Forster [Tue, 23 Oct 2007 14:10:11 +0000 (16:10 +0200)]
memcached plugin: Some of the data definitions have been torn appart.

17 years agomemcached plugin: Added a plugin to query stats from memcached servers.
Antony Dovgal [Tue, 23 Oct 2007 12:18:16 +0000 (14:18 +0200)]
memcached plugin: Added a plugin to query stats from memcached servers.

17 years agonginx plugin: Changed to the version 4 plugin infrastructure.
Florian Forster [Tue, 23 Oct 2007 11:56:57 +0000 (13:56 +0200)]
nginx plugin: Changed to the version 4 plugin infrastructure.

17 years agoMerge branch 'ff/nginx'
Florian Forster [Tue, 23 Oct 2007 11:33:41 +0000 (13:33 +0200)]
Merge branch 'ff/nginx'

Conflicts:

configure.in
src/Makefile.am

17 years agotcpconns plugin: Added support for Mac OS X (and possibly FreeBSD).
Florian Forster [Mon, 22 Oct 2007 21:03:12 +0000 (23:03 +0200)]
tcpconns plugin: Added support for Mac OS X (and possibly FreeBSD).

17 years agonginx plugin: Added a plugin to collect `nginx' statistics.
Florian Forster [Fri, 19 Oct 2007 08:02:32 +0000 (10:02 +0200)]
nginx plugin: Added a plugin to collect `nginx' statistics.

nginx is a lightweight webserver and (reverse) proxy and apparently very
popular in Russia. This plugin queries it's status page, parses it and submits
it to collectd, very similar to the apache plugin.

17 years agoMerge branch 'pull/master'
Florian Forster [Fri, 19 Oct 2007 07:23:57 +0000 (09:23 +0200)]
Merge branch 'pull/master'

17 years agocontrib/README: Documented the exec script and the SNMP config.
Florian Forster [Mon, 15 Oct 2007 15:30:18 +0000 (17:30 +0200)]
contrib/README: Documented the exec script and the SNMP config.

17 years agocontrib/exec-smartctl: Added documentation to the script.
Florian Forster [Mon, 15 Oct 2007 15:29:56 +0000 (17:29 +0200)]
contrib/exec-smartctl: Added documentation to the script.

17 years agoMerge branch 'pull/master'
Florian Forster [Sat, 13 Oct 2007 15:16:32 +0000 (17:16 +0200)]
Merge branch 'pull/master'

17 years agocontrib/exec-smartctl: Added a sample exec script which parses the hdd temperature...
Florian Forster [Sat, 13 Oct 2007 15:14:54 +0000 (17:14 +0200)]
contrib/exec-smartctl: Added a sample exec script which parses the hdd temperature using smartctl.

17 years agorrdtool plugin: Add a debugging message into the `queue thread'..
Florian Forster [Fri, 12 Oct 2007 21:16:05 +0000 (23:16 +0200)]
rrdtool plugin: Add a debugging message into the `queue thread'..

17 years agorrdtool plugin: Wait for the ``queue thread'' to exit _after_ signaling it to exit..
Florian Forster [Fri, 12 Oct 2007 20:59:15 +0000 (22:59 +0200)]
rrdtool plugin: Wait for the ``queue thread'' to exit _after_ signaling it to exit..

17 years agoMerge branch 'pull/master'
Florian Forster [Fri, 12 Oct 2007 20:33:11 +0000 (22:33 +0200)]
Merge branch 'pull/master'

17 years agocontrib/snmp-data.conf: Added a sample data configuration for the SNMP plugin.
Florian Forster [Fri, 12 Oct 2007 20:31:51 +0000 (22:31 +0200)]
contrib/snmp-data.conf: Added a sample data configuration for the SNMP plugin.

17 years agoipvs plugin: Fix a feaking stupid typo..
Florian Forster [Fri, 12 Oct 2007 17:10:19 +0000 (19:10 +0200)]
ipvs plugin: Fix a feaking stupid typo..

17 years agoMerge branch 'collectd-4.1'
Florian Forster [Fri, 12 Oct 2007 16:59:29 +0000 (18:59 +0200)]
Merge branch 'collectd-4.1'

Conflicts:

ChangeLog

17 years agoMerge branch 'ff/tcpconns'
Florian Forster [Fri, 12 Oct 2007 16:57:51 +0000 (18:57 +0200)]
Merge branch 'ff/tcpconns'

17 years agocollectd.conf.in: Added sample configuration for the tcpconns plugin.
Florian Forster [Fri, 12 Oct 2007 16:57:04 +0000 (18:57 +0200)]
collectd.conf.in: Added sample configuration for the tcpconns plugin.

17 years agoipvs plugin: Assurd that `sockfd >= 0'.
Florian Forster [Fri, 12 Oct 2007 16:48:21 +0000 (18:48 +0200)]
ipvs plugin: Assurd that `sockfd >= 0'.

The init-function should return non-zero in that case and the plugin should be
disabled, but I'd rather not rely on such conventions too much..

17 years agoAdded documentation about ipvs to README, ChangeLog and collectd.conf.in.
Sebastian Harl [Fri, 12 Oct 2007 14:51:04 +0000 (16:51 +0200)]
Added documentation about ipvs to README, ChangeLog and collectd.conf.in.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
17 years agoipvs plugin: Check for correct IPVS version in cipvs_init().
Sebastian Harl [Fri, 12 Oct 2007 14:14:25 +0000 (16:14 +0200)]
ipvs plugin: Check for correct IPVS version in cipvs_init().

I took over the required minimum version (1.1.4) as used in ipvsadm 1.24
for Linux kernels >= 2.6.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
17 years agoipvs plugin: Replaced ipvs_strerror() with sstrerror().
Sebastian Harl [Fri, 12 Oct 2007 12:32:20 +0000 (14:32 +0200)]
ipvs plugin: Replaced ipvs_strerror() with sstrerror().

ipvs_strerror() handles a few special cases in libipvs which are not
relevant in this plugin.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
17 years agoipvs plugin: Get IP_VS_SO_GET_INFO in ip_vs_get_services().
Sebastian Harl [Fri, 12 Oct 2007 12:31:29 +0000 (14:31 +0200)]
ipvs plugin: Get IP_VS_SO_GET_INFO in ip_vs_get_services().

IP_VS_SO_GET_INFO also provides the number of services which might change after
initializing the plugin. Also, the globale variable ipvs_info could be removed
as ip_vs_get_services() is the only function using these information.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>