apache plugin: Added support for the "IdleWorkers" field.
Thanks to Gary from the bug tracker for the suggestion and code :)
Thanks to Gary from the bug tracker for the suggestion and code :)
swap plugin: Put parsing of Linux 2.6 and <2.6 files into one loop.
src/common.[ch]: Implement “strtoderive”.
Simplifies error handling.
Simplifies error handling.
swap plugin: Remove trailing whitespace.
swap plugin - swap in/out does not work for kernels <2.6
It works on RedHat9 and 6 (don't ask). A more gracefull solution is
having a configuration option for choosing /proc/<foo> format I
suppose...
Hope it helps some sysadmins like me that are forced to maintained
anqituities in production.
Cheers
From 1da38c6d515f7fa4599b7b08e1284fb2ac9a504a Mon Sep 17 00:00:00 2001
From: Lorin Scraba <lorin@si-bemol.ro>
Date: Tue, 19 Jan 2010 15:16:29 -0800
Subject: [PATCH] swap plugin - swapin/out fix for older kernels - <2.6
Signed-off-by: Lorin Scraba <lorin@si-bemol.ro>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
It works on RedHat9 and 6 (don't ask). A more gracefull solution is
having a configuration option for choosing /proc/<foo> format I
suppose...
Hope it helps some sysadmins like me that are forced to maintained
anqituities in production.
Cheers
From 1da38c6d515f7fa4599b7b08e1284fb2ac9a504a Mon Sep 17 00:00:00 2001
From: Lorin Scraba <lorin@si-bemol.ro>
Date: Tue, 19 Jan 2010 15:16:29 -0800
Subject: [PATCH] swap plugin - swapin/out fix for older kernels - <2.6
Signed-off-by: Lorin Scraba <lorin@si-bemol.ro>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
src/collectd.c: Include the plugin directory in the usage output.
collectd.conf.in: Add the cURL-XML plugin.
Merge branch 'ag/curl_xml'
collectd.conf(5): Document the cURL-XML plugin.
README: Add the curl_xml plugin.
curl_xml plugin: Replace the AVL-tree with a linked list.
This makes iterating over all elements more efficient. The CX_KEY_MAGIC hack is
also removed. Last but not least, “plugin_get_ds” is now called only once.
This makes iterating over all elements more efficient. The CX_KEY_MAGIC hack is
also removed. Last but not least, “plugin_get_ds” is now called only once.
curl_xml plugin: Rename "Instance" and "Values" to "*From" for consistency.
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.
curl_xml plugin: Don't use a hyphen to separate instance prefix and value.
This way the plugin behaves more like the SNMP plugin.
This way the plugin behaves more like the SNMP plugin.
curl_xml plugin: Documented the type-instance behavior a bit better.
curl_xml plugin: Break up “cx_submit_xpath_values” into smaller functions.
curl_xml plugin: Move the setting of type_instance to a separate function.
curl_xml plugin: Make absolutely certain “instance_node_obj” is freed.
curl_xml plugin: Check the return value of “cx_evaluate_xpath”.
curl_xml plugin: Change C++-style comments into C-style comments.
curl_xml plugin: Clear type_instance if it is not set.
curl_xml plugin: Adapted copyright for 2010.
AUTHORS: Added curl_xml plugin to Amit.
curl_xml plugin: Replace cx_config_add_string and cx_config_set_boolean by their global versions.
curl_xml plugin: Reorder functions and remove forward declarations.
curl_xml plugin: New plugin to fetch and parse XML files.
Do find the curl_xml.c source file attached. The implementation is done as I
suggested in my previous mail.
The supported configuration is as follows:
<xpath "/path/to/node(s)">
InstancePrefix "test" # optional
Instance "path/to/textnode" # optional if base xpath expression returns
single result i.e one matching node
Values "path/to/textnode1" "path/to/textnode2"
Type "magic_level"
</xpath>
I have done some level of testing to make sure plugin is working. If someone
is interested in testing/trying the plugin, do the following:
- apply the attached patch on the 4.9.0 branch
- copy the attached curl_xml.c to the collectd-4.9.0/src
- run autconf to generate new configure script containing changes to build
curl_xml plugin
- build and install collectd (make && make install)
Do let me know if anyone has problem building/running the plugin.
Any comments/suggestions are welcome.
Regards
Amit
Do find the curl_xml.c source file attached. The implementation is done as I
suggested in my previous mail.
The supported configuration is as follows:
<xpath "/path/to/node(s)">
InstancePrefix "test" # optional
Instance "path/to/textnode" # optional if base xpath expression returns
single result i.e one matching node
Values "path/to/textnode1" "path/to/textnode2"
Type "magic_level"
</xpath>
I have done some level of testing to make sure plugin is working. If someone
is interested in testing/trying the plugin, do the following:
- apply the attached patch on the 4.9.0 branch
- copy the attached curl_xml.c to the collectd-4.9.0/src
- run autconf to generate new configure script containing changes to build
curl_xml plugin
- build and install collectd (make && make install)
Do let me know if anyone has problem building/running the plugin.
Any comments/suggestions are welcome.
Regards
Amit
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.