Code

collectd.git
17 years agocontrib/: Added `extractDS.px' and `migrate-3-4.px'
Florian Forster [Mon, 9 Apr 2007 10:59:14 +0000 (12:59 +0200)]
contrib/: Added `extractDS.px' and `migrate-3-4.px'

17 years agosrc/plugin.c: Ensure that `wait_time' is at least `interval_g'.
Florian Forster [Mon, 9 Apr 2007 10:57:05 +0000 (12:57 +0200)]
src/plugin.c: Ensure that `wait_time' is at least `interval_g'.

17 years agoconfigure.in: Bumped version to 4.0.0-rc3.
Florian Forster [Fri, 6 Apr 2007 08:17:43 +0000 (10:17 +0200)]
configure.in: Bumped version to 4.0.0-rc3.

17 years agosrc/plugin.c: Fix compiler-warnings for the Sun CC.
Florian Forster [Fri, 6 Apr 2007 08:08:45 +0000 (10:08 +0200)]
src/plugin.c: Fix compiler-warnings for the Sun CC.

Assigning a (void *) to a function-pointer issues a warning with the Sun CC.

17 years agodisk, tape plugin: Handle different `kstat_io_t' correctly.
Florian Forster [Fri, 6 Apr 2007 08:08:03 +0000 (10:08 +0200)]
disk, tape plugin: Handle different `kstat_io_t' correctly.

17 years agoconfigure.in: Many fixes for Solaris. Especially check the `kstat_io_t'-type for...
Florian Forster [Fri, 6 Apr 2007 08:07:18 +0000 (10:07 +0200)]
configure.in: Many fixes for Solaris. Especially check the `kstat_io_t'-type for it's members.

Also changed `src/Makefile.am' to link `collectd-nagios' with `libsocket' if needed.

17 years agodisk plugin: The member-names of the `kstat_io_t'-struct were fixed.
Florian Forster [Thu, 5 Apr 2007 19:03:52 +0000 (21:03 +0200)]
disk plugin: The member-names of the `kstat_io_t'-struct were fixed.

17 years agocpu plugin: Don't use `COLLECT_STEP' anymore.
Florian Forster [Thu, 5 Apr 2007 18:40:48 +0000 (20:40 +0200)]
cpu plugin: Don't use `COLLECT_STEP' anymore.

17 years agoplugin.c: Take in account that `pthread_t' is a pointer under Darwin.
Florian Forster [Thu, 5 Apr 2007 18:40:21 +0000 (20:40 +0200)]
plugin.c: Take in account that `pthread_t' is a pointer under Darwin.

17 years agosrc/Makefile.am: Added `network.h' to the dependencies for the network plugin.
Florian Forster [Thu, 5 Apr 2007 17:56:42 +0000 (19:56 +0200)]
src/Makefile.am: Added `network.h' to the dependencies for the network plugin.

17 years agocpu plugin: Collectd CPU `steal time' as reported by new Linux kernels.
Florian Forster [Thu, 5 Apr 2007 13:23:11 +0000 (15:23 +0200)]
cpu plugin: Collectd CPU `steal time' as reported by new Linux kernels.

17 years agoconfigure.in: Bumped version to 4.0.0-rc1.
Florian Forster [Tue, 3 Apr 2007 07:05:39 +0000 (09:05 +0200)]
configure.in: Bumped version to 4.0.0-rc1.

17 years agoMerge branch 'pull/collectd-4' into collectd-4
Florian Forster [Tue, 3 Apr 2007 07:05:19 +0000 (09:05 +0200)]
Merge branch 'pull/collectd-4' into collectd-4

17 years agoMerge branch 'pull/collectd-4' into collectd-4
Florian Forster [Tue, 3 Apr 2007 07:04:17 +0000 (09:04 +0200)]
Merge branch 'pull/collectd-4' into collectd-4

17 years agoconfigure/collectd.h: Undef unusable `NAN' from <math.h> before defining our own.
Florian Forster [Tue, 3 Apr 2007 07:03:51 +0000 (09:03 +0200)]
configure/collectd.h: Undef unusable `NAN' from <math.h> before defining our own.

