sensors plugin: Print information why a specific feature is ignored in debug mode.
As requested by Ondřej Válek.
As requested by Ondřej Válek.
wireless plugin: Fix reading the noise value.
Accidentally the wrong value was used as `noise'. This patch fixes it.
Thanks to Ondřej Válek for pointing this out.
Accidentally the wrong value was used as `noise'. This patch fixes it.
Thanks to Ondřej Válek for pointing this out.
build.sh: Use glibtoolize if it's available.
This way, the script should work on e.g. MacOSX as well.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
This way, the script should work on e.g. MacOSX as well.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
configure: Do not preset $with_libstatgrab and $with_libdevstat.
Those variables are set when parsing the command line options and evaluated
inside the AC_ARG_WITH() macro. Presetting them overwrites any command line
options.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Those variables are set when parsing the command line options and evaluated
inside the AC_ARG_WITH() macro. Presetting them overwrites any command line
options.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
liboconfig/oconfig.c: Free all allocated memory in oconfig_free().
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>
Bumped version to 4.2.5; Updated ChangeLog.
configure.in: Fix a typo.
network plugin: Tested and fixed the receiving part on Sparc.
network plugin: Use `memcpy' when parsing packages, too.
This should prevent crashes due to unaligned memory access when running as
server.
This should prevent crashes due to unaligned memory access when running as
server.
ChangeLog: Wrote an entry for 4.2.5.
src/common.c: Use uint8_t's instead of (signed) char's.
src/common.[ch]: Implemented `htond' and `ntohd' and applied it to the network plugin.
The functions convert doubles to the x86 representation or from the x86
representation to the representation used on the host. On x86 systems, this is
a NOP.
The functions convert doubles to the x86 representation or from the x86
representation to the representation used on the host. On x86 systems, this is
a NOP.
configure.in: Added checks to find out how doubles are stored.
network plugin: Align write access to the send buffer.
SPARC and possibly other architectures cannot access arbitrary memory
locations. This caused a `bus error' on SPARC when the network plugin was
loaded. This change hopefully fixes this problem.
SPARC and possibly other architectures cannot access arbitrary memory
locations. This caused a `bus error' on SPARC when the network plugin was
loaded. This change hopefully fixes this problem.
tcpconns plugin: Fix for compilation under FreeBSD.
rrdtool plugin: Simplified heartbeat calculation
Looks simpler, should do the same.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Looks simpler, should do the same.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
hddtemp plugin: Use SCSI_DISK8_MAJOR thru SCSI_DISK15_MAJOR only if available.
Some Linux versions don't seem to provide the major numbers 8 thru 15.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Some Linux versions don't seem to provide the major numbers 8 thru 15.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
ping plugin: Fixed a typo when setting the TTL.
PING_DEF_TIMEOUT used to be used instead of PING_OPT_TTL as option
argument of ping_setopt(). This caused really strange effects when pinging
hosts, like a failed assertion in ping_timeval_sub() in liboping
indicating a latency <= 0.
Thanks to Romain Francoise for pointing this out and a lot of helpful
debugging information.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
PING_DEF_TIMEOUT used to be used instead of PING_OPT_TTL as option
argument of ping_setopt(). This caused really strange effects when pinging
hosts, like a failed assertion in ping_timeval_sub() in liboping
indicating a latency <= 0.
Thanks to Romain Francoise for pointing this out and a lot of helpful
debugging information.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
exec plugin: Don't pass an invalid egid to setgroups() if no group was given.
In case that no group has been specified in the config file, egid = -1 used to
be passed to setgroups() which, obviously, is not what we want.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
In case that no group has been specified in the config file, egid = -1 used to
be passed to setgroups() which, obviously, is not what we want.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
perl plugin: Warn if "EnableDebugger" has been used after "LoadPlugin".
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>
Merge branch 'collectd-4.1' into collectd-4.2
ping plugin: Deactivate the plugin if (pingobj == NULL).
If (pingobj == NULL), then the init-function will return (-1) so that the
plugin is deactivated.
If (pingobj == NULL), then the init-function will return (-1) so that the
plugin is deactivated.
16 years agoMerge branch 'collectd-4.2' of octo@verplant.org:/var/lib/git/collectd into collectd-4.2
Merge branch 'collectd-4.2' of octo@verplant.org:/var/lib/git/collectd into collectd-4.2
swap plugin: Reapply a patch for Solaris.
This is a previously applied change that somehow got lost.
See http://git.verplant.org/?p=collectd.git;a=commitdiff;h=ee1113650b0b565776fc3d62162d84741e234f05
and http://git.verplant.org/?p=collectd.git;a=commitdiff;h=f68b68c5825efbd23c51531ff4e43c78a3bb2b3b
This is a previously applied change that somehow got lost.
See http://git.verplant.org/?p=collectd.git;a=commitdiff;h=ee1113650b0b565776fc3d62162d84741e234f05
and http://git.verplant.org/?p=collectd.git;a=commitdiff;h=f68b68c5825efbd23c51531ff4e43c78a3bb2b3b
contrib/extractDS.px: Enhanced the script to modify RRD files a bit.
It can now also change the stepsize and add an RRA.
It can now also change the stepsize and add an RRA.
Merge branch 'pull/collectd-4.1' into collectd-4.1
exec plugin: Use `setgroups' to set the list of supplementary group IDs.
Thanks to Peter Holik for suggesting this.
Thanks to Peter Holik for suggesting this.
migrate-3-4.px: Do not translate the disk names used by hddtemp.
In version 4, hddtemp still uses major/minor device numbers to identify disks.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
In version 4, hddtemp still uses major/minor device numbers to identify disks.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Merge branch 'collectd-4.1' into collectd-4.2
rrdtool plugin: Sort the list of user defined `RRATimespan's.
This is required by the logic calculating the RRA sized.
This is required by the logic calculating the RRA sized.
contrib/migrate-3-4.px: Handle `hddtemp' graphs correctly.
configure.in: Fixed handling of the --with-perl-bindings option.
This option could not be disabled so far as this case has not been handled in
the configure script. This patch fixes this issue.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
This option could not be disabled so far as this case has not been handled in
the configure script. This patch fixes this issue.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Merge branch 'collectd-4.1' into collectd-4.2
network plugin: Have two different threads for handling incoming packets.
One that only receives and enqueues packets and one which parses the packets
and dispatches them to the daemon. This should solve problems with (too) short
socket buffers and (very) heavy load.
One that only receives and enqueues packets and one which parses the packets
and dispatches them to the daemon. This should solve problems with (too) short
socket buffers and (very) heavy load.
Merge branch 'collectd-4.1' into collectd-4.2
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>
Merge branch 'pull/collectd-4.2' into collectd-4.2
Merge branch 'collectd-4.1' into collectd-4.2
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>
Merge branch 'collectd-4.1' into collectd-4.2
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>
Bumped version to 4.2.4; Updated ChangeLog.
Merge branch 'collectd-4.1' into collectd-4.2
Conflicts:
ChangeLog
Conflicts:
ChangeLog
ChangeLog: Fixed the date of the 4.1.6 release.
Merge branch 'collectd-4.1' into collectd-4.2
Conflicts:
ChangeLog
version-gen.sh
Conflicts:
ChangeLog
version-gen.sh
Bumped version to 4.1.6; Updated ChangeLog.
Merge branch 'collectd-4.1' into collectd-4.2
src/configfile.c: Updated the copyright notice for 2008.
bindings/Makefile.am: Replaced "make -C" with "cd && make".
BSD make does not support "make -C".
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
BSD make does not support "make -C".
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
bindings/Makefile.am: Removed a bashism.
Brace expansion using { and } is not defined by POSIX but rather a bash
extension and should thus not be used for portability reasons.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Brace expansion using { and } is not defined by POSIX but rather a bash
extension and should thus not be used for portability reasons.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
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): Fix a messed up merge.
Merge branch 'collectd-4.1' into collectd-4.2
Conflicts:
src/collectd.conf.pod
Conflicts:
src/collectd.conf.pod
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.2.3; Updated ChangeLog.
build system: Yet another way to solve the src-dir vs. build-dir issue.
configure.in: Copy sources of the Perl bindings to the build directory.
As the Perl build system around ExtUtils::MakeMaker doesn't know how to
separate source and build directories, all relevant source files have to be
available in the build directory.
This is an alternative patch for the problem reported by Michael Tiernan.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
As the Perl build system around ExtUtils::MakeMaker doesn't know how to
separate source and build directories, all relevant source files have to be
available in the build directory.
This is an alternative patch for the problem reported by Michael Tiernan.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Revert "bindings/Makefile.am: Fix a bug that happened when src and build directory are not the same."
This reverts commit 61f5c1a972626212aab60c4d50f45097485b8e51 which had the
following problems:
* parts of the build process took place in the source directory (which should
be read-only though)
* the "perl" target should not be renamed - the name is used in
@PERL_BINDINGS@ to identify the bindings that are supposed to be built
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
This reverts commit 61f5c1a972626212aab60c4d50f45097485b8e51 which had the
following problems:
* parts of the build process took place in the source directory (which should
be read-only though)
* the "perl" target should not be renamed - the name is used in
@PERL_BINDINGS@ to identify the bindings that are supposed to be built
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
utils_mount.c: Fixed an unused variable warning on some systems.
This warning appeared on systems using listmntent() or getv?fsstat() when
compiling with debugging disabled only. It was caused by the declaration of a
character array for use with sstrerror() inside a call to DEBUG().
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
This warning appeared on systems using listmntent() or getv?fsstat() when
compiling with debugging disabled only. It was caused by the declaration of a
character array for use with sstrerror() inside a call to DEBUG().
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
src/Makefile.am: Use curl CFLAGS when building the nginx plugin.
Else curl/curl.h cannot be found in non-standard places at build time.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Else curl/curl.h cannot be found in non-standard places at build time.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Updated the changelog.
Merge branch 'collectd-4.1' into collectd-4.2
Conflicts:
ChangeLog
version-gen.sh
Conflicts:
ChangeLog
version-gen.sh
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.
bindings/Makefile.am: Fix a bug that happened when src and build directory are not the same.
Thanks to Michael Tiernan for reporting this bug.
Thanks to Michael Tiernan for reporting this bug.
Bumped version to 4.2.2; Updated ChangeLog.
Merge branch 'collectd-4.1' into collectd-4.2
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>
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>
rc/utils_llist.c: Fix a bug in llist_prepend.
Copy the element to the tail if it's the first element.
Copy the element to the tail if it's the first element.
collectd.conf(5): Added a note about plugin loading order.
logfile plugin: fix the `Timestamp' configuration option.
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>
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>
collectd-perl(5): Fixed a typo.
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>
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.2.1; Updated ChangeLog.
Merge branch 'collectd-4.1' into collectd-4.2
Conflicts:
ChangeLog
contrib/PerlLib/Collectd.pm
version-gen.sh
Conflicts:
ChangeLog
contrib/PerlLib/Collectd.pm
version-gen.sh
Bumped version to 4.1.4; Updated ChangeLog
contrib/collection.cgi: Fix the types related to the processes plugin.
contrib/collection.cgi: Fix the ps_rss graph.
contrib/collection.cgi: Add some missing types and labels.
Merge branch 'collectd-4.1' into collectd-4.2
Conflicts:
contrib/README
src/snmp.c
src/types.db
Conflicts:
contrib/README
src/snmp.c
src/types.db
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.
contrib/snmp-data.conf: Added even more UPS stuff.
contrib/fedora/collectd.spec: Updated for version 4.2.0
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