Code

collectd.git
15 years agoperl plugin: Do not pass NULL to newRV().
Sebastian Harl [Mon, 16 Feb 2009 12:39:54 +0000 (13:39 +0100)]
perl plugin: Do not pass NULL to newRV().

newRV() does not handle that correctly and causes a segfault instead. Now, we
use PL_sv_undef instead.

15 years agoChanged plugin_notification_meta_free()'s argument to a notification_meta_t.
Sebastian Harl [Mon, 16 Feb 2009 11:02:09 +0000 (12:02 +0100)]
Changed plugin_notification_meta_free()'s argument to a notification_meta_t.

This is more flexible and allows the function to be used when using the meta
data without an embedding notification object, e.g. when using the filter
chains.

15 years agoperl plugin: Fixed a memory leak in pplugin_dispatch_notification().
Sebastian Harl [Mon, 16 Feb 2009 10:53:02 +0000 (11:53 +0100)]
perl plugin: Fixed a memory leak in pplugin_dispatch_notification().

Free the notification meta information that have possibly been allocated in
notification2hv().

15 years agoperl plugin: Convert notification meta data as well.
Sebastian Harl [Sat, 14 Feb 2009 18:33:35 +0000 (19:33 +0100)]
perl plugin: Convert notification meta data as well.

The notification meta data are represented as an array of hash references:

  [
    {
      name  => <name>,
      value => <value>
    },
    ...
  ]

15 years agoperl plugin: Don't ignore the 'interval' member when converting value lists.
Sebastian Harl [Sat, 14 Feb 2009 15:45:55 +0000 (16:45 +0100)]
perl plugin: Don't ignore the 'interval' member when converting value lists.

15 years agoswap plugin: Be more sensitive about integer sizes in the *BSD code.
Florian Forster [Mon, 16 Feb 2009 12:34:44 +0000 (13:34 +0100)]
swap plugin: Be more sensitive about integer sizes in the *BSD code.

15 years agosrc/filter_chain.c: Document the `meta' argument passed to matches and targets inline.
Florian Forster [Mon, 16 Feb 2009 12:26:25 +0000 (13:26 +0100)]
src/filter_chain.c: Document the `meta' argument passed to matches and targets inline.

15 years agoconfigure.in: Improve checking for libstatgrab using pkg-config.
Florian Forster [Mon, 16 Feb 2009 12:08:06 +0000 (13:08 +0100)]
configure.in: Improve checking for libstatgrab using pkg-config.

15 years agoswap plugin: Fix another typo in the *BSD code.
Simon Kuhnle [Mon, 16 Feb 2009 12:06:06 +0000 (13:06 +0100)]
swap plugin: Fix another typo in the *BSD code.

15 years agoMerge branch 'collectd-4.5'
Florian Forster [Mon, 16 Feb 2009 11:48:22 +0000 (12:48 +0100)]
Merge branch 'collectd-4.5'

Conflicts:

configure.in

15 years agoMerge branch 'collectd-4.4' into collectd-4.5
Florian Forster [Mon, 16 Feb 2009 11:35:23 +0000 (12:35 +0100)]
Merge branch 'collectd-4.4' into collectd-4.5

Conflicts:

configure.in

15 years agocollectd.conf(5): Removed references to the `main' chain.
Florian Forster [Mon, 16 Feb 2009 11:33:23 +0000 (12:33 +0100)]
collectd.conf(5): Removed references to the `main' chain.

The chains are now called `PreCache' and `PostCache'.

15 years agocollectd.conf(5): Add documentation for the `notify_email' plugin.
Florian Forster [Mon, 16 Feb 2009 11:30:13 +0000 (12:30 +0100)]
collectd.conf(5): Add documentation for the `notify_email' plugin.

15 years agoswap plugin: Fix two typos in the *BSD code.
Simon Kuhnle [Mon, 16 Feb 2009 11:00:35 +0000 (12:00 +0100)]
swap plugin: Fix two typos in the *BSD code.

15 years agoswap plugin: Added support for OpenBSD and possibly other *BSDs.
Florian Forster [Mon, 16 Feb 2009 10:42:28 +0000 (11:42 +0100)]
swap plugin: Added support for OpenBSD and possibly other *BSDs.

15 years agoChangeLog: Document Simon's changes.
Florian Forster [Sun, 15 Feb 2009 17:30:39 +0000 (18:30 +0100)]
ChangeLog: Document Simon's changes.

15 years agoconfigure.in: Activate the cpu and swap plugins if sysctl is available.
Florian Forster [Sun, 15 Feb 2009 17:30:20 +0000 (18:30 +0100)]
configure.in: Activate the cpu and swap plugins if sysctl is available.