17 years agosrc/liboconfig/Makefile.am: Added `aux_types.h' to the list of dependencies.
Florian Forster [Tue, 3 Apr 2007 07:02:56 +0000 (09:02 +0200)]
src/liboconfig/Makefile.am: Added `aux_types.h' to the list of dependencies.

17 years agoBumped version to 4.0.0-rc0; Updated ChangeLog.
Florian Forster [Mon, 2 Apr 2007 15:42:12 +0000 (17:42 +0200)]
Bumped version to 4.0.0-rc0; Updated ChangeLog.

17 years agoMakefile.am: Removed `collectd.spec' from `EXTRA_DIST'.
Florian Forster [Mon, 2 Apr 2007 15:41:22 +0000 (17:41 +0200)]
Makefile.am: Removed `collectd.spec' from `EXTRA_DIST'.

17 years agoAUTHORS: Added `Sjoerd van der Berg'.
Florian Forster [Mon, 2 Apr 2007 15:40:51 +0000 (17:40 +0200)]
AUTHORS: Added `Sjoerd van der Berg'.

17 years agoplugin.c: Fix an endless loop.
Florian Forster [Sun, 1 Apr 2007 17:13:30 +0000 (19:13 +0200)]
plugin.c: Fix an endless loop.

17 years agoconfigure: Added `libupsclient' to the library-overview.
Florian Forster [Sat, 31 Mar 2007 07:18:41 +0000 (09:18 +0200)]
configure: Added `libupsclient' to the library-overview.

17 years agonut plugin: Fix building without the `upsclient' library.
Florian Forster [Sat, 31 Mar 2007 06:15:43 +0000 (08:15 +0200)]
nut plugin: Fix building without the `upsclient' library.

17 years agoMerge branch 'master' into collectd-4
Florian Forster [Sat, 31 Mar 2007 06:12:22 +0000 (08:12 +0200)]
Merge branch 'master' into collectd-4

Conflicts:

src/iptables.c

17 years agoMerge branch 'collectd-3.11'
Florian Forster [Sat, 31 Mar 2007 06:09:50 +0000 (08:09 +0200)]
Merge branch 'collectd-3.11'

Conflicts:

ChangeLog

17 years agoBumped version to 3.11.3; Updated ChangeLog. collectd-3.11.3
Florian Forster [Fri, 30 Mar 2007 20:09:38 +0000 (22:09 +0200)]
Bumped version to 3.11.3; Updated ChangeLog.

17 years agoMerge branch 'pull/collectd-4' into collectd-4
Florian Forster [Fri, 30 Mar 2007 20:04:16 +0000 (22:04 +0200)]
Merge branch 'pull/collectd-4' into collectd-4

17 years agoexec plugin: Updated the documentation and sample configfile.
Florian Forster [Fri, 30 Mar 2007 20:03:52 +0000 (22:03 +0200)]
exec plugin: Updated the documentation and sample configfile.

17 years agoexec plugin: Send SIGTERM to all running child-processes when exiting.
Florian Forster [Fri, 30 Mar 2007 19:45:38 +0000 (21:45 +0200)]
exec plugin: Send SIGTERM to all running child-processes when exiting.

17 years agonut plugin: Added a plugin to query the `upsd' from the `network ups tools'.
Florian Forster [Fri, 30 Mar 2007 19:26:09 +0000 (21:26 +0200)]
nut plugin: Added a plugin to query the `upsd' from the `network ups tools'.

17 years agoMerge branch 'pull/collectd-4' into collectd-4
Florian Forster [Thu, 29 Mar 2007 17:22:11 +0000 (19:22 +0200)]
Merge branch 'pull/collectd-4' into collectd-4

17 years agoImplemented `LoadDS' which tells plugins to only register their DataSources.
Florian Forster [Thu, 29 Mar 2007 17:21:14 +0000 (19:21 +0200)]
Implemented `LoadDS' which tells plugins to only register their DataSources.

