Merge commit 'origin/ff/routeros'
Merge branch 'collectd-4.9'
Merge branch 'collectd-4.8' into collectd-4.9
Merge branch 'collectd-4.7' into collectd-4.8
bindings/perl/lib/Collectd.pm: Add forgotten "config" callback type.
Thanks to "ntenev" for reporting the issue.
Thanks to "ntenev" for reporting the issue.
python: Fixed configure script for python3.
src/collectd.conf.in: Add the new options of the routeros plugin.
collectd.conf(5): Document the new config options of the routeros plugin.
Merge branch 'master' into ff/routeros
Merge commit 'trenkel/st/python'
Conflicts:
src/python.c
Conflicts:
src/python.c
Merge branch 'collectd-4.9'
Merge commit 'tokkee/sh/collectd-4.9' into collectd-4.9
Merge branch 'collectd-4.9'
Merge branch 'collectd-4.8' into collectd-4.9
python: Documenting python3 changes.
python: Restored python2 compatibility.
python: Added notification repr. Python3 support completed.
python: Fixed more unicode related problems.
python: repr works for Values again.
python: Made the plugin unicode save.
Better and unicode compatible repr for PluginData.
Fixed string repr for config nodes.
Added macro CPY_SUBSTITUTE.
Config object repr string is back.
14 years agoSomewhat workable python3 support. This breaks python2 support and the __repr__ funct...
Somewhat workable python3 support. This breaks python2 support and the __repr__ functions.
rrdtool plugin: Correctly initialize the ->random_variation member.
This lead to huge negative values in that member, causing values to be only
written to upon exit. D'oh!
This lead to huge negative values in that member, causing values to be only
written to upon exit. D'oh!
14 years agoapache plugin: Fix a segmentation fault in the config handling of VerifyPeer / Verify...
apache plugin: Fix a segmentation fault in the config handling of VerifyPeer / VerifyHost.
Hello,
Today I upgraded a machine from 4.5.2 to 4.9.0. Everything went fine, but
the new version segfaults immediately at startup. With some help from gdb
I tracked down the problem to the apache module. It will occur if one
tries to use the VerifyPeer/VerifyHost options (I guess few people use
these as I don't see complaints?)
When the plugin attempts to read the value of a boolean option, instead of
using the pre-parsed int value, it misdetects the type of the option
(seems a mechanical mistake) and tries to use the string pointer, which is
actually NULL.
I'm sending a patch, it's actually shorter than the description ;)
Thanks to all developers and maintainers of collectd for working on it.
Have a nice holidays.
Hello,
Today I upgraded a machine from 4.5.2 to 4.9.0. Everything went fine, but
the new version segfaults immediately at startup. With some help from gdb
I tracked down the problem to the apache module. It will occur if one
tries to use the VerifyPeer/VerifyHost options (I guess few people use
these as I don't see complaints?)
When the plugin attempts to read the value of a boolean option, instead of
using the pre-parsed int value, it misdetects the type of the option
(seems a mechanical mistake) and tries to use the string pointer, which is
actually NULL.
I'm sending a patch, it's actually shorter than the description ;)
Thanks to all developers and maintainers of collectd for working on it.
Have a nice holidays.
Monitorus.pm: Put the plugin into the "Collectd::Plugins" namespace.
… rather than "Collectd::Plugin".
… rather than "Collectd::Plugin".
bindings/Makefile: Added Monitorus.pm to EXTRA_DIST.
src/collectd.conf: Added missing plugins and config options.
collectd.conf: Added "LoadPlugin Monitorus/OpenVZ" in the "perl" config.
README: Added missing plugins.
src/collectd.conf.in: Added an example config for the python plugin.
src/collectd.conf.in: Added an example config for the netapp plugin.
src/collectd.conf.in: Add example config for the routeros plugin.
collectd.conf(5): Document the “IncludeHidden” option of the filecount plugin.
filecount plugin: Use the ?:-operator for the hidden argument.
filecount plugin: Simplify config handling.
filecount plugin: Fix bitfield and default behavior.
filecount plugin: Make it possible to include hidden files and directories.
src/common.[ch]: walk_directory: Add "include hidden" argument.
Merge branch 'collectd-4.9' into ff/routeros
Conflicts:
src/routeros.c
Conflicts:
src/routeros.c
routeros plugin: Use the node name for the "host" field.
Using hostname_g doesn't make much sense when you can define multiple routers,
so this is a bug because it doesn't allow specifying multiple routers as documented.
Using hostname_g doesn't make much sense when you can define multiple routers,
so this is a bug because it doesn't allow specifying multiple routers as documented.
routeros plugin: Add support for the "system resource" high-level interface.
It returns such interesting information as CPU "load", memory and disk space
used and number of bad blocks.
It returns such interesting information as CPU "load", memory and disk space
used and number of bad blocks.
contrib/snmp-probe-host.px: Implemented the “--exclude” option.
collectd-snmp(5): Comma fixes.
Annoying signal documentation.
Merge branch 'collectd-4.9'
Merge branch 'collectd-4.8' into collectd-4.9
Conflicts:
ChangeLog
Conflicts:
ChangeLog
Bumped version to 4.8.2; Updated ChangeLog.
Merge branch 'collectd-4.7' into collectd-4.8
Network plugin license change with Aman Gupta's permission.
Conflicts:
ChangeLog
version-gen.sh
Network plugin license change with Aman Gupta's permission.
Conflicts:
ChangeLog
version-gen.sh
Bumped version to 4.7.5; Updated ChangeLog.
src/plugin.c: plugin_log: Print to stderr if no log plugin has been loaded.
network plugin: Change the license to LGPL 2.1.
This is done with Amit Gupta's consent. He did write changes for later versions
of the plugin.
This is done with Amit Gupta's consent. He did write changes for later versions
of the plugin.
oracle plugin: Check the connection status and reconnect if required.
Merge branch 'collectd-4.9'
Merge branch 'collectd-4.8' into collectd-4.9
ping plugin: Add MaxMissed option.
Any host not replying to consecutive MaxMissed PING packets will get
it's name re-resolved via DNS.
This enables the use of dynamic DNS services (like dyndns.org) with the
ping plugin. Prior to this patch, hostnames were resolved once on daemon
start.
The default is -1 (disabled).
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Any host not replying to consecutive MaxMissed PING packets will get
it's name re-resolved via DNS.
This enables the use of dynamic DNS services (like dyndns.org) with the
ping plugin. Prior to this patch, hostnames were resolved once on daemon
start.
The default is -1 (disabled).
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Merge branch 'collectd-4.7' into collectd-4.8
ping plugin: Add MaxMissed option.
Any host not replying to consecutive MaxMissed PING packets will get
it's name re-resolved via DNS.
This enables the use of dynamic DNS services (like dyndns.org) with the
ping plugin. Prior to this patch, hostnames were resolved once on daemon
start.
The default is -1 (disabled).
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Any host not replying to consecutive MaxMissed PING packets will get
it's name re-resolved via DNS.
This enables the use of dynamic DNS services (like dyndns.org) with the
ping plugin. Prior to this patch, hostnames were resolved once on daemon
start.
The default is -1 (disabled).
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
memory plugin: Fixed handling of >4G of memory on Mac OS X.
contrib/collection3: Add Regexp::Common to the README.
configure: Fixed copy&paste error in --with-libupsclient.
Fixed refcount error.
memory plugin: Fixed handling of >4G of memory on Mac OS X.
contrib/collection3: Add Regexp::Common to the README.
configure: Fixed copy&paste error in --with-libupsclient.
Merge branch 'collectd-4.9' of verplant.org:/var/lib/git/collectd into collectd-4.9
curl, df and processes plugins: Updated copyright information.
collectd.conf(5): If “MeasureResponseTime” is enabled, Match blocks are optional.
collectd.conf.in: Added the Report{Reserved,Inodes} options to the df plugin.
collectd-python(5): Remove trailing whitespace.
Return EINVAL instead of 0 on error.
Added function to get a list of meta data entries.
Added function to get the data type of a meta data entry.
Collectd.pm: Improved some debug messages.
Also, this fixes a "use of uninitialized" warning.
Also, this fixes a "use of uninitialized" warning.
NetApp documentation of tested filers.
netapp: Better error messages.
hashed match: Fix only-C90 compiler warning.
Apparently 2184401929 is bigger than a signed int or something …
Apparently 2184401929 is bigger than a signed int or something …
ping plugin: Cleanup used variable names.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
ChangeLog: Fix a typo.
ChangeLog: Added changes for 4.9.0.
Merge branch 'collectd-4.8'
Merge branch 'collectd-4.7' into collectd-4.8
hashed match: Use a different (larger) prime number.
The previous prime number, 251, did not distribute good enough into
three groups.
The previous prime number, 251, did not distribute good enough into
three groups.
openvz plugin: Remove `type' as first argument of `plugin_dispatch_values'.
monitorus plugin: Updated for the new API.
`type' is now part of the value list.
`type' is now part of the value list.
monitorus plugin: Removed the log function.
src/plugin.c: Warn if plugin_register_*() overwrites an existing callback.
src/plugin.c: Fixed a function name in an error message.
utils_heap: Fixed a typo: c_head_get_root() -> c_heap_get_root().
;-)
;-)
ping plugin: Added "SourceAddress" and "Device" configuration options.
As the name suggests, these options may be used to set the source address and
the outgoing device for ICMP_ECHO requests, just like oping's -I and -D
options.
As the name suggests, these options may be used to set the source address and
the outgoing device for ICMP_ECHO requests, just like oping's -I and -D
options.
Merge remote branch 'trenkel/master'
Clarify how the ModulePath config option works.
perl/…/Monitorus.pm: Added Perl-based plugin to query statistics from mon.itor.us.
bindings/Makefile.am: Tie OpenVZ.pm into the build system.
perl/…/OpenVZ.pm: Added Perl-based plugin to gather OpenVZ statistics.
bindings/perl: Move the files into the default directory structure for ExtUtils::MakeMaker.
Merge branch 'ms/aix'
processes plugin: Moved the declaration of variables closer to where they are used.