15 years agocpu plugin: Check if all required sysctl defines are present.
Florian Forster [Sun, 15 Feb 2009 14:01:05 +0000 (15:01 +0100)]
cpu plugin: Check if all required sysctl defines are present.

Rather than checking for OpenBSD, since this interface may work with
other *BSDs, too. The order of the initialization code has been fixed,
too, and some other minor fixes..

15 years agocpu plugin: Fix indentation for the libstatgrab code.
Florian Forster [Sun, 15 Feb 2009 13:33:39 +0000 (14:33 +0100)]
cpu plugin: Fix indentation for the libstatgrab code.

15 years agocpu plugin: Use C99-like stack allocation.
Simon Kuhnle [Sun, 15 Feb 2009 13:32:56 +0000 (14:32 +0100)]
cpu plugin: Use C99-like stack allocation.

As suggested by octo.

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
15 years agocpu plugin: Add support for OpenBSD.
Simon Kuhnle [Sun, 8 Feb 2009 12:16:19 +0000 (13:16 +0100)]
cpu plugin: Add support for OpenBSD.

Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
15 years agoBumped version to 4.6.0; Updated ChangeLog.
Florian Forster [Sun, 15 Feb 2009 11:43:50 +0000 (12:43 +0100)]
Bumped version to 4.6.0; Updated ChangeLog.

15 years agobind plugin: Implement per-zone statistics.
Florian Forster [Sat, 14 Feb 2009 22:38:48 +0000 (23:38 +0100)]
bind plugin: Implement per-zone statistics.

Also, the configuration schema has been improved - hopefully.

15 years agotimediff match: Add a match for values with an invalid time.
Florian Forster [Sat, 14 Feb 2009 18:18:23 +0000 (19:18 +0100)]
timediff match: Add a match for values with an invalid time.

The time is compared to the server's local time and values which differ
too much (configurable, of course) are matched.

15 years agosrc/utils_db_query.h: Fix a small typo.
Florian Forster [Sat, 14 Feb 2009 17:39:43 +0000 (18:39 +0100)]
src/utils_db_query.h: Fix a small typo.

15 years agosrc/utils_db_query.c: udb_query_pick_from_list* should add *all* queries of the desir...
Florian Forster [Sat, 14 Feb 2009 17:31:49 +0000 (18:31 +0100)]
src/utils_db_query.c: udb_query_pick_from_list* should add *all* queries of the desired name.

15 years agopostgresql plugin: Use the DB query module.
Florian Forster [Sat, 14 Feb 2009 16:26:37 +0000 (17:26 +0100)]
postgresql plugin: Use the DB query module.

The old (legacy) features should still be supported.

15 years agosrc/utils_db_query.[ch]: Add the possibility to `pick' queries by name.
Florian Forster [Sat, 14 Feb 2009 16:09:40 +0000 (17:09 +0100)]
src/utils_db_query.[ch]: Add the possibility to `pick' queries by name.

15 years agosrc/utils_db_query.c: Add support for the `Column' configuration option.
Florian Forster [Sat, 14 Feb 2009 14:44:07 +0000 (15:44 +0100)]
src/utils_db_query.c: Add support for the `Column' configuration option.

The support has been implemented as unobtrusively as possible:

 - The `udb_result_t' type now has two new members:
   `legacy_mode' and `legacy_position'. The `legacy_mode' member is used
   to switch to a new set of functions for handling these special
   results.

 - Those ``legacy results'' use only a small subset of the members in
   `udb_result_t'. The different behavior has been put in the following
   functions:
     udb_legacy_result_finish_result
     udb_legacy_result_handle_result
     udb_legacy_result_prepare_result
     udb_legacy_result_create

 - The non-legacy counterparts to finish, handle, and prepare
   automatically call the legacy version if the `legacy_mode' member is
   set to `1'.

WARNING: Untested code, the PostgreSQL plugin still needs to be ported.

15 years agosrc/utils_db_query.[ch]: Introduces a ``legacy mode''.
Florian Forster [Sat, 14 Feb 2009 13:04:02 +0000 (14:04 +0100)]
src/utils_db_query.[ch]: Introduces a ``legacy mode''.

When passing `1' as `legacy mode' to `udb_query_create', compatibility
with the postgresql plugin in version 4.5 is enabled. This means that
the options `Query', `MinPGVersion' and `MaxPGVersion' are understood in
the <Query> blocks.

Yet to do is support for the `Column' options. The `Param' option should
probably be implemented using the already existing callback function.