17 years agoconfigure.in: Define `HAVE_LIBKSTAT' when the `kstat'-library exists.
Florian Forster [Wed, 28 Mar 2007 15:43:57 +0000 (17:43 +0200)]
configure.in: Define `HAVE_LIBKSTAT' when the `kstat'-library exists.

17 years ago{csv,network} plugin: Improved debug messages.
Florian Forster [Wed, 28 Mar 2007 12:47:50 +0000 (14:47 +0200)]
{csv,network} plugin: Improved debug messages.

17 years agoplugin.c: Implemented parallel reading of values.
Florian Forster [Wed, 28 Mar 2007 07:20:31 +0000 (09:20 +0200)]
plugin.c: Implemented parallel reading of values.

17 years agonetwork plugin: Implemented cache flush.
Florian Forster [Wed, 28 Mar 2007 06:38:02 +0000 (08:38 +0200)]
network plugin: Implemented cache flush.

17 years agorrdtool plugin: Serialise access to the cache and to the function from the librrd.
Florian Forster [Tue, 27 Mar 2007 21:25:52 +0000 (23:25 +0200)]
rrdtool plugin: Serialise access to the cache and to the function from the librrd.

17 years agologfile plugin: Don't use `access' when adding a logfile: It does not work as expected.
Florian Forster [Tue, 27 Mar 2007 21:00:12 +0000 (23:00 +0200)]
logfile plugin: Don't use `access' when adding a logfile: It does not work as expected.

Of as advertised in the manpage, for that matter.

17 years agonetwork plugin: Don't loop multicast-pakets back to ourself.
Florian Forster [Tue, 27 Mar 2007 17:48:44 +0000 (19:48 +0200)]
network plugin: Don't loop multicast-pakets back to ourself.

Also, some debug-messages have been changed.

17 years agonetwork plugin: Implemented duplicate detection and a `Forward' option.
Florian Forster [Tue, 27 Mar 2007 16:58:56 +0000 (18:58 +0200)]
network plugin: Implemented duplicate detection and a `Forward' option.

The plugin will now only send values received via the network, if the `Forward'
option is set to `true'. Also, duplicates are detected and discarded,
preventing loops, duplicate entries and errors from RRDTool.

17 years agounixsock plugin: Use `format_name' rather than the local `cache_alloc_name'.
Florian Forster [Tue, 27 Mar 2007 15:24:21 +0000 (17:24 +0200)]
unixsock plugin: Use `format_name' rather than the local `cache_alloc_name'.

17 years agocommon.[ch]: Provide a function `format_name' to turn a value-list into its string...
Florian Forster [Tue, 27 Mar 2007 15:23:51 +0000 (17:23 +0200)]
common.[ch]: Provide a function `format_name' to turn a value-list into its string representation.

17 years ago{processes,unixsock} plugin: Remove annoying debug messages.
Florian Forster [Tue, 27 Mar 2007 14:31:51 +0000 (16:31 +0200)]
{processes,unixsock} plugin: Remove annoying debug messages.

17 years agonetwork plugin: Fix shutdown code.
Florian Forster [Tue, 27 Mar 2007 14:31:22 +0000 (16:31 +0200)]
network plugin: Fix shutdown code.

17 years agoplugin.[ch]: Implemented `plugin_unregister_config'.
Florian Forster [Tue, 27 Mar 2007 14:31:01 +0000 (16:31 +0200)]
plugin.[ch]: Implemented `plugin_unregister_config'.

17 years agosensors plugin: Fix programming mistakes.
Florian Forster [Tue, 27 Mar 2007 14:10:16 +0000 (16:10 +0200)]
sensors plugin: Fix programming mistakes.

17 years agosyslog plugin: Fixed typo. s/sevetiry/severity/g;
Florian Forster [Tue, 27 Mar 2007 13:09:46 +0000 (15:09 +0200)]
syslog plugin: Fixed typo. s/sevetiry/severity/g;

