unixsock plugin: Finally fixed the `pthread_t'-initialization to be platform independant.
unixsock plugin: Fix the initialization of the pthread variable under Mac OS X.
processes plugin: Converted to the new plugin interface.
A first version anyways.
A first version anyways.
Merge branch 'pull/collectd-4'
cpu plugin: Remove newline from syslog message.
src/plugin.c: Implemented delaying of read-functions that fail.
The usual quadratic increase of delay-intervals is being used to disable the
function for up to 24 hours.
The usual quadratic increase of delay-intervals is being used to disable the
function for up to 24 hours.
cpufreq plugin: Converted to the new plugin interface.
src/plugin.[ch]: Provide unregister-functions for plugins to remove certain functions.
disk plugin: Converted to the new plugin interface.
battery plugin: Converted to the new plugin interface.
df plugin: Converted to the new plugin interface.
unixsock plugin: Make created threads to be `detached'.
cpu plugin: Write each CPU-counter in a seperate RRD-file.
This has proven to be a lot more flexible. And if we're to add `interrupt' and
`soft interrupt' counters anyway, we might as well change it to this superior
layout.
This has proven to be a lot more flexible. And if we're to add `interrupt' and
`soft interrupt' counters anyway, we might as well change it to this superior
layout.
unixsock plugin, collectd-nagios: Use the hostname, too, to identify values.
This is, of course, necessary, because many hosts may submit their values.
This is, of course, necessary, because many hosts may submit their values.
collectd-nagios: Added an option to select certain DSes and updated the usage.
collectd-nagios: Added a small program to perform Nagios-compatible checks on values.
unixsock plugin: Transmit the DS name so clients can chose which values they need.
Merge branch 'collectd-4' into ff/unixsock
cpu plugin: Fix a bug in the data-set description.
unixsock plugin: Added a first version of a UNIX-socket output plugin.
The goal is to build a nagios-interface on top of this.
The goal is to build a nagios-interface on top of this.
Merge branch 'pull/collectd-4'
apple_sensors plugin: Converted to the new plugin interface.
cpu plugin: Improved some syslog messages.
Also updated the copyright notice.
Also updated the copyright notice.
nfs plugin: Fixes to work under !Linux.
traffic plugin: Fix the plugin to work under Mac OS X.
csv plugin: Fixed the initialization of `struct flock' to be portable.
It didn't work on Mac OS X for example.
It didn't work on Mac OS X for example.
Merge branch 'ff/entropy' into collectd-4
traffic plugin: Updated copyright notice.
sensors plugin: Fixed some syntactic errors.
17 years agosensors plugin: Improved the data sources, changed the license and updated the copyri...
sensors plugin: Improved the data sources, changed the license and updated the copyright notice.
apcups plugin: Converted to the new plugin interface.
src/collectd.h: Include `math.h' and try to force it to define `NAN'.
entropy plugin: Added a plugin to collect available entropy.
Only works on Linux systems right now..
Only works on Linux systems right now..
ping plugin: Converted to the new plugin interface.
memory plugin: Converted to the new plugin interface.
network plugin: Use a global buffer and fill it as much as possible.
This should lessen network load, hopefully.
This should lessen network load, hopefully.
src/common.c: Removed `log_update_file' and `log_create_file'.
Also changed the license to GPLv2-only and updated the copyright date.
Also changed the license to GPLv2-only and updated the copyright date.
csv plugin: Added this plugin which writes to CSV files.
This is basically the old `logfile' functionality.
This is basically the old `logfile' functionality.
cpu plugin: Converted to the new plugin interface.
src/collectd.conf.in: Added the rrdtool plugin and configuration examples.
load, traffic plugins: Changed license to GPLv2 only.
apache plugin: Converted to the new plugin interface.
Merge branch 'master' into collectd-4
Conflicts:
src/sensors.c
Conflicts:
src/sensors.c
17 years agoMerge branch 'ff/plugins-ng' of octo@verplant.org:/var/lib/git/collectd into ff/plugi...
Merge branch 'ff/plugins-ng' of octo@verplant.org:/var/lib/git/collectd into ff/plugins-ng
sensors plugin: Converted to the new plugin interface.
17 years agosrc/plugin.[ch]: Store the hostname in a global variable to minimize calls to `gethos...
src/plugin.[ch]: Store the hostname in a global variable to minimize calls to `gethostname'.
src/plugin.h: Added `VALUE_LIST_INIT', a static initializer for value_list_t.
nfs plugin: Ported to the new plugin structure.
network plugin: Don't case an int to a void*, because some systems don't like it..
collectd.conf(5): Documented the option of the rrdtool-plugin.
rrdtool plugin: Implemented caching of values to minimize IO operations.
Use the `CacheTimeout' option to enable this feature.
Use the `CacheTimeout' option to enable this feature.
src/utils_llist.[ch]: Implemented `llist_remove'.
traffic plugin: Converted the plugin to the new plugin ifrastructure.
network plugin: Fix many bugs, especially `hton*' and `ntoh*' related.
load plugin: Set the hostname to something meaningfull, not `localhost'.
rrdtool plugin: Use the time supplied by the value list, not `N'.
src/plugin.[ch]: Include the time in the value list.
This is necessary when we will implement caching in the future.
This is necessary when we will implement caching in the future.
src/Makefile.am: Link the network plugin against pthread.
Merge branch 'master' into ff/plugins-ng
Conflicts:
src/collectd.c
src/network.c
Conflicts:
src/collectd.c
src/network.c
src/{dns,ntpd}.c: Use <poll.h> rather than <sys/poll.h>.
src/{collectd,plugin}.[ch]: Changed license to GPLv2 only.
src/configfile.c: Removed `cf_callback_socket'
.. since the network stuff is now implemented as a plugin.
.. since the network stuff is now implemented as a plugin.
network plugin: Changed the old network code to work as a plugin.
It's mostly untested, but basic sending appears to work fine.
It's mostly untested, but basic sending appears to work fine.
rrdtool plugin: Fixed misc. bugs and changed license to GPLv2 only.
common.c: Implemented `ntohll' and `htonll'.
email plugin: Ignore size if it less than or equal to zero.
Some daemons (e.g. postgrey) don't provide any size information.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Some daemons (e.g. postgrey) don't provide any size information.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
sensors plugin: Avoid assertion in ignorelist_match () when not configured.
If the sensors plugin is not configured (i.e. default settings are used) the
ignorelist (sensors_list) is never created causing the assertion in
ignorelist_match () to fail. This fixes it.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
If the sensors plugin is not configured (i.e. default settings are used) the
ignorelist (sensors_list) is never created causing the assertion in
ignorelist_match () to fail. This fixes it.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Bumped version to 3.11.0; Updated ChangeLog.
src/collectd.h: Don't mess with the syslog-stuff if it's present.
No idea where it came from, but it's not necessary, thus remove it. This even
resolves a conflice with some newer glibc version.
No idea where it came from, but it's not necessary, thus remove it. This even
resolves a conflice with some newer glibc version.
AUTHORS: Converted to UTF-8 and added Lubos' efforts.
Added the `mbmon' plugin to the ChangeLog for 3.11.0
.. and Flavio Stanchina to the list of contributors.
.. and Flavio Stanchina to the list of contributors.
Merge branch 'fs/mbmon'
Merge branch 'ls/sensors'
mbmon plugin: Change the definition of the RRD files.
Change the RRD files to be of the same format as the `apple_sensors' or the
`sensors extended' formats.
Change the RRD files to be of the same format as the `apple_sensors' or the
`sensors extended' formats.
Merge branch 'sh/email'
email plugin: Unlock mutexes before submitting the data.
All values are copied to local data structures in email_read () before they
are submitted. Thus the mutex can be unlocked before data is sent to the rrd
files or the network.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
All values are copied to local data structures in email_read () before they
are submitted. Thus the mutex can be unlocked before data is sent to the rrd
files or the network.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Merge branch 'collectd-3.10'
Conflicts:
ChangeLog
Conflicts:
ChangeLog
Bumped version to 3.10.4; Updated ChangeLog.
Bug#404018: Close the file descriptor when binding to a socket fails.
This closes the second part of the bug reported by Max Kellermann.
This closes the second part of the bug reported by Max Kellermann.
Bug#404018: Break out of the `while (loop)'-loop when no socket can be opened.
This fixes the first part of the bug reported by Max Kellermann.
This fixes the first part of the bug reported by Max Kellermann.
New plugin "mbmon" to collect motherboard status information:
temperatures, voltages and cooling fan speeds.
Signed-off-by: Flavio Stanchina <flavio@stanchina.net>
temperatures, voltages and cooling fan speeds.
Signed-off-by: Flavio Stanchina <flavio@stanchina.net>
email plugin: Made read_{char,line} functions static.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Sebastian Harl <sh@tokkee.org>
email plugin: Write "0" values as well to distinguish from NaN's.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Sebastian Harl <sh@tokkee.org>
collectd{,.conf}.pod: Extended and clarified documentation of the email plugin.
* Added a description of the protocol and the DS's to the manpage.
* Make clear that the group of the UNIX socket is always changed when running
as root.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
* Added a description of the protocol and the DS's to the manpage.
* Make clear that the group of the UNIX socket is always changed when running
as root.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
sensors plugin: Simplify the reload machanism.
Instead of calling `stat' in the `read' function and then, eventually, calling
the reload stuff, just call the reload function every time and have it return
without doing anything if the config didn't change. This way the reload logic
is not in the read function.
Instead of calling `stat' in the `read' function and then, eventually, calling
the reload stuff, just call the reload function every time and have it return
without doing anything if the config didn't change. This way the reload logic
is not in the read function.
Merge branches 'sh/email' and 'ls/processes'
sensors plugin: Reload lm_sensors' configuration when changed
Signed-off-by: Stanek Lubos <kolektor@atlas.cz>
Signed-off-by: Stanek Lubos <kolektor@atlas.cz>
sensors plugin: Made sensors.conf path configurable
Signed-off-by: Stanek Lubos <kolektor@atlas.cz>
Signed-off-by: Stanek Lubos <kolektor@atlas.cz>
sensors plugin: syslog() and DBG() calls unification
Signed-off-by: Stanek Lubos <kolektor@atlas.cz>
Signed-off-by: Stanek Lubos <kolektor@atlas.cz>
processes plugin: Do not complain of a disappeared task's proc dir
Signed-off-by: Stanek Lubos <kolektor@atlas.cz>
Signed-off-by: Stanek Lubos <kolektor@atlas.cz>
email plugin: Prepend the module name to any syslog messages
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Sebastian Harl <sh@tokkee.org>
email plugin: Kill threads before closing the associated socket
If the socket is closed before the thread is terminated it might cause some
confusing error messages if the thread wants to read from the socket.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
If the socket is closed before the thread is terminated it might cause some
confusing error messages if the thread wants to read from the socket.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
SA plugin: Documentation updates
Signed-off-by: Alexander Wirt <formorer@formorer.de>
Signed-off-by: Alexander Wirt <formorer@formorer.de>
SA plugin: Added reconnect support (collectd_retries), code cleanup
The plugin now tries to reconnect if connection isn't possible
(default is 3 tries), this can adjusted with the collectd_retries
config parameter.
Signed-off-by: Alexander Wirt <formorer@formorer.de>
The plugin now tries to reconnect if connection isn't possible
(default is 3 tries), this can adjusted with the collectd_retries
config parameter.
Signed-off-by: Alexander Wirt <formorer@formorer.de>
src/Makefile.am: Added utils_dns.h to dns_la_SOURCES.
Without this change the .tar.{bz2,gz} does not contain utils_dns.h.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Without this change the .tar.{bz2,gz} does not contain utils_dns.h.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
contrib/collection.cgi: Added support for the email plugin.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Sebastian Harl <sh@tokkee.org>
email plugin: Do not allocate memory for the return value in read_line ().
The read_line () function now uses the provided buffer to save the return
value to. In case no complete line could be read, read_line () is called
recursively until '\n' has been found or end-of-file has been reached.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
The read_line () function now uses the provided buffer to save the return
value to. In case no complete line could be read, read_line () is called
recursively until '\n' has been found or end-of-file has been reached.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
email plugin: Use a thread pool.
Up to now the email plugin created a thread for each connection. This thread
was destroyed after the connection has been closed. Now, a pool containing
MaxConns threads is created and a new connection is assigned to a free thread.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Up to now the email plugin created a thread for each connection. This thread
was destroyed after the connection has been closed. Now, a pool containing
MaxConns threads is created and a new connection is assigned to a free thread.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
email plugin: Prevent a segfault in read_line ().
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Sebastian Harl <sh@tokkee.org>
SpamAssassin plugin: Reclicense again und remove debugging die
Due to some misunderstanding Artistic was not the right license so
I should GPL now instead of Artistic.
Additionally I removed a debugging "die" that should never have been checked
in into my svn repo (Thanks tokkee).
Signed-off-by: Alexander Wirt <formorer@formorer.de>
Due to some misunderstanding Artistic was not the right license so
I should GPL now instead of Artistic.
Additionally I removed a debugging "die" that should never have been checked
in into my svn repo (Thanks tokkee).
Signed-off-by: Alexander Wirt <formorer@formorer.de>