nut plugin: Reconnect to the server if the connection is lost.
configure.in: Bumped version to 4.0.0-rc3.
src/plugin.c: Fix compiler-warnings for the Sun CC.
Assigning a (void *) to a function-pointer issues a warning with the Sun CC.
Assigning a (void *) to a function-pointer issues a warning with the Sun CC.
disk, tape plugin: Handle different `kstat_io_t' correctly.
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.
Also changed `src/Makefile.am' to link `collectd-nagios' with `libsocket' if needed.
disk plugin: The member-names of the `kstat_io_t'-struct were fixed.
cpu plugin: Don't use `COLLECT_STEP' anymore.
plugin.c: Take in account that `pthread_t' is a pointer under Darwin.
src/Makefile.am: Added `network.h' to the dependencies for the network plugin.
cpu plugin: Collectd CPU `steal time' as reported by new Linux kernels.
configure.in: Bumped version to 4.0.0-rc1.
Merge branch 'pull/collectd-4' into collectd-4
Merge branch 'pull/collectd-4' into collectd-4
configure/collectd.h: Undef unusable `NAN' from <math.h> before defining our own.
src/liboconfig/Makefile.am: Added `aux_types.h' to the list of dependencies.
Bumped version to 4.0.0-rc0; Updated ChangeLog.
Makefile.am: Removed `collectd.spec' from `EXTRA_DIST'.
AUTHORS: Added `Sjoerd van der Berg'.
plugin.c: Fix an endless loop.
configure: Added `libupsclient' to the library-overview.
nut plugin: Fix building without the `upsclient' library.
Merge branch 'master' into collectd-4
Conflicts:
src/iptables.c
Conflicts:
src/iptables.c
Merge branch 'collectd-3.11'
Conflicts:
ChangeLog
Conflicts:
ChangeLog
Bumped version to 3.11.3; Updated ChangeLog.
Merge branch 'pull/collectd-4' into collectd-4
exec plugin: Updated the documentation and sample configfile.
exec plugin: Send SIGTERM to all running child-processes when exiting.
nut plugin: Added a plugin to query the `upsd' from the `network ups tools'.
Merge branch 'pull/collectd-4' into collectd-4
Implemented `LoadDS' which tells plugins to only register their DataSources.
configure.in: Define `HAVE_LIBKSTAT' when the `kstat'-library exists.
{csv,network} plugin: Improved debug messages.
plugin.c: Implemented parallel reading of values.
network plugin: Implemented cache flush.
rrdtool plugin: Serialise access to the cache and to the function from the librrd.
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.
Of as advertised in the manpage, for that matter.
network plugin: Don't loop multicast-pakets back to ourself.
Also, some debug-messages have been changed.
Also, some debug-messages have been changed.
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.
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.
unixsock plugin: Use `format_name' rather than the local `cache_alloc_name'.
common.[ch]: Provide a function `format_name' to turn a value-list into its string representation.
{processes,unixsock} plugin: Remove annoying debug messages.
network plugin: Fix shutdown code.
plugin.[ch]: Implemented `plugin_unregister_config'.
sensors plugin: Fix programming mistakes.
syslog plugin: Fixed typo. s/sevetiry/severity/g;
collectd.conf(5): Documented the `iptables', `logfile', `processes', `syslog', and `unixsock' plugin.
collectd.conf.in: Added the `df' and `email' plugins.
logfile plugin: Don't call `access' with `stdout' and `stderr'.
Removed the `LOGFILE' and `COLLECT_{STEP,HEARTBEAT,XFF,RRAROWS}' defines.
network plugin: Fixed quite some bugs.
Added Perl-module `Collectd::Unixsock' to contrib/
unixsock plugin: Fixed many issues. `GETVAL' and `PUTVAL' are now mostly working as intended.
collectd.conf.in: Updated and sorted the example configfile.
interface plugin: Renamed the `traffic' plugin to `interface'.
logfile plugin: Renamed functions and changed error-messages to reflect the renaming.
Removed `utils_debug.[ch]' since debugging output is now handeled by the logging-statements.
logfile plugin: Renamed the `stderr' to `logfile'.
stderr plugin: Add `File' config option to log to a certain file.
Also make the actual log-action thread-safe.
Also make the actual log-action thread-safe.
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>
This plugin is heavily based on Florian's syslog plugin.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
plugin.c: Check if `list_log' is not NULL.
Replace all calls to `strerror' with `sstrerror'
.. which internally uses the thread-safe function `strerror_r'.
.. which internally uses the thread-safe function `strerror_r'.
iptables plugin: Remove `iptables_init' because it's not needed..
..and it causes the build to fail when `libiptc' wasn't present.
..and it causes the build to fail when `libiptc' wasn't present.
src/collectd.h: Don't load `syslog.h'.
Plugins should use `plugin_log' now.
Plugins should use `plugin_log' now.
Replace all syslog-calls with one of the new logging-macros.
iptables plugin: Converted to the new plugin interface.
Merge branch 'master' into collectd-4
Conflicts:
configure.in
Conflicts:
configure.in
Merge branch 'sb/iptables'
Conflicts:
configure.in
src/Makefile.am
src/collectd.conf.in
Conflicts:
configure.in
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.in: Added the iptables plugin.
iptables plugin: Implemented selection by rule-numbers.
syslog plugin: Added a `syslog' plugin which logs to syslog, using the new `log' interface.
src/plugin.[ch]: Add `log' callbacks.
collectd-nagios, rrdtool plugin, unixsock plugin: Use `isnan' rather than `==' or `!='.
src/collectd.h: Define a useable `NAN', based on `configure's findings.
configure.in: Added checks that find out how to include/define `NAN'.
email plugin: Converted to the new plugin interface.
Merge branch 'pull/collectd-4' into collectd-4
unixsock plugin: Replace `getgrnam' with `getgrnam_r'.
exec plugin: Replace `getpwnam' with `getpwnam_r'.
csv plugin: Replace `localtime' with `localtime_r'.
Replace all occurrences of `strtok' with `strtok_r'.
iptables plugin: Fix building under non-Linux systems.
iptables plugin: Use a global `libiptc' if it exists.
Will likely not build under non-Linux systems yet.
Will likely not build under non-Linux systems yet.
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.
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.
irq plugin: Fix for non-Linux systems.
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.
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.
src/collectd.conf.in: Added default entries for the `csv' and `rrdtool' plugins
.. and their options.
.. and their options.
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.
Since the `rrdtool' and `csv' plugins may be loaded at the same time, one may
want to configure another path for this plugin, too.
Merge branch 'ff/vserver' into collectd-4
users plugin: Remove old `DBG' statement.
load plugin: Use `gauge_t' rather than `double'.
vserver plugin: Converted to the new plugin interface.
users plugin: Converted to the new plugin interface.
rrdtool plugin: Implemented the settings `StepSize', `HeartBeat', `RRARows', and `XFF'.
The documentation has been updated, too.
The documentation has been updated, too.
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.
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.
Documented the lighttpd-support in `collectd(1)' and `collectd.conf(5)'.
irq plugin: Converted to the new plugin interface.
Merge branch 'master' into merge/collectd-4
Conflicts:
src/apache.c
Conflicts:
src/apache.c
Merge branch 'ph/irq'
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.
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.
rrdtool plugin: Updated the documentation in `collectd.conf(5)'
.. and the sample config file.
.. and the sample config file.