17 years agocollectd.conf(5): Documented the `iptables', `logfile', `processes', `syslog', and...
Florian Forster [Tue, 27 Mar 2007 13:09:14 +0000 (15:09 +0200)]
collectd.conf(5): Documented the `iptables', `logfile', `processes', `syslog', and `unixsock' plugin.

17 years agocollectd.conf.in: Added the `df' and `email' plugins.
Florian Forster [Tue, 27 Mar 2007 13:08:03 +0000 (15:08 +0200)]
collectd.conf.in: Added the `df' and `email' plugins.

17 years agologfile plugin: Don't call `access' with `stdout' and `stderr'.
Florian Forster [Tue, 27 Mar 2007 13:07:23 +0000 (15:07 +0200)]
logfile plugin: Don't call `access' with `stdout' and `stderr'.

17 years agoRemoved the `LOGFILE' and `COLLECT_{STEP,HEARTBEAT,XFF,RRAROWS}' defines.
Florian Forster [Mon, 26 Mar 2007 16:44:27 +0000 (18:44 +0200)]
Removed the `LOGFILE' and `COLLECT_{STEP,HEARTBEAT,XFF,RRAROWS}' defines.

17 years agonetwork plugin: Fixed quite some bugs.
Florian Forster [Mon, 26 Mar 2007 14:29:07 +0000 (16:29 +0200)]
network plugin: Fixed quite some bugs.

17 years agoAdded Perl-module `Collectd::Unixsock' to contrib/
Florian Forster [Mon, 26 Mar 2007 12:41:01 +0000 (14:41 +0200)]
Added Perl-module `Collectd::Unixsock' to contrib/

17 years agounixsock plugin: Fixed many issues. `GETVAL' and `PUTVAL' are now mostly working...
Florian Forster [Mon, 26 Mar 2007 12:39:52 +0000 (14:39 +0200)]
unixsock plugin: Fixed many issues. `GETVAL' and `PUTVAL' are now mostly working as intended.

17 years agocollectd.conf.in: Updated and sorted the example configfile.
Florian Forster [Mon, 26 Mar 2007 12:38:29 +0000 (14:38 +0200)]
collectd.conf.in: Updated and sorted the example configfile.

17 years agointerface plugin: Renamed the `traffic' plugin to `interface'.
Florian Forster [Mon, 26 Mar 2007 09:35:15 +0000 (11:35 +0200)]
interface plugin: Renamed the `traffic' plugin to `interface'.

17 years agologfile plugin: Renamed functions and changed error-messages to reflect the renaming.
Florian Forster [Mon, 26 Mar 2007 09:24:41 +0000 (11:24 +0200)]
logfile plugin: Renamed functions and changed error-messages to reflect the renaming.

17 years agoRemoved `utils_debug.[ch]' since debugging output is now handeled by the logging...
Florian Forster [Mon, 26 Mar 2007 09:09:28 +0000 (11:09 +0200)]
Removed `utils_debug.[ch]' since debugging output is now handeled by the logging-statements.

17 years agologfile plugin: Renamed the `stderr' to `logfile'.
Florian Forster [Mon, 26 Mar 2007 09:02:20 +0000 (11:02 +0200)]
logfile plugin: Renamed the `stderr' to `logfile'.

17 years agostderr plugin: Add `File' config option to log to a certain file.
Florian Forster [Mon, 26 Mar 2007 08:57:52 +0000 (10:57 +0200)]
stderr plugin: Add `File' config option to log to a certain file.

Also make the actual log-action thread-safe.

17 years agostderr plugin: Added "stderr" plugin to log to stderr.
Sebastian Harl [Sun, 25 Mar 2007 21:40:02 +0000 (23:40 +0200)]
stderr plugin: Added "stderr" plugin to log to stderr.

This plugin is heavily based on Florian's syslog plugin.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
17 years agoplugin.c: Check if `list_log' is not NULL.
Sebastian Harl [Mon, 26 Mar 2007 08:23:35 +0000 (10:23 +0200)]
plugin.c: Check if `list_log' is not NULL.

17 years agoReplace all calls to `strerror' with `sstrerror'
Florian Forster [Mon, 26 Mar 2007 08:15:04 +0000 (10:15 +0200)]
Replace all calls to `strerror' with `sstrerror'