15 years agotail plugin: Fix a format string for a size_t.
Florian Forster [Sat, 14 Feb 2009 13:13:00 +0000 (14:13 +0100)]
tail plugin: Fix a format string for a size_t.

Probably a result of f50ada19.

15 years agoFixed various signedness issues identified by -Wextra.
Sebastian Harl [Wed, 11 Feb 2009 10:31:30 +0000 (11:31 +0100)]
Fixed various signedness issues identified by -Wextra.

The following two issues have been addressed:

 * comparison between signed and unsigned - this was found in several places
   throughout the code and has been fixed by switching to more appropriate
   types or adding appropriate explicit casts.
 * comparison of unsigned expression < 0 is always false - this was found in
   the processes and vserver plugins where a size_t had wrongly been used
   instead of a ssize_t and an int respectively.

15 years agoDocument unused parameters.
Sebastian Harl [Wed, 11 Feb 2009 09:43:25 +0000 (10:43 +0100)]
Document unused parameters.

In all cases where unused parameters have to exist either because some API
requires it or for more consistency, they now have been documented using
__attribute__((unused)) (which is automatically disabled in case GCC is not
used to prevent problems with compilers not supporting attributes). In a few
other cases, the parameters have been removed.

This allows the use of -Wunused-parameter (which is enabled by -Wextra as
well, when using -Wall).

15 years agocontrib/php-collection: Save/load graph list and fix HTTPS handling.
Bruno Prémont [Tue, 10 Feb 2009 20:38:23 +0000 (21:38 +0100)]
contrib/php-collection: Save/load graph list and fix HTTPS handling.

Hi,

An update to the graphing interface. (incremental patch attached)

This fixes security complaint by a few browsers when page is accessed
via HTTPS and also makes sure the graphs and lists will load if HTTP
and HTTPS paths differ.
Thanks to Mullet- for spotting this issue.

In addition to the fix above this patch adds support for saving
current graph list to a cookie and appending graph list read from
cookie to the currently displayed list.

A future extension would be to allow saving/loading named graph lists
so multiple list can coexist (pretty useful when monitoring multiple
servers/services)

Bruno

15 years agocontrib/php-collection: Add a PHP frontend for graph generation.
Bruno Prémont [Tue, 10 Feb 2009 20:35:44 +0000 (21:35 +0100)]
contrib/php-collection: Add a PHP frontend for graph generation.

Hi,

Attached is a patch with a set of PHP files for a complete graphing
environment for collectd-generated RRDs.
Before generating a graph with rrdtool it can tell collectd to flush
the RRDs that are about to be used.

The interface is built with dynamic HTML.
It provides following options:
 - host selection
 -> plugin selection
 --> plugin instance selection
 ---> type selection
 ----> type instance selection (or meta graph)
 - linear / logarithmic Y-scale
 - verbose / minimal legend
 - [Add Graph] [Remove all Graphs] [Refresh Graphs]
For each displayed graph:
 - Move above previous graph
 - Refresh graph
 - Remove graph
 - Move below following graph

I tested on following browsers:
- Firefox-3.0
- Safari-3.2 (Win32)
- Konqueror (KDE-4.1.3)
- Webkit (webkit-gtk-0_p40220)
- Internet Explorer (6, 7, 8rc - CSS layout issues with <8)

Dependencies:
- PHP-5 (might run with PHP-4)
  > GD suport for error images
  > Ability to execute rrdtool binary
  > Unix socket for FLUSH support
- RRDTool (rrdtool graph, rrdtool info)

TODO: complete/improve graph definitions in definitions.php
 though there is code to generate basic graph for any RRD of
 unknown type, so definitions are rather a matter of color,
 DS combination and stacking.

Bruno

File listing with short description:
- config.php
  (configuration)
- functions.php
  (common functions)
- definitions.php
  (graph definitions for most? types from types.db
   - based on collection.cgi)
- definitions.local.php
  (place for site-local graph definitions, e.g. for
   unixsock, tail, snmp generated RRDs)
- index.php
  (main page)
