README: Updated information about librrd and libstatgrab.
The info about librrd still talked about "client mode" while libstatgrab still
mentioned that CPU and disk statistics would not be supported.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
The info about librrd still talked about "client mode" while libstatgrab still
mentioned that CPU and disk statistics would not be supported.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
README: Mention the shipped copy of libiptc.
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>
libiptc: Included a copy of xtables.h and libxtc.h.
The shipped copy of "xtables.h" is now used instead of the one possibly
available on the system. This avoids possible inconsistencies between the
shipped version of libiptc and the one available on the system. Also, it
removes the dependency on the iptables development files.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
The shipped copy of "xtables.h" is now used instead of the one possibly
available on the system. This avoids possible inconsistencies between the
shipped version of libiptc and the one available on the system. Also, it
removes the dependency on the iptables development files.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Added src/libiptc/README.collectd.
This file is used to explain why libiptc is included in collectd, which
iptables version it's taken from and what changes have been applied.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
This file is used to explain why libiptc is included in collectd, which
iptables version it's taken from and what changes have been applied.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
libiptc: Updated from version 1.4.0 to 1.4.1.1.
This brings the library in sync with the latest stable upstream release. Now,
libiptc.c:standard_target_map() is declared static in the upstream sources, so
we no longer need to modify that ourselves.
The update includes, amongst others, fixes for a build failure with glibc 2.8,
some compiler warnings, an incorrect ruleset dump (netfilter issue #104) and a
scalability issue for chain list "name" searching.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
This brings the library in sync with the latest stable upstream release. Now,
libiptc.c:standard_target_map() is declared static in the upstream sources, so
we no longer need to modify that ourselves.
The update includes, amongst others, fixes for a build failure with glibc 2.8,
some compiler warnings, an incorrect ruleset dump (netfilter issue #104) and a
scalability issue for chain list "name" searching.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Merge branch 'collectd-4.5'
Merge branch 'collectd-4.4' into collectd-4.5
build.sh: Check for more (all?) programs needed.
collection.cgi: Added support for the memcached-specific types.
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>
perl plugin: Disable plugin after fatal configuration errors.
Currently, the only such case is the failure to bootstrap the Perl interpreter
and Collectd module. This fixes a segfault that happened when trying to
configure Perl plugins in that case.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Currently, the only such case is the failure to bootstrap the Perl interpreter
and Collectd module. This fixes a segfault that happened when trying to
configure Perl plugins in that case.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
src/plugin.c: Increase the plugin_log() message buffer to 1024 bytes.
512 bytes is not enough for some perl error messages.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
512 bytes is not enough for some perl error messages.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
perl plugin: Log the perl error messages if bootstrapping Collectd failed.
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>
snmp plugin: Use the complaint mechanism for reporting connection errors.
In big setups these messages flood the logfile and make it unreadable.
Signed-off-by: Florian Forster <octo@noris.net>
In big setups these messages flood the logfile and make it unreadable.
Signed-off-by: Florian Forster <octo@noris.net>
src/utils_complain.h: Rename `C_COMPLAIN_INIT' to `C_COMPLAIN_INIT_STATIC'.
Because it can only be used when initializing during declaration. A macro
for initializing a struct by pointer as been added with the previous name,
i. e. `C_COMPLAIN_INIT(c)'.
Signed-off-by: Florian Forster <octo@noris.net>
Because it can only be used when initializing during declaration. A macro
for initializing a struct by pointer as been added with the previous name,
i. e. `C_COMPLAIN_INIT(c)'.
Signed-off-by: Florian Forster <octo@noris.net>
contrib/collection3: Added graphs for `apache_{bytes,requests}'.
contrib/collection3: Use `instance' rather than `plugin_instance'
for all the `disk_*' graphs.
for all the `disk_*' graphs.
snmp plugin: Improve parsing of strings to values.
The ``strings'' returned by the Net-SNMP library may not be null
terminated. What the fuck were those guys thinking? At least there's a
`val_len' member in `struct variable_list' we can use to determine the
amount of bytes we need to copy.
The ``strings'' returned by the Net-SNMP library may not be null
terminated. What the fuck were those guys thinking? At least there's a
`val_len' member in `struct variable_list' we can use to determine the
amount of bytes we need to copy.
interface plugin: Use src/utils_ignorelist.[ch].
The interface plugin was still using the (very first) implementation of
that ignore functionality - without the regex support :/
The interface plugin was still using the (very first) implementation of
that ignore functionality - without the regex support :/
collection3/etc/collection.conf: Added some mysql stuff.
rrdcached plugin: Add the four new statistics that were added to RRDCacheD.
Merge branch 'master' into ff/rrdcached
Conflicts:
src/rrdtool.c
Conflicts:
src/rrdtool.c
AUTHORS: Fixed typo.
collectd.conf(5): Fixed typo.
collectd.conf(5): Changed the default socket paths of the powerdns plugin.
powerdns plugin: Use `LOCALSTATEDIR' instead of "/var".
I was working on updating Gentoo's ebuild and I noticed that localstatedir was
not used in certain places. Please review these patches and consider them.
Boian Berberov
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
I was working on updating Gentoo's ebuild and I noticed that localstatedir was
not used in certain places. Please review these patches and consider them.
Boian Berberov
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
configure: Allow `--with-libperl=/path/to/binary', too.
That way one can specify an alternative path, without setting the global
`CFLAGS' and `LDFLAGS' variables.
That way one can specify an alternative path, without setting the global
`CFLAGS' and `LDFLAGS' variables.
configure: Get the check for libperl in sync with the way it's used.
* Define PERL_NO_GET_CONTEXT.
* Use the API functions without the Perl_ prefix.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
* Define PERL_NO_GET_CONTEXT.
* Use the API functions without the Perl_ prefix.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Merge branch 'collectd-4.4'
Merge branch 'collectd-4.3' into collectd-4.4
processes plugin: Fix a format string.
apple_sensors plugin: Add a missing semicolon.
Bumped version to 4.5.0.
Merge branch 'collectd-4.4'
Conflicts:
ChangeLog
Conflicts:
ChangeLog
ChangeLog: Added an entry about the ability to configure Perl plugins.
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>
ChangeLog: Be slightly more specific about the features of the PostgreSQL plugin.
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>
Bumped version to 4.4.3; Updated ChangeLog.
Merge branch 'collectd-4.3' into collectd-4.4
Conflicts:
ChangeLog
version-gen.sh
Conflicts:
ChangeLog
version-gen.sh
ChangeLog: Entry for 4.3.4: Bring plugins in alphabetical order.
Bumped version to 4.3.3; Updated ChangeLog.
filecount plugin: s/\<strncpy\>/sstrncpy/g
Collectd::Unixsock: Update `putnotif', fix a bug in `getval', better debug output.
The `putnotif' method now handles identifiers and options with spaces
correctly. The `getval' plugin now reads the returned data line wise,
which is the right thing to do anyway. The new `_debug' function prints
debugging output if the (module)global $Debug variable is set.
The `putnotif' method now handles identifiers and options with spaces
correctly. The `getval' plugin now reads the returned data line wise,
which is the right thing to do anyway. The new `_debug' function prints
debugging output if the (module)global $Debug variable is set.
unixsock plugin: Improve two debug messages.
collectd-{exec,unixsock}(5): Documented how to pass identifiers with spaces.
src/utils_cmd_putnotif.[ch]: Change parsing to allow quoted strings.
This completes all the commands, now quoted strings should be accepted
anywhere.
This completes all the commands, now quoted strings should be accepted
anywhere.
src/utils_parse_option.c: Null-terminate parsed quoted strings.
src/Makefile.am: Link the exec plugin with utils_parse_option.
src/utils_cmd_listval.[ch]: Use the new parsing mechanism here, too.
src/utils_cmd_putval.[ch]: Allow identifiers to include spaces.
snmp plugin: Fix an off by one error.
The last character of an table instance was truncated. Fortunately empty
strings were caught, so that uninitialized memory was never accessed.
This patch also reverts f782b378: If returning with an error when a string
is empty causes the entire read to fail.
The last character of an table instance was truncated. Fortunately empty
strings were caught, so that uninitialized memory was never accessed.
This patch also reverts f782b378: If returning with an error when a string
is empty causes the entire read to fail.
src/utils_cmd_getval.[ch]: Fix handling of identifiers with spaces.
The getval handler now uses the `parse_string' function in
`utils_parse_option' to handle quoted strings correctly.
The getval handler now uses the `parse_string' function in
`utils_parse_option' to handle quoted strings correctly.
src/utils_parse_option.[ch]: Add `parse_string'.
This function can be used by the command handlers to parse simple string
arguments. It's used by `parse_option', too, to avoid redundand code.
Signed-off-by: Florian Forster <octo@noris.net>
This function can be used by the command handlers to parse simple string
arguments. It's used by `parse_option', too, to avoid redundand code.
Signed-off-by: Florian Forster <octo@noris.net>
src/collectd.conf.in: Add the filecount plugin.
Merge branch 'collectd-4.4'
Merge branch 'collectd-4.3' into collectd-4.4
collectd.conf(5): onewire plugin: Added a note about working chips.
collectd.conf(5): onewire plugin: Mark the `Device' option as required.
onewire plugin: Remove the "Alias" config option.
It's not implemented and not documented and it's easy enough to add back
in when somebody cares to implement it.
It's not implemented and not documented and it's easy enough to add back
in when somebody cares to implement it.
onewire plugin: Imported the code for DS2409 hubs.
collectd.conf(5), README: Added a note that the onewire plugin is experimental.
ChangeLog: Added the onewire plugin.
It's marked as experimental.
It's marked as experimental.
postgresql plugin: Check for and report query redefinitions.
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>
postgresql plugin: Check for and report MinPGVersion > MaxPGVersion.
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>
postgresql plugin: Disable queries that do not include an SQL query string.
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>
collectd.conf(5): Documented the postgresql {Min,Max}PGVersion options.
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>
postgresql_default.conf: Split "queries" query into two versions.
The "n_tup_hot_upd" column has been added in 8.3. The two versions of the
"queries" query now take that into account by defining different SQL queries
for versions up to 8.2.99 and versions starting with 8.3.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
The "n_tup_hot_upd" column has been added in 8.3. The two versions of the
"queries" query now take that into account by defining different SQL queries
for versions up to 8.2.99 and versions starting with 8.3.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
postgresql_default.conf: Limit query "table_states" to versions >= 8.3.
The "n_live_tup" and "n_dead_tup" columns of the pg_stat_tables view were not
available before that version.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
The "n_live_tup" and "n_dead_tup" columns of the pg_stat_tables view were not
available before that version.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
postgresql plugin: Added {Min,Max}PGVersion configuration options.
Those options may be used to specify the minimum and maximum version of
PostgreSQL which is required for some query. This may be used to automatically
configure the plugin for a heterogeneous environment while using the same
configuration file on all hosts.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Those options may be used to specify the minimum and maximum version of
PostgreSQL which is required for some query. This may be used to automatically
configure the plugin for a heterogeneous environment while using the same
configuration file on all hosts.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
postgresql plugin: Renamed config_set() to config_set_s().
The latter name includes the type (string) of the data being handled and,
thus, allows functions handling other types to be named in a consistent way.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
The latter name includes the type (string) of the data being handled and,
thus, allows functions handling other types to be named in a consistent way.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
.gitignore: Added collectd-nagios, collectdmon and perl stuff.
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>
collectd.conf.in: Moved logging plugins to the top of the file.
This will make all logging output of all other plugins available.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
This will make all logging output of all other plugins available.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
ChangeLog: Added the changes to the perl plugin.
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>
collectd-perl(5): Document the <Plugin> configuration block.
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>
perl plugin: Added "<Plugin>" configuration block.
Similar to the global "<Plugin>" blocks this may be used to configure Perl
plugins. The oconfig_item_t object is converted to a Perl hash which will be
passed on to the registered configuration callback. A configuration
callback is registered using the TYPE_CONFIG identifier.
The Perl representation of the oconfig_item_t object looks like this:
{
'key' => '<key>',
'values' => [ '<val1>', '<val2>', ... ],
'children' => [ { ... }, { ... }, ... ]
}
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Similar to the global "<Plugin>" blocks this may be used to configure Perl
plugins. The oconfig_item_t object is converted to a Perl hash which will be
passed on to the registered configuration callback. A configuration
callback is registered using the TYPE_CONFIG identifier.
The Perl representation of the oconfig_item_t object looks like this:
{
'key' => '<key>',
'values' => [ '<val1>', '<val2>', ... ],
'children' => [ { ... }, { ... }, ... ]
}
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
perl plugin: Re-get the perl interpreter after parsing each configuration option.
The current perl interpreter might change while parsing the configuration
(e.g. the first interpreter is created by the "LoadPlugin" option), so this is
to make sure that we're using the right interpreter at all times.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
The current perl interpreter might change while parsing the configuration
(e.g. the first interpreter is created by the "LoadPlugin" option), so this is
to make sure that we're using the right interpreter at all times.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
configure.in: Add the filecount plugin to the status output.
configure.in, filecount.c: Removed all left-over occurrences of "qmail".
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>
contrib/snmp-probe-host.px: Don't fail silently, but outupt an empty config.
contrib/snmp-probe-host.px: Work-around for Windows systems.
They don't return an error, but `success' and a string stating
NOSUCHOBJECT.
Just great.
They don't return an error, but `success' and a string stating
NOSUCHOBJECT.
Just great.
contrib/snmp-probe-host.px: Fix for `table' data without instance.
Collectd::Unixsock: Allow passing of `Interval' to `PUTVAL'.
collectd.conf(5): Fix an example for the tail plugin.
Resolves: #27
Resolves: #27
Merge branch 'master' of /var/lib/git/collectd
memcached plugin: Wait for a *little* longer for the memcached to answer.
poll(2) takes a timeout in milliseconds, not seconds. Multiply
`interval_g' by 1000 before passing it to `poll'.
Thanks to Joost Cassee <joost at cassee.net> for helping debug this.
poll(2) takes a timeout in milliseconds, not seconds. Multiply
`interval_g' by 1000 before passing it to `poll'.
Thanks to Joost Cassee <joost at cassee.net> for helping debug this.
TODO: Added what is left to do for 4.5.
filecount plugin: Make absolutely sure `status' is never read uninitialized.
ChangeLog: Updated for 4.5.0.
README: Added the filecount plugin.
collectd.conf(5): Documented the filecount plugin.
Build system: Renamed the qmail plugin to filecount.
filecount plugin: Substitute slashes with underscores.
Not dashes. Somehow I now like underscores better.
Not dashes. Somehow I now like underscores better.
filecount plugin: Renamed the `qmail' plugin to `filecount'.
qmail plugin: Made the counting of files more generalized.
src/common.[ch]: Pass user data to `walk_directory'.
`walk_directory' in turn passes the directory name and the user data
back to the callback functions.
`walk_directory' in turn passes the directory name and the user data
back to the callback functions.
AUTHORS: Add Alessandro Iurlano.
AUTHORS: Reformatted the list of contributors.
It's now sorted by the names of the contributors, not by the name of the
plugins they touched. That just messed up with time.
It's now sorted by the names of the contributors, not by the name of the
plugins they touched. That just messed up with time.
rrdtool plugin: Implemented the `WritesPerSecond' option.
This option lets you slow down the `queue thread' within the rrdtool
plugin, so that the system stays responsive while writing all values
to disk. When FLUSH'ing values and during shutdown this limit is not
in effect.
This option lets you slow down the `queue thread' within the rrdtool
plugin, so that the system stays responsive while writing all values
to disk. When FLUSH'ing values and during shutdown this limit is not
in effect.
Merge branch 'master' of git://git.verplant.org/collectd
Merge branch 'collectd-4.4'
Merge branch 'collectd-4.3' into collectd-4.4
src/plugin.c: Fix indentation.
Change functions, that were indented using spaces, to *only* use spaces
(instead of a mix of both, spaces and tabs) but leave all the rest, that
is indented using tabs, as it is.
Hope this is a good compromise between consistency and breaking patches
for no good reason ;)
Change functions, that were indented using spaces, to *only* use spaces
(instead of a mix of both, spaces and tabs) but leave all the rest, that
is indented using tabs, as it is.
Hope this is a good compromise between consistency and breaking patches
for no good reason ;)