.. which internally uses the thread-safe function `strerror_r'.

17 years agoiptables plugin: Remove `iptables_init' because it's not needed..
Florian Forster [Fri, 16 Mar 2007 10:45:15 +0000 (11:45 +0100)]
iptables plugin: Remove `iptables_init' because it's not needed..

..and it causes the build to fail when `libiptc' wasn't present.

17 years agosrc/collectd.h: Don't load `syslog.h'.
Florian Forster [Thu, 15 Mar 2007 20:07:18 +0000 (21:07 +0100)]
src/collectd.h: Don't load `syslog.h'.

Plugins should use `plugin_log' now.

17 years agoReplace all syslog-calls with one of the new logging-macros.
Florian Forster [Thu, 15 Mar 2007 18:34:46 +0000 (19:34 +0100)]
Replace all syslog-calls with one of the new logging-macros.

17 years agoiptables plugin: Converted to the new plugin interface.
Florian Forster [Thu, 15 Mar 2007 18:05:23 +0000 (19:05 +0100)]
iptables plugin: Converted to the new plugin interface.

17 years agoMerge branch 'master' into collectd-4
Florian Forster [Thu, 15 Mar 2007 17:33:12 +0000 (18:33 +0100)]
Merge branch 'master' into collectd-4

Conflicts:

configure.in

17 years agoMerge branch 'sb/iptables'
Florian Forster [Wed, 14 Mar 2007 22:24:38 +0000 (23:24 +0100)]
Merge branch 'sb/iptables'

Conflicts:

configure.in
src/Makefile.am
src/collectd.conf.in

17 years agosrc/collectd.conf.in: Added the iptables plugin.
Florian Forster [Wed, 14 Mar 2007 22:21:56 +0000 (23:21 +0100)]
src/collectd.conf.in: Added the iptables plugin.

17 years agoiptables plugin: Implemented selection by rule-numbers.
Florian Forster [Wed, 14 Mar 2007 22:21:36 +0000 (23:21 +0100)]
iptables plugin: Implemented selection by rule-numbers.

17 years agosyslog plugin: Added a `syslog' plugin which logs to syslog, using the new `log'...
Florian Forster [Wed, 14 Mar 2007 08:55:51 +0000 (09:55 +0100)]
syslog plugin: Added a `syslog' plugin which logs to syslog, using the new `log' interface.

17 years agosrc/plugin.[ch]: Add `log' callbacks.
Florian Forster [Wed, 14 Mar 2007 08:55:05 +0000 (09:55 +0100)]
src/plugin.[ch]: Add `log' callbacks.

17 years agocollectd-nagios, rrdtool plugin, unixsock plugin: Use `isnan' rather than `==' or...
Florian Forster [Mon, 12 Mar 2007 11:43:18 +0000 (12:43 +0100)]
collectd-nagios, rrdtool plugin, unixsock plugin: Use `isnan' rather than `==' or `!='.

17 years agosrc/collectd.h: Define a useable `NAN', based on `configure's findings.
Florian Forster [Mon, 12 Mar 2007 11:42:07 +0000 (12:42 +0100)]
src/collectd.h: Define a useable `NAN', based on `configure's findings.

17 years agoconfigure.in: Added checks that find out how to include/define `NAN'.
Florian Forster [Mon, 12 Mar 2007 11:34:16 +0000 (12:34 +0100)]
configure.in: Added checks that find out how to include/define `NAN'.

17 years agoemail plugin: Converted to the new plugin interface.
Florian Forster [Sat, 10 Mar 2007 12:08:55 +0000 (13:08 +0100)]
email plugin: Converted to the new plugin interface.

17 years agoMerge branch 'pull/collectd-4' into collectd-4
Florian Forster [Sat, 10 Mar 2007 09:52:02 +0000 (10:52 +0100)]
Merge branch 'pull/collectd-4' into collectd-4