- graph.php
  (page returning the graph's PNG image)
- browser.js
  (whole bunch of Javascript logic to show/hide/update graphs)

Not included are a few images:
- collectd-logo.png
  (16x16, e.g. use collectd.org's favicon)
- favicon.png
  (e.g. use the one in share/collection*)
- refresh.png
- move-up.png
- move-down.png
- delete.png
  (16x16 take matching ones from your system's action-icons)

15 years agoperl plugin, configure: Check for struct mgvtbl.svt_local.
Sebastian Harl [Tue, 10 Feb 2009 20:31:17 +0000 (21:31 +0100)]
perl plugin, configure: Check for struct mgvtbl.svt_local.

This member has been introduced in Perl 5.10 (I guess). To be able to
correctly (statically) initialize the magic tables used to access global
variables, we now check for its existence and then initialize the structs
accordingly.

15 years agoperl plugin / Collectd.pm: Export plugin_write() to Perl.
Sebastian Harl [Mon, 9 Feb 2009 20:07:31 +0000 (21:07 +0100)]
perl plugin / Collectd.pm: Export plugin_write() to Perl.

plugin_write() accepts, just like the C counterpart, three arguments,
'plugins', 'datasets' and 'valuelists'. In contrast to the C implementation,
all three arguments may either be a single scalar or a reference to an array -
just like the 'plugins' and 'identifiers' arguments of the Perl implementation
of plugin_flush().

15 years agoperl plugin: Don't do any type conversion in pplugin_dispatch_notification().
Sebastian Harl [Mon, 9 Feb 2009 18:20:13 +0000 (19:20 +0100)]
perl plugin: Don't do any type conversion in pplugin_dispatch_notification().

The conversion of the hash value to a notification_t object has been moved
into its own separate function.

15 years agoperl plugin: Don't do any type conversion in pplugin_register_data_set().
Sebastian Harl [Mon, 9 Feb 2009 18:05:29 +0000 (19:05 +0100)]
perl plugin: Don't do any type conversion in pplugin_register_data_set().

The conversion of the array value to a data_set_t object has been moved into
its own separate function.

15 years agoperl plugin: Don't do any type conversion in pplugin_dispatch_values().
Sebastian Harl [Mon, 9 Feb 2009 17:48:33 +0000 (18:48 +0100)]
perl plugin: Don't do any type conversion in pplugin_dispatch_values().

The conversion of the hash value to a value_list_t object has been moved into
its own separate function.

15 years agosrc/plugin.h: Fixed some minor typos.
Sebastian Harl [Mon, 9 Feb 2009 16:54:05 +0000 (17:54 +0100)]
src/plugin.h: Fixed some minor typos.

15 years agocpu plugin: Report interrupt separately when using sysctlbyname.
Florian Forster [Sun, 8 Feb 2009 14:36:58 +0000 (15:36 +0100)]
cpu plugin: Report interrupt separately when using sysctlbyname.

15 years agobuild.sh: Fix the check for libtoolize vs. glibtoolize.
Florian Forster [Sat, 7 Feb 2009 09:27:08 +0000 (10:27 +0100)]
build.sh: Fix the check for libtoolize vs. glibtoolize.

The `which' command under Mac OS X exits with status 0 even if the program
wasn't found. Use
  libtoolize --version
to check for the program instead..

15 years agocollectd.conf(5): Document the curl plugin properly.
Florian Forster [Fri, 6 Feb 2009 15:55:15 +0000 (16:55 +0100)]
collectd.conf(5): Document the curl plugin properly.

15 years agocurl plugin: Enable the `Verify{Peer,Host}' options by default.
Florian Forster [Fri, 6 Feb 2009 15:53:49 +0000 (16:53 +0100)]
curl plugin: Enable the `Verify{Peer,Host}' options by default.

So the curl plugin behaves just like the apache plugin in this respect.

15 years agoconfigure.in: Sort plugins and libraries alphabetically.
Florian Forster [Fri, 6 Feb 2009 15:28:24 +0000 (16:28 +0100)]
configure.in: Sort plugins and libraries alphabetically.

15 years agocurl plugin: Add a generic plugin to retrieve and parse web pages.
Florian Forster [Fri, 6 Feb 2009 15:27:02 +0000 (16:27 +0100)]
curl plugin: Add a generic plugin to retrieve and parse web pages.

15 years agoMerge branch 'master' of octo@verplant.org:/var/lib/git/collectd
Florian Forster [Thu, 5 Feb 2009 21:54:40 +0000 (22:54 +0100)]
Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd

15 years agoMerge branch 'ff/local'
Florian Forster [Thu, 5 Feb 2009 21:54:24 +0000 (22:54 +0100)]
Merge branch 'ff/local'

15 years agocontrib/collection.cgi: Add graph definition for libvirt/virt_cpu_total
John Leach [Thu, 5 Feb 2009 21:40:41 +0000 (22:40 +0100)]
contrib/collection.cgi: Add graph definition for libvirt/virt_cpu_total

15 years agosrc/utils_threshold.c: Properly document the `ut_check_interesting' function.
Florian Forster [Thu, 5 Feb 2009 21:38:52 +0000 (22:38 +0100)]
src/utils_threshold.c: Properly document the `ut_check_interesting' function.

15 years agopostgresql plugin: Updated copyright information.
Sebastian Harl [Thu, 5 Feb 2009 20:33:33 +0000 (21:33 +0100)]
postgresql plugin: Updated copyright information.

;-)

15 years agosrc/plugin.[ch]: Removed obsolete plugin_{un,}register_filter().
Sebastian Harl [Thu, 5 Feb 2009 20:05:01 +0000 (21:05 +0100)]
src/plugin.[ch]: Removed obsolete plugin_{un,}register_filter().

These have been superseded by the advanced filter mechanism. Also, the
FILTER_* defines have been removed.

15 years agoLet plugin_dispatch_values() set value_list.time in case of 'now'.
Sebastian Harl [Tue, 3 Feb 2009 13:08:32 +0000 (14:08 +0100)]
Let plugin_dispatch_values() set value_list.time in case of 'now'.

Basically any (read) plugin was calling time(NULL) to set the time of a values
list. This is now done by plugin_dispatch_values() in case the time is zero
(which is the case when using VALUE_LIST_INIT or VALUE_LIST_STATIC).

This change slightly simplifies the code and makes future changes to the time
management (like the possibly upcoming subsecond resolution support) less
intrusive in respect to the amount of required code changes.

15 years agoConverted timeval_sub_timespec() to timeval_cmp().
Sebastian Harl [Tue, 3 Feb 2009 12:05:21 +0000 (13:05 +0100)]
Converted timeval_sub_timespec() to timeval_cmp().

The third (return) argument is now of type 'struct timeval' (instead of
'struct timespec') as well. Also, it may now be NULL, in which case the
difference is not returned. This is a more general and thus more flexible
approach that permitted to remove the custom timeval_sub*() implementations in
the multimeter and ntpd plugins.

The return value has been changed to reflect the return value used by
functions like strcmp(), i.e. it is less than, equal to, or greater than zero
if the first argument is less than, equal to, or greater than the second
argument respectively.

In the cases where a 'struct timespec' is required, the return value is now
converted by multiplying the tv_usec member with 1000.

15 years agoconfigure: Do not conditionally use AM_CONDITIONAL().
Sebastian Harl [Tue, 3 Feb 2009 11:49:01 +0000 (12:49 +0100)]
configure: Do not conditionally use AM_CONDITIONAL().

Defining HAVE_BROKEN_PERL_LOAD_MODULE was done conditionally which would cause
configure to fail in case it's not defined.

15 years agocollectd-exec(5): Fixed a typo.
Sebastian Harl [Tue, 3 Feb 2009 10:41:50 +0000 (11:41 +0100)]
collectd-exec(5): Fixed a typo.

15 years agocollectd.conf(5): Explain the traffic collected by the vserver plugin.
Sebastian Harl [Mon, 2 Feb 2009 14:21:42 +0000 (15:21 +0100)]
collectd.conf(5): Explain the traffic collected by the vserver plugin.

The plugin collects the amount of traffic passing a socket instead of the
actual on-wire traffic.

Thanks to cedric for reporting this.

Resolves: #40

15 years agocollectd.conf(5): Added a note about rotating log files.
Sebastian Harl [Mon, 2 Feb 2009 13:53:12 +0000 (14:53 +0100)]
collectd.conf(5): Added a note about rotating log files.

References: #39

15 years ago.gitignore: Added src/libcollectdclient/libcollectdclient.pc.
Sebastian Harl [Mon, 2 Feb 2009 13:12:15 +0000 (14:12 +0100)]
.gitignore: Added src/libcollectdclient/libcollectdclient.pc.

Also, removed some unnecessary entries.

15 years agobuild system: Check for and work-around broken Perl_load_module().
Sebastian Harl [Mon, 2 Feb 2009 11:28:43 +0000 (11:28 +0000)]
build system: Check for and work-around broken Perl_load_module().

Configure now checks for a broken Perl_load_module() definition as introduced
in Perl 5.10 which incorrectly uses __attribute__nonnull__(3). If that has been
detected, the perl plugin will now be built using -Wno-nonnull, thus ignoring
the warning / error produced by the nonnull attribute.

References: #41
Resolves: #42

15 years agosrc/utils_db_query.[ch]: Allow a callback function to be passed to udb_query_create.
Florian Forster [Thu, 5 Feb 2009 19:21:20 +0000 (20:21 +0100)]
src/utils_db_query.[ch]: Allow a callback function to be passed to udb_query_create.

This allows plugins to handle custom options in the <Query> blocks.

15 years agofilter_ignore: Remove this plugin.
Florian Forster [Thu, 5 Feb 2009 18:15:47 +0000 (19:15 +0100)]
filter_ignore: Remove this plugin.

The functionality is now implemented in the more general chain mechanism.

15 years agoAUTHORS: Add many people I forgot to add over the last months.
Florian Forster [Wed, 4 Feb 2009 22:32:56 +0000 (23:32 +0100)]
AUTHORS: Add many people I forgot to add over the last months.

I think I got everybody covered. I definitely checked all post-4.5
commits.

15 years agoipmi plugin: Improve error handling and handle a temporary error condition more grace...
Bruno Prémont [Wed, 4 Feb 2009 22:06:06 +0000 (23:06 +0100)]
ipmi plugin: Improve error handling and handle a temporary error condition more gracefully.

On a server IPMI readings suddenly failed causing the plugin to stop
collecting data.
The following entries got logged:

ipmi plugin: sensor_read_handler: Removing sensor Temp 7 processor (3.6), because it failed with status 0x10000d5.
ipmi plugin: sensor_read_handler: Removing sensor Temp 6 processor (3.5), because it failed with status 0x10000d5.
ipmi plugin: sensor_read_handler: Removing sensor Temp 5 power_supply (10.5), because it failed with status 0x10000d5.
ipmi plugin: sensor_read_handler: Removing sensor Temp 4 processor (3.4), because it failed with status 0x10000d5.
ipmi plugin: sensor_read_handler: Removing sensor Temp 3 processor (3.3), because it failed with status 0x10000d5.
ipmi plugin: sensor_read_handler: Removing sensor Temp 2 external_environment (39.1), because it failed with status 0x10000d5.
ipmi plugin: sensor_read_handler: Removing sensor Temp 1 system_internal_expansion_board (16.1), because it failed with status 0x10000d5.

This patch attempts to provide slightly better error message and just
skip current reading iteration if the error
IPMI_NOT_SUPPORTED_IN_PRESENT_STATE_CC is indicated.

This error happens e.g. when iLo firmware is upgraded (or reboots?) on
HP servers.

15 years agocollectd.conf(5): Fix a typo.
Florian Forster [Wed, 4 Feb 2009 16:54:14 +0000 (17:54 +0100)]
collectd.conf(5): Fix a typo.

15 years agocollectd.conf(5): Documented the `{Pre,Post}CacheChain' options.
Florian Forster [Wed, 4 Feb 2009 16:48:09 +0000 (17:48 +0100)]
collectd.conf(5): Documented the `{Pre,Post}CacheChain' options.

15 years agosrc/plugin.c: If the pre-cache chain returns `stop', dont update the cache.
Florian Forster [Wed, 4 Feb 2009 16:47:41 +0000 (17:47 +0100)]
src/plugin.c: If the pre-cache chain returns `stop', dont update the cache.

Don't run the post-cache chain, either.

15 years agosrc/plugin.c: Add the `{Pre,Post}CacheChain' options and appropriate chains.
Florian Forster [Wed, 4 Feb 2009 13:29:45 +0000 (14:29 +0100)]
src/plugin.c: Add the `{Pre,Post}CacheChain' options and appropriate chains.

The PreCacheChain is executed before the values are added to the cache, the
PostCacheChain afterwards. If no post-cache chain is given, values will be
dispatched to all write plugins by default.

15 years agocollectd.conf(5): Document the `{Min,Max}Version' options of the dbi plugin.
Florian Forster [Wed, 4 Feb 2009 08:51:26 +0000 (09:51 +0100)]
collectd.conf(5): Document the `{Min,Max}Version' options of the dbi plugin.

15 years agosrc/utils_db_query.c: Implement the (deprecated) `{Min,Max}PGVersion' options.
Florian Forster [Wed, 4 Feb 2009 08:32:34 +0000 (09:32 +0100)]
src/utils_db_query.c: Implement the (deprecated) `{Min,Max}PGVersion' options.

This is for compatibility with old configuration of the postgresql plugin.

15 years agodbi plugin: Use the server version to only use appropriate queries.
Florian Forster [Tue, 3 Feb 2009 20:35:01 +0000 (21:35 +0100)]
dbi plugin: Use the server version to only use appropriate queries.

15 years agosrc/utils_db_query.[ch]: Add support for min-/max-version.
Florian Forster [Tue, 3 Feb 2009 20:34:36 +0000 (21:34 +0100)]
src/utils_db_query.[ch]: Add support for min-/max-version.

These settings can be used to check if a particular query is suited to the
database server version we're currently connected to.

15 years agooracle plugin: Use the DB query module.
Florian Forster [Mon, 2 Feb 2009 21:26:41 +0000 (22:26 +0100)]
oracle plugin: Use the DB query module.

This simplifies the oracle plugin considerably.

15 years agosrc/utils_db_query.c: When asked for the user data, return the user data.
Florian Forster [Mon, 2 Feb 2009 20:57:08 +0000 (21:57 +0100)]
src/utils_db_query.c: When asked for the user data, return the user data.

Appreciate this patch, it cost me one fucking hour of my live!

15 years agodbi plugin: Put the row handling logic in an extra module.
Florian Forster [Mon, 2 Feb 2009 17:40:11 +0000 (18:40 +0100)]
dbi plugin: Put the row handling logic in an extra module.

The `utils_db_query' module now handles config parsing and row handling.
This unifies basically all of the <Query> blocks, so that the `dbi' and
`oracle' plugins behave exactly alike. Porting the `postgresql' plugin
should be possible, too, so that all three database plugins are in line.

15 years agocollectd.conf: Updated the example postgresql plugin configuration.
Sebastian Harl [Sun, 1 Feb 2009 22:42:45 +0000 (23:42 +0100)]
collectd.conf: Updated the example postgresql plugin configuration.

15 years agodbi plugin: Fixed error handling in an inner loop.
Sebastian Harl [Sun, 1 Feb 2009 22:24:54 +0000 (23:24 +0100)]
dbi plugin: Fixed error handling in an inner loop.

The macro BAIL_OUT_CONTINUE() is used inside the loop iterating over the
result sets to clean up and continue with the next loop iteration. In two
cases this was used in a loop iterating over the instances and values lists
contained within that loop as well though. This would cause the memory that
was currently written to (the two target lists) to be freed and thus cause a
possible segfault. In any case it would leave behind inconsistent and most
probably uninitialized data. The usage of that macro has now been pulled out
of the inner loops.

15 years agopostgresql plugin: Added support for the "interval" parameter.
Sebastian Harl [Sun, 1 Feb 2009 22:09:08 +0000 (23:09 +0100)]
postgresql plugin: Added support for the "interval" parameter.

This query parameter expands to the interval collectd is using.

15 years agopostgresql plugin: Added support for <Result> blocks.
Sebastian Harl [Sun, 1 Feb 2009 21:48:01 +0000 (22:48 +0100)]
postgresql plugin: Added support for <Result> blocks.

This is a replacement for the "Column" config option (which has been
deprecated). <Result> blocks allow for much more flexible handling of the
data. Besides being able to use data types with multiple data sources, the
plugin now supports to generate the type instance using information from the
database.

An example <Result> block might look like this (taken from the manpage):

  <Result>
    Type counter
    InstancePrefix "rt36_tickets"
    InstancesFrom "type"
    ValuesFrom "count"
  </Result>

15 years agopostgresql plugin: Reinitialize a database after reconnecting.
Sebastian Harl [Sun, 1 Feb 2009 16:37:52 +0000 (17:37 +0100)]
postgresql plugin: Reinitialize a database after reconnecting.

During initialization we get the right version of each query definition. After
reconnecting, the PostgreSQL server version might have changed, so we might
need to update some of the query definitions.

15 years agoutils_complain: Added macro c_would_release().
Sebastian Harl [Sun, 1 Feb 2009 16:36:25 +0000 (17:36 +0100)]
utils_complain: Added macro c_would_release().

This macro returns true if the specified complaint would be released, false
else. This is useful e.g. to do further actions when releasing a complaint.

15 years agosrc/collectd.conf.in: Add default stuff for the oracle and openvpn plugins.
Florian Forster [Sun, 1 Feb 2009 17:26:34 +0000 (18:26 +0100)]
src/collectd.conf.in: Add default stuff for the oracle and openvpn plugins.

15 years agooracle plugin: Add <Result> blocks.
Florian Forster [Sun, 1 Feb 2009 17:26:05 +0000 (18:26 +0100)]
oracle plugin: Add <Result> blocks.

With these blocks it's possible to receive more than one value (per row)
from one SQL statement.

15 years agocsv plugin: Make the output to STDOUT compatible to the exec plugin.
Florian Forster [Sun, 1 Feb 2009 14:46:27 +0000 (15:46 +0100)]
csv plugin: Make the output to STDOUT compatible to the exec plugin.

Probably not that useful, but the output written to STDOUT by the csv
plugin is not in the form accepted by the exec plugin. This makes some
potentially interesting hacks possible ;)

15 years agodbi plugin: Add <Result> blocks.
Florian Forster [Sun, 1 Feb 2009 14:43:53 +0000 (15:43 +0100)]
dbi plugin: Add <Result> blocks.

With these blocks it's possible to receive more than one value (per row)
from one SQL statement.

15 years agolibcollectdclient: Add a .pc file for pkg-config.
Florian Forster [Sun, 1 Feb 2009 10:46:03 +0000 (11:46 +0100)]
libcollectdclient: Add a .pc file for pkg-config.

15 years agoprocesses plugin: Fix the ARG_MAX stuff yet again.
Florian Forster [Sat, 31 Jan 2009 23:32:12 +0000 (00:32 +0100)]
processes plugin: Fix the ARG_MAX stuff yet again.

The `sysconf' approach does not work when doing something like
  char cmdline[ARG_MAX];
which is exactly what was done in the processes plugin.

Just use 4k whenever the define is not available - ought to be enough
for anybody! ;)

15 years agoprocesses plugin: Make sure ARG_MAX is defined.
Florian Forster [Sat, 31 Jan 2009 22:55:30 +0000 (23:55 +0100)]
processes plugin: Make sure ARG_MAX is defined.

Apparently the GNU libc 2.8 removed the macro for some unholy reason. We
either use `sysconf(3)' transparently (if available) or 4kByte (the
POSIX minimum).

Thanks to dD0T for reporting the problem :)

