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.
configure.in: Reports status of libperfstat.
collectd.conf(5): Add a short stub for the python plugin.
python plugin: Add MIT license header to all source files.
configure.in: Check the flags reported by Python.
On several platforms, we have observed bogus information provided by
Python. Double check those flags and only enable the Python plugin if it
is *really* possible to build anything with the library.
On several platforms, we have observed bogus information provided by
Python. Double check those flags and only enable the Python plugin if it
is *really* possible to build anything with the library.
Merge branch 'st/python'
configure.in: Be more verbose when the python configuration fails.
src/pyvalues.c: Don't use Py_ssize_t - it's new in Python 2.5.
Merge branch 'st/python'
python plugin: Try to avoid casting errors with Sun's cc.
"python.c", line 534: warning: argument #1 is incompatible with prototype:
prototype: pointer to void : "python.c", line 470
argument : pointer to function(pointer to const char, pointer to function(..) returning void, pointer to struct user_data_s {pointer to void data, pointer to function(..) returning void free_func}) returning int
"python.c", line 534: warning: argument #2 is incompatible with prototype:
prototype: pointer to void : "python.c", line 470
argument : pointer to function(int, pointer to const char, pointer to struct user_data_s {pointer to void data, pointer to function(..) returning void free_func}) returning void
"python.c", line 534: warning: argument #1 is incompatible with prototype:
prototype: pointer to void : "python.c", line 470
argument : pointer to function(pointer to const char, pointer to function(..) returning void, pointer to struct user_data_s {pointer to void data, pointer to function(..) returning void free_func}) returning int
"python.c", line 534: warning: argument #2 is incompatible with prototype:
prototype: pointer to void : "python.c", line 470
argument : pointer to function(int, pointer to const char, pointer to struct user_data_s {pointer to void data, pointer to function(..) returning void free_func}) returning void
src/pyconfig.c: Make document strings non-const.
pyconfig.c:147: warning: initialization discards qualifiers from pointer target type
pyconfig.c:147: warning: initialization discards qualifiers from pointer target type
Merge branch 'st/python'
src/cpython.h: Apparently Python 2.3 doesn't have the Py_RETURN_NONE macro.
python plugin: Cast pointer to `void *' to work around strict aliasing problems.
python.c: In function `cpy_write_callback':
python.c:349: warning: dereferencing type-punned pointer will break strict-aliasing rules
python.c: In function `cpy_notification_callback':
python.c:368: warning: dereferencing type-punned pointer will break strict-aliasing rules
python.c: In function `cpy_oconfig_to_pyconfig':
python.c:842: warning: dereferencing type-punned pointer will break strict-aliasing rules
python.c: In function `cpy_config':
python.c:887: warning: dereferencing type-punned pointer will break strict-aliasing rules
python.c:888: warning: dereferencing type-punned pointer will break strict-aliasing rules
python.c:889: warning: dereferencing type-punned pointer will break strict-aliasing rules
python.c: In function `cpy_write_callback':
python.c:349: warning: dereferencing type-punned pointer will break strict-aliasing rules
python.c: In function `cpy_notification_callback':
python.c:368: warning: dereferencing type-punned pointer will break strict-aliasing rules
python.c: In function `cpy_oconfig_to_pyconfig':
python.c:842: warning: dereferencing type-punned pointer will break strict-aliasing rules
python.c: In function `cpy_config':
python.c:887: warning: dereferencing type-punned pointer will break strict-aliasing rules
python.c:888: warning: dereferencing type-punned pointer will break strict-aliasing rules
python.c:889: warning: dereferencing type-punned pointer will break strict-aliasing rules
python plugin: Fix some typos in the inline documentation.
collectd-python(5): Fixed the AUTHOR section.
Merge branch 'st/python'
Conflicts:
README
configure.in
src/owniptc/libiptc.c
src/types.db
Conflicts:
README
configure.in
src/owniptc/libiptc.c
src/types.db
collectd-python(5): Some more formatting and typo fixes.
collectd-python(5): Improve formatting of the classes.
collectd-python(5): Fix some formatting.
README: Added the python plugin.
AUTHORS: Sven +python.
src/plugin.c: Add libtool 1 compatibility code.
src/pyvalues.c: Cast `void *' to a int that's guaranteed to be big enough.
For some weird reason `int' is only 4 bytes long on x86_64, so casting
`void *' to `int' results in compiler warnings / errors.
For some weird reason `int' is only 4 bytes long on x86_64, so casting
`void *' to `int' results in compiler warnings / errors.
Merge branch 'ff/routeros'
Merge branch 'mc/openvpn'
openvpn plugin: Added comments and vim formatting line.
openvpn plugin: Remove one level of indentation in the read functions.
openvpn plugin: Rename the arguments of the submit functions.
"Type" is being used for something different, don't use that argument
name here.
"Type" is being used for something different, don't use that argument
name here.
Clean up exceptions in places where we don't care about them.
This should have been in the last commit.
Better unicode support.
Fixed build system bug.
Removes the __name__ from callback identifiers. It was useless and made things way more complicated and confusing than necessary.
Added collectd-python man page.
Added write method to Values.
Don't log stuff while holding the GIL!
Some signal dodging stuff.
Build system: Add the python plugin.
src/configfile.c: Fix a typo in two error messages.
openvpn plugin: Implement the “ImprovedNamingSchema” config option.
I'm attaching a new version that includes this config key. By default the old
naming schema is used, while for the single mode the new naming schema is
always used since there's no backward compatibility to be preserved. You can
use the previous file[1] for the 5.0 branch where only the new naming schema
will be used. A new man page text is still lacking, maybe I'll write it in the
next days.
I'm attaching a new version that includes this config key. By default the old
naming schema is used, while for the single mode the new naming schema is
always used since there's no backward compatibility to be preserved. You can
use the previous file[1] for the 5.0 branch where only the new naming schema
will be used. A new man page text is still lacking, maybe I'll write it in the
next days.
routeros plugin: Add two “Collect*” config options.
src/configfile.[ch]: Add “cf_util_get_boolean”.
collectd.conf(5): openvpn plugin: Document the "Compression" option.
AUTHORS: Update Marco's entry.
openvpn plugin: single_read: Remove one level of indentation.
openvpn plugin: Use tabs for indentation only.
Whitespace-only commit.
Whitespace-only commit.
openvpn plugin: multi1_read: Replace a hard to read for-loop with a while-loop.
openvpn plugin: Improve “version_detect”.
Remove “fscanf” with used the insecure “%s” format string. Pass the
filename rather than the file handle to the function.
Remove “fscanf” with used the insecure “%s” format string. Pass the
filename rather than the file handle to the function.
openvpn plugin: Remove trailing whitespace.
openvpn plugin: Don't use negated config options.
“NoCompression” → “Compression”.
“NoCompression” → “Compression”.
openvpn plugin: Add forgotten frees.
Florian Forster ha scritto:
> Hi Marco,
Hi Florian,
> I'm too tired to have a look at this now, I hope to have some time in
> the next few days. I'll come back to you asap.
That's fine :)
But sorry, I forgot to recheck a small part of the code after adding and
moving some stuff around, please apply this patch too.
Regards,
Marco
Florian Forster ha scritto:
> Hi Marco,
Hi Florian,
> I'm too tired to have a look at this now, I hope to have some time in
> the next few days. I'll come back to you asap.
That's fine :)
But sorry, I forgot to recheck a small part of the code after adding and
moving some stuff around, please apply this patch too.
Regards,
Marco
openvpn plugin: Add support for more versions of the “status file” (and more).
Hi all,
I have some news regarding the Openvpn plugin.
I recently upgraded to 4.7.2 and enabled the new (to me) openvpn plugin,
but unfortunately it didn't work and I couldn't understand why. So had a
look at the code and applied some changes. Here a list of things
added:
- support for multiple vpn/status files
- support for single endpoint status file and for multicontext version
1,3 (currently every status file type is supported)
- status file type auto-detection
- collection of overhead and compression stats for single mode status files
- "NoCompression" option to disable compression statistics collection
- new file naming schema correcting the previous wrong one
- debug and error output
The plugin has already been tested with my own openvpn setup and many
different files found on the net, but two major aspects have to be taken
into consideration. The first one is the new overhead collection and the
change in the compression statistics (now data is stored as they are
[1]). However, due to a bug in the previous code, no compression
collection was working and so the new one is not going to brake backward
compatibility. Unfortunately backward compatibility is broken by the
new naming schema, more collectd compliant (and necessary with multiple
conf/status files support). So plugin_istance is now the status file
name (or the status entry number), while the plugin_type is now the
hostname when in multicontext mode or the traffic and overhead when in
single.
About the plugin_instance value, I started using numbers like the cpu
plugin does, but I prefer to use the self explanatory file name, helping
in finding the right vpn and avoiding to mess things up when adding a
new status file. The downside is that filenames have to be unique (man
pages should mention this [2]), therefore I added a check. Nonetheless I
think it's very unlikely to happen, it is quite rare to find many vpn on
the same system and it's really hard to have the same log filename
stored in different dirs rather than the opposite; usually to different
tunnels should already correspond different status log name.
However, Florian, feel free to choose the other method if you prefer, I
can send you a patch to revert to the number based schema.
Hope you like the code.
Regards,
Marco
[1] This allows to retrieve multiple informations, not just the pure
compression ratio. For example we can now calculate the pure compression
ratio, the global compression level, the byte saved (eg. for a
overhead vs. saved bytes graph) and so on.
[2] Man pages should be updated as well, but I haven't written anything yet.
Hi all,
I have some news regarding the Openvpn plugin.
I recently upgraded to 4.7.2 and enabled the new (to me) openvpn plugin,
but unfortunately it didn't work and I couldn't understand why. So had a
look at the code and applied some changes. Here a list of things
added:
- support for multiple vpn/status files
- support for single endpoint status file and for multicontext version
1,3 (currently every status file type is supported)
- status file type auto-detection
- collection of overhead and compression stats for single mode status files
- "NoCompression" option to disable compression statistics collection
- new file naming schema correcting the previous wrong one
- debug and error output
The plugin has already been tested with my own openvpn setup and many
different files found on the net, but two major aspects have to be taken
into consideration. The first one is the new overhead collection and the
change in the compression statistics (now data is stored as they are
[1]). However, due to a bug in the previous code, no compression
collection was working and so the new one is not going to brake backward
compatibility. Unfortunately backward compatibility is broken by the
new naming schema, more collectd compliant (and necessary with multiple
conf/status files support). So plugin_istance is now the status file
name (or the status entry number), while the plugin_type is now the
hostname when in multicontext mode or the traffic and overhead when in
single.
About the plugin_instance value, I started using numbers like the cpu
plugin does, but I prefer to use the self explanatory file name, helping
in finding the right vpn and avoiding to mess things up when adding a
new status file. The downside is that filenames have to be unique (man
pages should mention this [2]), therefore I added a check. Nonetheless I
think it's very unlikely to happen, it is quite rare to find many vpn on
the same system and it's really hard to have the same log filename
stored in different dirs rather than the opposite; usually to different
tunnels should already correspond different status log name.
However, Florian, feel free to choose the other method if you prefer, I
can send you a patch to revert to the number based schema.
Hope you like the code.
Regards,
Marco
[1] This allows to retrieve multiple informations, not just the pure
compression ratio. For example we can now calculate the pure compression
ratio, the global compression level, the byte saved (eg. for a
overhead vs. saved bytes graph) and so on.
[2] Man pages should be updated as well, but I haven't written anything yet.
Finished inline documentation.
Fix the filename in the head comment.
collectd.conf(5): Add section about the "routeros" plugin.
routeros plugin: Make connection parameters configurable.
And add support for multiple routers using the complex read function.
And add support for multiple routers using the complex read function.
routeros plugin: Add registration table statistics.
routeros plugin: Added first version of a plugin for MikroTik's RouterOS.
Added notification support.
AUTHORS: Add Manuel Sanmartin.
Various plugins: Remove trailing whitespaces.
swap plugin: Add support for AIX.
processes plugin: Add support for AIX.
In AIX, AFAIK, you do not known if an process are running or slepping,
this stat are saved in thread counter, so total measurement group data
by threads. -- Andrés J. Díaz
In AIX, AFAIK, you do not known if an process are running or slepping,
this stat are saved in thread counter, so total measurement group data
by threads. -- Andrés J. Díaz
memory plugin: Add support for AIX.
load plugin: Add support for AIX.
interface plugin: Add support for AIX.
disk plugin: Add support for AIX.
cpu plugin: Add support for AIX.
liboconfig: Rename the “TRUE” and “FALSE” tokens.
They are defines in <sys/types.h> under AIX.
They are defines in <sys/types.h> under AIX.
src/Makefile.am: Special handling for AIX.
Flags for linking: -Wl,-bexpall,-brtllib
Link with -lm because isnan is in libm
Flags for linking: -Wl,-bexpall,-brtllib
Link with -lm because isnan is in libm
configure.in: When building on AIX, add “-lm” when checking for NAN.
version-gen.sh: AIX doesn't have “echo -n”.
Split the Values class into PluginData and Values to use PluginData as a baseclass for Notification later.
Also wrote some documentation.
Also wrote some documentation.
Added proper doc strings to the Config class.
Added unregister functions for all callbacks.
Also removed useless plugin_unregister_complex_read declaration.
Also removed useless plugin_unregister_complex_read declaration.
Added flush and register_flush functions.
Also changed name generation.
Also changed name generation.
Merge branch 'collectd-4.8'
snmp plugin: Rename a variable (missed during merge).
Proper exception logging.
Merge branch 'collectd-4.8'
Merge branch 'collectd-4.7' into collectd-4.8
Conflicts:
src/snmp.c
Conflicts:
src/snmp.c
Added a config option to start collectd as an interactive python shell.
contrib/snmp-data.conf: Add support for Mikrotik RouterBoards.
snmp plugin: Fix handling of strings with control characters.
If a byte of a string has a value <32, the string is printed as a
hex-string. This fixes issues with some devices returning MAC addresses
as "strings".
If a byte of a string has a value <32, the string is printed as a
hex-string. This fixes issues with some devices returning MAC addresses
as "strings".
snmp plugin: Fix handling of negative values.
No need to check for NULL if you're gonna pass NULL anyway.
Meh, forgot to pass the userdata back on write callbacks.
Added read callback. And "read" in this case means "plugin_register_complex_read".
Added write callbacks.