17 years agounixsock plugin: Replace `getgrnam' with `getgrnam_r'.
Florian Forster [Sat, 10 Mar 2007 09:49:18 +0000 (10:49 +0100)]
unixsock plugin: Replace `getgrnam' with `getgrnam_r'.

17 years agoexec plugin: Replace `getpwnam' with `getpwnam_r'.
Florian Forster [Sat, 10 Mar 2007 09:38:05 +0000 (10:38 +0100)]
exec plugin: Replace `getpwnam' with `getpwnam_r'.

17 years agocsv plugin: Replace `localtime' with `localtime_r'.
Florian Forster [Sat, 10 Mar 2007 09:29:18 +0000 (10:29 +0100)]
csv plugin: Replace `localtime' with `localtime_r'.

17 years agoReplace all occurrences of `strtok' with `strtok_r'.
Florian Forster [Sat, 10 Mar 2007 08:48:54 +0000 (09:48 +0100)]
Replace all occurrences of `strtok' with `strtok_r'.

17 years agoiptables plugin: Fix building under non-Linux systems.
Florian Forster [Sat, 3 Mar 2007 12:39:41 +0000 (13:39 +0100)]
iptables plugin: Fix building under non-Linux systems.

17 years agoiptables plugin: Use a global `libiptc' if it exists.
Florian Forster [Sat, 3 Mar 2007 10:32:58 +0000 (11:32 +0100)]
iptables plugin: Use a global `libiptc' if it exists.

Will likely not build under non-Linux systems yet.

17 years agoiptables plugin: Adds a plugin to collect iptables'-counters.
Sjoerd van der Berg [Sat, 3 Mar 2007 09:35:35 +0000 (10:35 +0100)]
iptables plugin: Adds a plugin to collect iptables'-counters.

My first attempt at a module for this is an iptables modules This will try to
read out the rules from iptables for a specific table and chain.
It will go through the rules looking for ones with "comment" matches and will
use the comment as a base for the generated filename.

So basically looking for lines like
 $ iptables -t mangle -A incoming -p tcp -m comment --comment "tcp"
will generate a iptables-incoming/tcp.rrd file from the byte counters

There used to also be an account iptables module but that seems to have been
neglected, which would generate /proc entries for specific rules, don't know
what would work better. Either way, this seems to work somewhat.

17 years agoirq plugin: Fix for non-Linux systems.
Florian Forster [Thu, 1 Mar 2007 18:59:26 +0000 (19:59 +0100)]
irq plugin: Fix for non-Linux systems.

17 years agosrc/common.c: Allow `check_create_dir' to create absolute directories.
Florian Forster [Thu, 1 Mar 2007 11:17:35 +0000 (12:17 +0100)]
src/common.c: Allow `check_create_dir' to create absolute directories.

Since the `DataDir' of the `csv' and `rrdtool' plugins are seperate from the
`BaseDir' setting, it makes sense to allow absolute directories here. The
(possibly more secure) alternative would be to disallow absolute directories
and force the user to create SymLinks instead.

17 years agosrc/collectd.conf.in: Added default entries for the `csv' and `rrdtool' plugins
Florian Forster [Thu, 1 Mar 2007 11:15:14 +0000 (12:15 +0100)]
src/collectd.conf.in: Added default entries for the `csv' and `rrdtool' plugins

.. and their options.

17 years agocsv plugin: Add a `DataDir' option.
Florian Forster [Thu, 1 Mar 2007 11:14:39 +0000 (12:14 +0100)]
csv plugin: Add a `DataDir' option.

Since the `rrdtool' and `csv' plugins may be loaded at the same time, one may
want to configure another path for this plugin, too.

17 years agoMerge branch 'ff/vserver' into collectd-4
Florian Forster [Wed, 28 Feb 2007 15:14:34 +0000 (16:14 +0100)]
Merge branch 'ff/vserver' into collectd-4

17 years agousers plugin: Remove old `DBG' statement.
Florian Forster [Wed, 28 Feb 2007 15:10:03 +0000 (16:10 +0100)]
users plugin: Remove old `DBG' statement.