15 years agolibcollectdclient: Fix the SSTRCAT macro.
Florian Forster [Sat, 31 Jan 2009 22:28:21 +0000 (23:28 +0100)]
libcollectdclient: Fix the SSTRCAT macro.

The size passed to `strncat' is not the total size of the buffer, so GCC
with _FORTIFY_SOURCE rightfully complained about this macro.

Thanks to dD0T for reporting this :)

15 years agopostgresql plugin: Renamed the "Query" config option to "Statement".
Sebastian Harl [Thu, 29 Jan 2009 16:17:55 +0000 (17:17 +0100)]
postgresql plugin: Renamed the "Query" config option to "Statement".

This makes slightly more sense and is more consistent with the dbi and oracle
plugins.

15 years agoMerge branch 'collectd-4.4' of /var/lib/git/collectd into collectd-4.4
Florian Forster [Thu, 29 Jan 2009 15:48:18 +0000 (16:48 +0100)]
Merge branch 'collectd-4.4' of /var/lib/git/collectd into collectd-4.4

15 years agobuild system: Check for the libupsclient library using pkg-config *and* a custom...
Florian Forster [Thu, 29 Jan 2009 15:47:04 +0000 (16:47 +0100)]
build system: Check for the libupsclient library using pkg-config *and* a custom script.

References: #24

15 years agoCollectd::Graph::Common.pm: Include Collectd::Unixsock.
Sebastian Harl [Wed, 21 Jan 2009 14:43:45 +0000 (15:43 +0100)]
Collectd::Graph::Common.pm: Include Collectd::Unixsock.

This module is required to send the "FLUSH" command to collectd using the UNIX
domain socket provided by the "unixsock" plugin.

15 years agoMerge branch 'collectd-4.5'
Florian Forster [Sat, 24 Jan 2009 10:04:31 +0000 (11:04 +0100)]
Merge branch 'collectd-4.5'

15 years agoMerge branch 'collectd-4.4' into collectd-4.5
Florian Forster [Sat, 24 Jan 2009 10:04:22 +0000 (11:04 +0100)]
Merge branch 'collectd-4.4' into collectd-4.5

15 years agotcpconns plugin: Fix an endianness problem under *BSD.
Florian Forster [Sat, 24 Jan 2009 10:00:30 +0000 (11:00 +0100)]
tcpconns plugin: Fix an endianness problem under *BSD.

The port numbers were assumed to be in the host's byte order, when in
fact they are in network byte order (big endian). The patch adds `ntohs'
where necessary to fix this problem.

Resolves: #35

15 years agosrc/utils_rrdcreate.c: Fix support for non-threadsafe libraries.
Florian Forster [Thu, 22 Jan 2009 09:08:48 +0000 (10:08 +0100)]
src/utils_rrdcreate.c: Fix support for non-threadsafe libraries.

15 years agocollectd.conf(5): Add some preliminary documentation for the bind plugin.
Florian Forster [Thu, 22 Jan 2009 09:07:49 +0000 (10:07 +0100)]
collectd.conf(5): Add some preliminary documentation for the bind plugin.

15 years agoMerge branch 'bp/bind'
Florian Forster [Thu, 22 Jan 2009 08:09:18 +0000 (09:09 +0100)]
Merge branch 'bp/bind'