collectd-unixsock(5): Copied Sebastian's additions from collectd-exec(5).
16 years agoMerge branch 'collectd-4.1' of octo@verplant.org:/var/lib/git/collectd into collectd-4.1
Merge branch 'collectd-4.1' of octo@verplant.org:/var/lib/git/collectd into collectd-4.1
src/common.h: Fixed many typos in the header file.
apache plugin: Improved some error messages and fixed-buffer string copying.
Return an error when initialization fails. This includes the case when no URL
is configured. The user is informed about this as clear as possible.
Also, `strncpy' and `snprintf' now are followed by a forced NULL-termination of
the strings to be on the save side. This also changes the plugin to look more
like the other plugins which mostly do this already.
Return an error when initialization fails. This includes the case when no URL
is configured. The user is informed about this as clear as possible.
Also, `strncpy' and `snprintf' now are followed by a forced NULL-termination of
the strings to be on the save side. This also changes the plugin to look more
like the other plugins which mostly do this already.
apache plugin: Do not initialize the plugin if no URL has been specified.
There is no need to initialize curl, if the plugin will not be used anyway.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
There is no need to initialize curl, if the plugin will not be used anyway.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
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>
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>
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>
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>
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>
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>
ChangeLog: Fixed the date of the 4.1.6 release.
Bumped version to 4.1.6; Updated ChangeLog.
src/configfile.c: Updated the copyright notice for 2008.
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>
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
collectd.conf(5): Documented the fact that the configuration is processes from top to bottom.
collectd.conf(5): Added a note about plugin loading order.
src/configfile.c: Improve the "Plugin `%s' did not register a callback." warning.
unixsock plugin: Actually set the permissions for the socket.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Bumped version to 4.1.5; Updated ChangeLog.
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.
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.
sensors plugin: Implemented support for libsensors3.
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>
* 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>
rrdtool plugin: Fix a memory leak..
..in a VERY uncommon/rare case.
..in a VERY uncommon/rare case.
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..
The prefix `avl_' clashed with an AVL implementation on Solaris 10..
Bumped version to 4.1.4; Updated ChangeLog
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!
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!
snmp plugin: Be even more eager to free PDU structures.
snmp plugin: (Hopefully) fix a memory leak.
exec plugin: Set PID of failed programs back to zero.
Otherwise the program will not be executed ever again after it failed once.
Otherwise the program will not be executed ever again after it failed once.
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.
The script has an embedded POD documentation.
Merge branch 'pull/collectd-4.1' into collectd-4.1
types.db: Fix a typo: s/humitidy/humidity/
types.db: Ordered the entries alphabetically and added `voltage_threshold'.
rrdtool plugin: Wait for the ``queue thread'' to exit _after_ signaling it to exit..
collectd-snmp(5): Fix typos.
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>
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
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>
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>
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>
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>
src/common.c: Serialize access to `strerror' if `strerror_r' doesn't exist.
Apparently this is a problem under Solaris 9..
Apparently this is a problem under Solaris 9..
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)
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)
Build system: Set the appropriate CPPFLAGS and LDFLAGS when checking for librrd and it's header.
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.
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.
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..
This should work with machines with up to 16 processors..
Bumped version to 4.1.3; Updated ChangeLog.
contrib/PerlLib/Collectd.pm: Bumped version to 4.1.3.
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>
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Beautifying some more debug messages..
Merge branch 'collectd-4.0' into collectd-4.1
Conflicts:
src/rrdtool.c
Conflicts:
src/rrdtool.c
Beautifying many debug messages..
rrdtool plugin: Wait for the `queue thread' to exit..
..before returning from the shutdown function.
..before returning from the shutdown function.
network plugin: Flush the buffer in the `shutdown' function..
xmms plugin: Return `-1' when values could be read but are weird.
README: Improved formatting.
Indent all paragraphs by two spaces and break lines after 79 characters.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Indent all paragraphs by two spaces and break lines after 79 characters.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
README: Added a note about collectd and chkrootkit.
chkrootkit reports collectd as a packet sniffer, which most probably is a
false positive if using the "dns" plugin.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
chkrootkit reports collectd as a packet sniffer, which most probably is a
false positive if using the "dns" plugin.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
ChangeLog: Added the change to the rrdtool build stuff..
collectd.conf.in: Removed advanced and possibly harmfull settings..
Users were simply un-commenting everything without knowing what the settings
did, so removing possibly harmful settings seems reasonable.
Users were simply un-commenting everything without knowing what the settings
did, so removing possibly harmful settings seems reasonable.
snmp plugin: Improve the timing method, so that hosts are queried more steadily.
rrdtool plugin: Use the right variables when calling `rrd_update'..
*argl*
*argl*
rrdtool plugin: Removed unused variables.
rrdtool plugin: Use the thread-safe `librrd_th' if available.
collectd-snmp(5): Added a note about the interpreted environment variables.
snmp plugin: Print a warning if querying a host takes longer than the confiured interval.
collectd.conf(5): Fix some typos and mis-formulations.
Merge branch 'pull/collectd-4.1' into collectd-4.1
Merge branch 'pull/collectd-4.0' into collectd-4.0
Bumped version to 4.1.2; Updated ChangeLog.
Merge branch 'collectd-4.0' into collectd-4.1
Conflicts:
ChangeLog
configure.in
contrib/PerlLib/Collectd.pm
Conflicts:
ChangeLog
configure.in
contrib/PerlLib/Collectd.pm
Bumped version to 4.0.9; Updated ChangeLog.
Merge branch 'collectd-3.11' into collectd-4.0
Conflicts:
ChangeLog
configure.in
src/wireless.c
Conflicts:
ChangeLog
configure.in
src/wireless.c
Bumped version to 3.11.7; Updated ChangeLog.
Merge branch 'ff/collection' into collectd-4.0
contrib/collection.cgi: Add a vertical legend to `meta_graph_memory'.
contrib/collection.cgi: Fix the `charge' and `current' graphs.
Merge branch 'pull/collectd-4.1' into collectd-4.1
17 years agocollectd.conf(5): Make it more clear that rrdtool's `StepSize' and `HeartBeat' should...
collectd.conf(5): Make it more clear that rrdtool's `StepSize' and `HeartBeat' should not be set.
This has caused some problems with users of the snmp plugin.
This has caused some problems with users of the snmp plugin.
Added myplugin.c to contrib/examples/.
This is a sample/template C plugin.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
This is a sample/template C plugin.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Added MyPlugin.pm to contrib/examples/.
This is a sample/template Perl plugin.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
This is a sample/template Perl plugin.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
snmp plugin: Improved the error messages in the init code.
snmp plugin: Fix a segfault when a host times out but more data should be queried.
snmp plugin: Handle `ASN_TIMETICKS' as `counter' if it's known by the SNMP library.
Merge branch 'collectd-4.0' into collectd-4.1
perl plugin: Fixed a possible buffer overflow in get_module_name().
A '\0' might have been written above the buffer array bounds.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
A '\0' might have been written above the buffer array bounds.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Merge branch 'pull/collectd-4.1' into collectd-4.1
build system: Fix detection of libraries when giving a directory.
Merge branch 'pull/collectd-4.1' into collectd-4.1
build system: Fixed the improved detection of the Net-SNMP library.
build system: Improve the detection of the Net-SNMP library.
netlink plugin: Don't fail if `IFLA_STATS' doesn't exist for an interface.
Hopefully this fixes problems on my WRT ;)
Hopefully this fixes problems on my WRT ;)
wireless plugin: Correct the handling of cards returning signal and noise quality as percentage.
Merge branch 'collectd-4.0' into collectd-4.1
Merge branch 'collectd-3.11' into collectd-4.0
Conflicts:
src/apcups.c
nothing added to commit but untracked files present (use "git add" to track)
Conflicts:
src/apcups.c
nothing added to commit but untracked files present (use "git add" to track)
apcups plugin: Warn about the irritating name `apcups_charge_pct'.
netlink plugin: Fix build issues under Debian Sarge
or generally older Linux versions.
or generally older Linux versions.
Merge branch 'ff/apcups' into collectd-4.0
Bumped the version to 4.1.1
build system: Fix yet another issue with the detection of libupsclient.
Merge branch 'collectd-4.0' into collectd-4.1
Conflicts:
ChangeLog
Conflicts:
ChangeLog
apcups plugin: Fix reporting of the `load percent' data.
Merge branch 'collectd-4.0' into collectd-4.1
Conflicts:
contrib/PerlLib/Collectd.pm
nothing added to commit but untracked files present (use "git add" to track)
Conflicts:
contrib/PerlLib/Collectd.pm
nothing added to commit but untracked files present (use "git add" to track)
contrib/PerlLib/Collectd.pm: Bumbed the version to 4.0.8.
Merge branch 'collectd-4.0' into collectd-4.1
Conflicts:
ChangeLog
configure.in
Conflicts:
ChangeLog
configure.in
Bumped version to 4.0.8; updated ChangeLog.