17 years agoload plugin: Use `gauge_t' rather than `double'.
Florian Forster [Wed, 28 Feb 2007 15:09:39 +0000 (16:09 +0100)]
load plugin: Use `gauge_t' rather than `double'.

17 years agovserver plugin: Converted to the new plugin interface.
Florian Forster [Wed, 28 Feb 2007 15:06:03 +0000 (16:06 +0100)]
vserver plugin: Converted to the new plugin interface.

17 years agousers plugin: Converted to the new plugin interface.
Florian Forster [Wed, 28 Feb 2007 13:34:10 +0000 (14:34 +0100)]
users plugin: Converted to the new plugin interface.

17 years agorrdtool plugin: Implemented the settings `StepSize', `HeartBeat', `RRARows', and...
Florian Forster [Wed, 28 Feb 2007 10:43:37 +0000 (11:43 +0100)]
rrdtool plugin: Implemented the settings `StepSize', `HeartBeat', `RRARows', and `XFF'.

The documentation has been updated, too.

17 years agoIntroduce two global variables: `hostname_g' and `interval_g'.
Florian Forster [Wed, 28 Feb 2007 09:41:55 +0000 (10:41 +0100)]
Introduce two global variables: `hostname_g' and `interval_g'.

hostname_g: Hostname we're running on. May be set in the configfile with the
  `Hostname'-option. This replaces the global `hostname'-variable exported by
  `plugin.c'.
interval_g: Interval in which we query the read plugins. This replaces the
  `COLLECTD_STEP'-define and is configurable using the `Interval'-option.

17 years agoDocumented the lighttpd-support in `collectd(1)' and `collectd.conf(5)'.
Florian Forster [Wed, 28 Feb 2007 08:34:39 +0000 (09:34 +0100)]
Documented the lighttpd-support in `collectd(1)' and `collectd.conf(5)'.

17 years agoirq plugin: Converted to the new plugin interface.
Florian Forster [Wed, 28 Feb 2007 08:21:41 +0000 (09:21 +0100)]
irq plugin: Converted to the new plugin interface.

17 years agoMerge branch 'master' into merge/collectd-4
Florian Forster [Wed, 28 Feb 2007 08:08:19 +0000 (09:08 +0100)]
Merge branch 'master' into merge/collectd-4

Conflicts:

src/apache.c

17 years agoMerge branch 'ph/irq'
Florian Forster [Wed, 28 Feb 2007 07:54:36 +0000 (08:54 +0100)]
Merge branch 'ph/irq'

17 years agoirq plugin: Fixed some issues, renamed RRD-files.
Florian Forster [Wed, 28 Feb 2007 07:53:33 +0000 (08:53 +0100)]
irq plugin: Fixed some issues, renamed RRD-files.

I've looked into your plugin in more detail just now and fixed the
following issues:
- Moved the RRD-files into a subdirectory called `irq'. That's how it's
  going to be done in the next major version.
- Renamed the DS to `value' and set the maximum value to 65535. I'm not
  sure if this maximum value is big enough..?
- Don't use `LOG_EMERG' when config-problems are found. Rather, print to
  `STDERR' since it's still available during configuration.
- Use `strsplit' when parsing `/proc/interrupts'. This makes much of the
  pointer-arithmetic obsolete and the code much more readable.
- The device names are not used in the filename, though I'm not certain
  if that's the way to go here.. On my workstation there is a line like
  this:
    193:      28492   IO-APIC-level  uhci_hcd, uhci_hcd, uhci_hcd, ehci_hcd
  Apparently the interrupt is shared among several USB-controllers. My
  problem here is, that as soon as one device is deactivated or the
  order changes, so does the filename. Besides, a filename along the
  lines of `irq-193-uhci_hcd-ehci_hcd.rrd' would be nice.
  On another machine I have this line:
    217:   50173955          0   IO-APIC-level  3ware Storage Controller
  Where one device somehow manages to write a _description_ in there.
  This makes detection of such shared interrupts as above tricky.
  If anyone has a good idea how to use the last part of the lines for a
  filename, please let me know.