memcached plugin: Some of the data definitions have been torn appart.
memcached plugin: Added a plugin to query stats from memcached servers.
contrib/README: Documented the exec script and the SNMP config.
contrib/exec-smartctl: Added documentation to the script.
Merge branch 'pull/master'
contrib/exec-smartctl: Added a sample exec script which parses the hdd temperature using smartctl.
rrdtool plugin: Wait for the ``queue thread'' to exit _after_ signaling it to exit..
Merge branch 'pull/master'
contrib/snmp-data.conf: Added a sample data configuration for the SNMP plugin.
ipvs plugin: Fix a feaking stupid typo..
Merge branch 'collectd-4.1'
Conflicts:
ChangeLog
Conflicts:
ChangeLog
Merge branch 'ff/tcpconns'
collectd.conf.in: Added sample configuration for the tcpconns plugin.
ipvs plugin: Assurd that `sockfd >= 0'.
The init-function should return non-zero in that case and the plugin should be
disabled, but I'd rather not rely on such conventions too much..
The init-function should return non-zero in that case and the plugin should be
disabled, but I'd rather not rely on such conventions too much..
Added documentation about ipvs to README, ChangeLog and collectd.conf.in.
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>
ipvs plugin: Check for correct IPVS version in cipvs_init().
I took over the required minimum version (1.1.4) as used in ipvsadm 1.24
for Linux kernels >= 2.6.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
I took over the required minimum version (1.1.4) as used in ipvsadm 1.24
for Linux kernels >= 2.6.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
ipvs plugin: Replaced ipvs_strerror() with sstrerror().
ipvs_strerror() handles a few special cases in libipvs which are not
relevant in this plugin.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
ipvs_strerror() handles a few special cases in libipvs which are not
relevant in this plugin.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
ipvs plugin: Get IP_VS_SO_GET_INFO in ip_vs_get_services().
IP_VS_SO_GET_INFO also provides the number of services which might change after
initializing the plugin. Also, the globale variable ipvs_info could be removed
as ip_vs_get_services() is the only function using these information.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
IP_VS_SO_GET_INFO also provides the number of services which might change after
initializing the plugin. Also, the globale variable ipvs_info could be removed
as ip_vs_get_services() is the only function using these information.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
ipvs plugin: Fixed a memory leak in cipvs_submit_services().
The ip_vs_get_dests pointer has not been freed... :-/
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
The ip_vs_get_dests pointer has not been freed... :-/
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
ipvs plugin: Use sstrerror() instead of strerror().
D'oh...
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
D'oh...
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
configure, ipvs plugin: Check for ip_vs.h.
Disable the ipvs module, if neither net/ip_vs.h nor ip_vs.h could be
found. Added HAVE_*_H checks for each included system header in ipvs.c.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Disable the ipvs module, if neither net/ip_vs.h nor ip_vs.h could be
found. Added HAVE_*_H checks for each included system header in ipvs.c.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
ipvs: Added plugin to collect IPVS connection statistics.
This plugin collects detailed statistics for each IPVS service and it's
destinations. It is based on ipvsadm and libipvs by Wensong Zhang and
Peter Kese. The plugin requires a Linux (>= 2.6) kernel.
See http://www.linuxvirtualserver.org/software/index.html for more details
about IPVS.
A new DS type "connections" (value:COUNTER:0:U) has been added to
types.db.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
This plugin collects detailed statistics for each IPVS service and it's
destinations. It is based on ipvsadm and libipvs by Wensong Zhang and
Peter Kese. The plugin requires a Linux (>= 2.6) kernel.
See http://www.linuxvirtualserver.org/software/index.html for more details
about IPVS.
A new DS type "connections" (value:COUNTER:0:U) has been added to
types.db.
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.
src/Makefile.am: Make manpage creation fail-safe.
Since Sebastian's patch ships the .pod files in the distribution, this may not
fail when perl-doc is not installed.
Since Sebastian's patch ships the .pod files in the distribution, this may not
fail when perl-doc is not installed.
src/Makefile.am: Added all POD files to EXTRA_DIST.
Those files are basically the "sources" for the manpages and as such
should be included in a distribution.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Those files are basically the "sources" for the manpages and as such
should be included in a distribution.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
tcpconns plugin: Changed the plugin to collect all TCP states, nut just `established'.
Also the contrib/collection.cgi script has been updated.
Also the contrib/collection.cgi script has been updated.
ChangeLog: Documented the changes to the perl plugin..
..a little
..a little
perl plugin: Converted to use "complex" configuration.
The parsing of the syntax tree of the "Plugin perl" section is now done in
perl_config() allowing more flexible setups like passing configuration
options to Perl plugins.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
The parsing of the syntax tree of the "Plugin perl" section is now done in
perl_config() allowing more flexible setups like passing configuration
options to Perl plugins.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
perl plugin: Added "EnableDebugger" config option.
This config option will pass control to the Perl debugger after the
interpreter has been initialized. This is exactly the same as invoking perl
with the "-d" command line switch.
Just as with perl's "-d" command line option you can supply an alternative
debugger. Pass the package name as an argument to the "EnableDebugger" option
See perldebug(1) for more details.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
This config option will pass control to the Perl debugger after the
interpreter has been initialized. This is exactly the same as invoking perl
with the "-d" command line switch.
Just as with perl's "-d" command line option you can supply an alternative
debugger. Pass the package name as an argument to the "EnableDebugger" option
See perldebug(1) for more details.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
perl plugin: Fixed an "unused variable" warning.
When compiling with debugging disabled, gcc complained about an unused
variable in init_pi(). -Werror thus caused the build to fail.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
When compiling with debugging disabled, gcc complained about an unused
variable in init_pi(). -Werror thus caused the build to fail.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
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..
tcpconns plugin: Added a new plugin that counts the number of TCP connections to specific ports.
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.
Merge branch 'collectd-4.1'
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.
Makefile.am: Include version-gen.sh in a distribution as well.
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>
bindings/perl: Removed VERSION from all Makefile.PL's.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Sebastian Harl <sh@tokkee.org>
perl plugin: bootstrap Collectd when initializing Perl interpreter
This automatically makes all symbols available at (Perl) compile time,
thus making the API built into collectd.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
This automatically makes all symbols available at (Perl) compile time,
thus making the API built into collectd.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
perl plugin: Reimplemented plugin_{,un}register() in plain Perl.
As this involves only Perl data structures, it makes more sense to write
the algorithms in plain Perl as well. I suppose the perl interpreter can
do a better job optimizing the code :-)
Signed-off-by: Sebastian Harl <sh@tokkee.org>
As this involves only Perl data structures, it makes more sense to write
the algorithms in plain Perl as well. I suppose the perl interpreter can
do a better job optimizing the code :-)
Signed-off-by: Sebastian Harl <sh@tokkee.org>
perl plugin: Do not initialize the Perl interpreter until loading a module.
This makes further and more flexible configurations possible.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
This makes further and more flexible configurations possible.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Moved contrib/PerlLib/ to bindings/perl/.
Added bindings/Makefile.am and bindings/perl/Collectd/Makefile.PL,
bindings/perl/Makefile.PL to integrate the Perl modules into the build
system and the official distribution.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Added bindings/Makefile.am and bindings/perl/Collectd/Makefile.PL,
bindings/perl/Makefile.PL to integrate the Perl modules into the build
system and the official distribution.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
collectd-snmp(5): Documented the `InstancePrefix' option and the new `Instance' behavior.
snmp plugin: Added the `InstancePrefix' option.
snmp plugin: Changed the table code so that an `instance' is optional.
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
Merge branch 'collectd-4.1'
Conflicts:
ChangeLog
Conflicts:
ChangeLog
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.1'
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.
collectd: Add the config option `Include' which includes other files.
This is done recursively so that you can have a depth of up to `n' (currently eight).
This is done recursively so that you can have a depth of up to `n' (currently eight).
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.1'
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.
snmp plugin: Added the options `Scale' and `Shift' to Data-blocks..
..to correct the values returned by SNMP-agents.
..to correct the values returned by SNMP-agents.
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