network plugin: Send and receive the interval of value lists.
src/plugin.h: Include the `interval' in the value lists.
Merge branch 'ff/rrdqueue'
Merge branch 'ff/snmp'
Bumped version to 4.0.0; Updated ChangeLog.
rrdtool plugin: Fixed some bugs in the queueing-code.
Marked the perl plugin to be experimental.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Added Perl module "Collectd" to contrib.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Sebastian Harl <sh@tokkee.org>
src/configfile.c: Pass the `oconfig_item_t' types to the plugins if they request it.
rrdtool plugin: Queue values to be written, but don't write them synchronously.
collectd-snmp(5): Fix some errors and typos.
Merge branch 'pull/master'
collectd-unixsock(5): Corrected the information about the PUTVAL format.
snmp plugin: Cast the `bitstring' to (char *).
The implementation apparently differs between versions.
The implementation apparently differs between versions.
collectd-snmp(5): Added a manpage for the SNMP plugin.
collectd-exec(5): Documented the recent changes.
exec plugin: Change the input format so it's identical to the one used in unixsock.
unixsock plugin: Moved the `parse_identifier' code to `common.c'
The new function `parse_values' in `common.c' can be used to parse
`time:value0:value1:...', as used by RRDTool, the unixsock plugin and, in the
very near future, the exec plugin.
The new function `parse_values' in `common.c' can be used to parse
`time:value0:value1:...', as used by RRDTool, the unixsock plugin and, in the
very near future, the exec plugin.
snmp plugin: Implemented fetching of tables.
This also works with ``sparse tables'' where rows are missing or some columns
are not defined in all rows. That may be improved still, though.
This also works with ``sparse tables'' where rows are missing or some columns
are not defined in all rows. That may be improved still, though.
snmp plugin: First experimental code to read an SNMP-table.
snmp plugin: Added the first prototype of an SNMP plugin.
Querying simple values already works.
Querying simple values already works.
src/configfile.c: Pass the `oconfig_item_t' types to the plugins if they request it.
ntpd plugin: Replace `syslog (LOG_ERR, ...)' with `ERROR (...)'.
Merge branch 'collectd-3.11'
Conflicts:
ChangeLog
configure.in
Conflicts:
ChangeLog
configure.in
Bumped version to 3.11.5; Updated ChangeLog.
ntpd plugin: Fix a possible buffer overflow.
Merge branch 'pull/master'
network plugin: Prepend the plugin's name to debug messages.
exec plugin: Print a warning when the returned string is incorrect.
Also the debug messages have been beautified.
Also the debug messages have been beautified.
contrib/migrate-3-4.px: Added usage information.
collectd.c: Added '-t' command line option.
This option allows to test the configuration only. The program immediately
exits after parsing the config file. A return code not equal to zero indicates
an error.
Some typos have been fixed as well.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
This option allows to test the configuration only. The program immediately
exits after parsing the config file. A return code not equal to zero indicates
an error.
Some typos have been fixed as well.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
memory plugin: Fix unused variable warning under FreeBSD.
Merge branch 'collectd-3.11'
Conflicts:
src/processes.c
Conflicts:
src/processes.c
processes plugin: ps_read_tasks will fail under Linux 2.4.
Take this into account and don't report all processes without tasks as zombies.
Take this into account and don't report all processes without tasks as zombies.
sensors plugin: Let the read-function fail if something isn't right..
..so it gets suspended as it should be.
..so it gets suspended as it should be.
17 years agoplugin.c: Added a comment that explains why the order of the linked list and callback...
plugin.c: Added a comment that explains why the order of the linked list and callback are important.
plugin.c: Advance the llentry_t pointer before calling the shutdown callback.
> Important note: Unregistering the shutdown callback during shutdown is
> somewhat tricky. Doing that frees the llist_t entry in plugin.c:list_shutdown.
> This might cause a segfault in plugin_shutdown_all () when it tries to access
> the next pointer of that entry. If plugin_unregister_shutdown () is the last
> statement before the return from the shutdown callback this should be save in
> about 99% of all cases. Still there should be some better way to handle this.
This is an imho nice way to fix it.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
> Important note: Unregistering the shutdown callback during shutdown is
> somewhat tricky. Doing that frees the llist_t entry in plugin.c:list_shutdown.
> This might cause a segfault in plugin_shutdown_all () when it tries to access
> the next pointer of that entry. If plugin_unregister_shutdown () is the last
> statement before the return from the shutdown callback this should be save in
> about 99% of all cases. Still there should be some better way to handle this.
This is an imho nice way to fix it.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
perl plugin: Unregister all callbacks from collectd when shutting down.
If we do not unregister the callbacks there is still an entry point into the
plugin after Perl has been shut down and its memory has been freed. This will
cause segmentation faults if collectd tries to call any of the registered
callbacks, e.g. by some plugin calling plugin_log () during shutdown.
Important note: Unregistering the shutdown callback during shutdown is
somewhat tricky. Doing that frees the llist_t entry in plugin.c:list_shutdown.
This might cause a segfault in plugin_shutdown_all () when it tries to access
the next pointer of that entry. If plugin_unregister_shutdown () is the last
statement before the return from the shutdown callback this should be save in
about 99% of all cases. Still there should be some better way to handle this.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
If we do not unregister the callbacks there is still an entry point into the
plugin after Perl has been shut down and its memory has been freed. This will
cause segmentation faults if collectd tries to call any of the registered
callbacks, e.g. by some plugin calling plugin_log () during shutdown.
Important note: Unregistering the shutdown callback during shutdown is
somewhat tricky. Doing that frees the llist_t entry in plugin.c:list_shutdown.
This might cause a segfault in plugin_shutdown_all () when it tries to access
the next pointer of that entry. If plugin_unregister_shutdown () is the last
statement before the return from the shutdown callback this should be save in
about 99% of all cases. Still there should be some better way to handle this.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
src/plugin.c: Remove slashed from host, {plugin,type}{,-instance} here.
A fix in the disk plugin has been removed again.
A fix in the disk plugin has been removed again.
email, users and vserver plugins: Changed license to GPL v2 only.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Sebastian Harl <sh@tokkee.org>
README: Fixed a typo.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Sebastian Harl <sh@tokkee.org>
configure.in: Bumped version to 4.0.0-rc10
collectd-nagios(1) and collectd-unixsock(5): Reference one another.
collectd-unixsock(5): Added a note about Collectd::Unixsock.
README: Cleaned up the description of plugins and added information about new plugins.
collectd-perl(5): Moved information about the `perl plugin' into an own manpage.
collectd-email(5): Moved information about the `email plugin' into an own manpage.
collectd.conf(5): Moved information about ``special'' plugins from collectd(1) to here.
collectd.conf(5): Documented `PluginDir' and `TypesDB'.
unixsock plugin: Return a message in any case.
This removes a fair amount of `FIXME's :)
This removes a fair amount of `FIXME's :)
Collectd::Unixsock: Handle instance `0' and interpret a returned `NaN' correctly.
collectd-exec(5): Corrected/added some information.
17 years agocollectd-unixsock(5): Moved information about the `unixsock plugin' into an own manpage.
collectd-unixsock(5): Moved information about the `unixsock plugin' into an own manpage.
collectd-exec(5): Moved information about the `exec plugin' into an own manpage.
contrib/collection.cgi: Improved some more graphs.
contrib/collection.cgi: Include `back'-links and more vertical labels.
contrib/collection.cgi: Print proper HTML-header.
17 years agocontrib/collection.cgi: Included a completely new version with hardly any functionality.
contrib/collection.cgi: Included a completely new version with hardly any functionality.
contrib/migrate-3-4.px: Create (sub)directories for the disk plugin.
contrib/{extractDS,migrate-3-4}.px: Don't use XML::Simple and don't check for the output directory.
17 years agorrdtool plugin: Assure that values, that are older then the newest value in the cache...
rrdtool plugin: Assure that values, that are older then the newest value in the cache, are rejected.
Otherwise there might be gaps in the graphs.
Otherwise there might be gaps in the graphs.
dns plugin: Only submit dns-traffic if either counter is non-zero.
email plugin: Only submit `spam_score' if any mails have been processed.
disk plugin: Remove slashed from disk-names.
contrib/extractDS.px: Create RRD file instead of writing to STDOUT.
This was changed in order to debug new code and then forgotten..
This was changed in order to debug new code and then forgotten..
contrib/migrate-3-4.px: Handle `disk' and `partition' files correctly.
contrib/extractDS.px: Allow extration of multiple DSes into one file with multiple DSes.
This is needed to migrate the old disk-RRD-files.
This is needed to migrate the old disk-RRD-files.
collectd(1): Changed plugin information for v4.
Also removed information about the `modes' and RRD-file definitions.
Also removed information about the `modes' and RRD-file definitions.
Include `config.h' from all files.
Either directly or indirectly via `collectd.h'.
Either directly or indirectly via `collectd.h'.
Merge branch 'pull/collectd-4' into collectd-4
Merge branch 'master' into collectd-4
Conflicts:
src/multimeter.c
src/network.c
src/utils_debug.c
Conflicts:
src/multimeter.c
src/network.c
src/utils_debug.c
Merge branch 'collectd-3.11'
Include "config.h" rather than <config.h>.
[PATCH] Added large file support ("backported" to collectd-3).
This adds large file support to collectd by using the AC_SYS_LARGEFILE macro
in configure.in. In order to apply any necessary options to all parts of
collectd, we have to make sure config.h is included in all source files
(either directly or by including collectd.h) and before any other header files
are included.
This should fix http://bugs.debian.org/422212.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
This adds large file support to collectd by using the AC_SYS_LARGEFILE macro
in configure.in. In order to apply any necessary options to all parts of
collectd, we have to make sure config.h is included in all source files
(either directly or by including collectd.h) and before any other header files
are included.
This should fix http://bugs.debian.org/422212.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
src/plugin.c: assert (ds->ds_num == vl->values_len); when debug is enabled.
configure.in: Don't check for grp.h twice.
perl plugin: Work around a redefinition of DEBUG in perl.h.
Some versions of Perl define their own verion of DEBUG in perl.h overwriting
the definition found in plugin.h. This works around this issue.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Some versions of Perl define their own verion of DEBUG in perl.h overwriting
the definition found in plugin.h. This works around this issue.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
unixsock plugin: Don't assert that `ds->ds_num == vl->values_num' when not built with debugging enabled.
disk plugin: Correct the collection of {read,write}-time.
It's actually `average time an IO-operation needs'.
It's actually `average time an IO-operation needs'.
Merge branch 'pull/collectd-4' into collectd-4
unixsock plugin: Don't include <sys/poll.h> since it's not used.
email plugin: Include <sys/un.h> rather than <linux/un.h>.
apple_sensors plugin: Fix the `module_register' function.
configure.in: Bumped version to 4.0.0-rc9
unixsock plugin: Remove the socket-file after closing the socket.
iptables plugin: Fix a segfault in the shutdown code.
That's the problem with macros: `for (...) sfree (ptr);' doesn't work.
That's the problem with macros: `for (...) sfree (ptr);' doesn't work.
src/types_list.c: Strip newlines from the end of the line.
memory plugin: Bugfix: values_len is one now, not four.
memory plugin: Fix the Linux-code: It submitted the same value for all RRD-files.
src/plugin.c: Check `list_data_set' to be non-NULL before querying it.
configure.in: Bumped version to 4.0.0-rc8
src/Makefile.am: Include `types.db' in the tarballs.
types.db: Reverse the order of the `df'-DSes.
memory plugin: Fix the `sysctl'-code which submitted the same values for all instances.
src/plugin.c: Copy the data-sets before inserting them in the list.
Thus memory management is done by `plugin.c' and overwritten DSes can be freed.
Thus memory management is done by `plugin.c' and overwritten DSes can be freed.
configure.in: Bumped version to 4.0.0-rc7
Merge branch 'ff/types' into collectd-4
src/configfile.c: s/TypesDS/TypesDB/;
17 years agoRemoved the config-option `LoadDS' and the passing of the `modreg_e' enum to `module_...
Removed the config-option `LoadDS' and the passing of the `modreg_e' enum to `module_register' again.
17 years agotypes_list: Do not free `ds' and `dsrc' because it's not copied in `plugin_register_d...
types_list: Do not free `ds' and `dsrc' because it's not copied in `plugin_register_data_set'.
This is a TODO.
This is a TODO.