Florian Forster [Sun, 4 Oct 2009 07:06:18 +0000 (09:06 +0200)]
Bumped version to 4.8.1; Updated ChangeLog.
Florian Forster [Sun, 4 Oct 2009 07:02:31 +0000 (09:02 +0200)]
Merge branch 'collectd-4.7' into collectd-4.8
Conflicts:
ChangeLog
version-gen.sh
Florian Forster [Sat, 3 Oct 2009 15:44:24 +0000 (17:44 +0200)]
Bumped version to 4.7.4; Updated ChangeLog.
Florian Forster [Fri, 2 Oct 2009 16:02:08 +0000 (18:02 +0200)]
contrib/collection3: Improve configuration for "df_complex".
Florian Forster [Fri, 2 Oct 2009 16:01:38 +0000 (18:01 +0200)]
Various plugins: Use the IS_TRUE and IS_FALSE macros everywhere.
Florian Forster [Fri, 2 Oct 2009 09:37:05 +0000 (11:37 +0200)]
contextswitches, processes plugins: Don't print an error if number of fields don't match.
Because we pick the required line further down, having lines with more
fields is not illegal anymore.
Thanks to Patrik Weiskircher for noticing :)
Florian Forster [Fri, 2 Oct 2009 09:35:43 +0000 (11:35 +0200)]
df plugin: Implement the "ReportInodes" option.
This option can be used to enable / disable inode statistics collection.
Defaults to "false" for now.
Florian Forster [Fri, 2 Oct 2009 09:29:44 +0000 (11:29 +0200)]
df plugin: Implement the "ReportReserved" option.
When enabled, the reserved space is reported separately. The "df_complex"
type is used and the mount point or device name is used as plugin instance
(as it should be) instead of the type instance (which is now needed for
"free", "reserved" and "used").
The INode handling has been split up in the same manner.
Florian Forster [Fri, 2 Oct 2009 07:56:54 +0000 (09:56 +0200)]
AUTHORS: Added Patrik.
Florian Forster [Fri, 2 Oct 2009 07:55:17 +0000 (09:55 +0200)]
README: Added the contextswitch plugin.
Florian Forster [Fri, 2 Oct 2009 07:54:14 +0000 (09:54 +0200)]
Merge branch 'collectd-4.8'
Conflicts:
src/df.c
Florian Forster [Fri, 2 Oct 2009 07:50:20 +0000 (09:50 +0200)]
Merge branch 'collectd-4.7' into collectd-4.8
Conflicts:
README
Florian Forster [Fri, 2 Oct 2009 07:47:54 +0000 (09:47 +0200)]
README: Fix order of the curl_json plugin in the list.
Florian Forster [Fri, 2 Oct 2009 07:47:54 +0000 (09:47 +0200)]
README: Fix order of the curl plugin in the list.
Florian Forster [Fri, 2 Oct 2009 07:44:27 +0000 (09:44 +0200)]
contextswitch plugin: Only submit if we actually did find a value.
Also makes parsing more robust (strncmp would allow for garbage after the key,
strtoul does not overflow when given an invalid string).
Florian Forster [Fri, 2 Oct 2009 07:40:49 +0000 (09:40 +0200)]
processes plugin: Don't *abort* if a line has more than two fields.
Patrik Weiskircher [Thu, 1 Oct 2009 11:57:12 +0000 (13:57 +0200)]
Added contextswitch plugin (for linux).
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Fri, 2 Oct 2009 07:06:41 +0000 (09:06 +0200)]
processes plugin: Improve the error handling.
The fork-rate function now returns ULONG_MAX upon error. The error detection
when using strtoul has been improved (overflow is not the only possible error).
Patrik Weiskircher [Thu, 1 Oct 2009 11:57:11 +0000 (13:57 +0200)]
Added fork rate collecting to processes plugin.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Fri, 2 Oct 2009 06:27:44 +0000 (08:27 +0200)]
df plugin: Fix a typo.
Patrik Weiskircher [Thu, 1 Oct 2009 11:57:10 +0000 (13:57 +0200)]
df plugin also collects inode count now.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Thu, 1 Oct 2009 19:34:21 +0000 (21:34 +0200)]
Merge branch 'collectd-4.8'
Conflicts:
src/types.db
Florian Forster [Thu, 1 Oct 2009 19:33:37 +0000 (21:33 +0200)]
Merge branch 'collectd-4.7' into collectd-4.8
Florian Forster [Thu, 1 Oct 2009 19:30:53 +0000 (21:30 +0200)]
src/types.db: Replace spaces with tabs.
Florian Forster [Thu, 1 Oct 2009 19:30:53 +0000 (21:30 +0200)]
src/types.db: Replace spaces with tabs.
Florian Forster [Thu, 1 Oct 2009 19:27:40 +0000 (21:27 +0200)]
src/plugin.c: plugin_log: Print to stderr if no log plugin has been loaded.
Sven Trenkel [Thu, 1 Oct 2009 11:25:17 +0000 (13:25 +0200)]
Merge commit 'octo/master'
Sven Trenkel [Thu, 1 Oct 2009 11:24:20 +0000 (13:24 +0200)]
Added new netapp data types to types.db.
Sven Trenkel [Thu, 1 Oct 2009 11:20:53 +0000 (13:20 +0200)]
Added new netapp data types to types.db.
Doug MacEachern [Thu, 1 Oct 2009 00:28:08 +0000 (17:28 -0700)]
include netinet/in.h for sockaddr_in on FreeBSD
Fixes:
common.c: In function 'service_name_to_port_number':
common.c:1112: error: dereferencing pointer to incomplete type
common.c:1119: error: dereferencing pointer to incomplete type
Florian Forster [Wed, 30 Sep 2009 20:49:16 +0000 (22:49 +0200)]
unixsock plugin: Fix a (well hidden) race condition.
Within the client handling thread, fdopen is called twice on the file
descriptor passed to the thread. Later those file handles are closed like:
fclose (fhin);
fclose (fhout);
This is a race condition, because the first call to fclose will close the file
descriptor. The second call to fclose will try the same. Usually, it would fail
silently and all is well. On a busy machine, however, another thread may just
have opened a file or accepted a socket. In that case an arbitrary file
descriptor is closed. If the file descriptor is opened yet again fast enough,
data may even end up in a totally wrong location.
As a work-around the file descriptor is not dup'ed so each fdopen operates on
its own file descriptor. As an alternative the "r+" mode and a single file
handle may be suitable, too.
Many thanks to Sven Trenkel for pointing me into the right directioin :)
Florian Forster [Wed, 30 Sep 2009 16:20:32 +0000 (18:20 +0200)]
Merge branch 'st/netapp'
Florian Forster [Wed, 30 Sep 2009 16:16:15 +0000 (18:16 +0200)]
netapp plugin: Subtract snap_norm_used from norm_used in any case.
Florian Forster [Wed, 30 Sep 2009 15:51:17 +0000 (17:51 +0200)]
collectd.conf(5): Updated the “GetSnapshot” entry.
Florian Forster [Wed, 30 Sep 2009 15:49:54 +0000 (17:49 +0200)]
netapp plugin: Use the “volume-” prefix for all volume related data.
Florian Forster [Wed, 30 Sep 2009 13:30:07 +0000 (15:30 +0200)]
netapp plugin: Create a notification when a volume goes offline or comes back.
Florian Forster [Wed, 30 Sep 2009 13:29:30 +0000 (15:29 +0200)]
netapp plugin: cna_handle_volume_snap_usage: Explain what's going on in a comment.
Sven Trenkel [Wed, 30 Sep 2009 12:13:44 +0000 (14:13 +0200)]
Fixed VolumePerf data collection.
Sven Trenkel [Wed, 30 Sep 2009 10:17:55 +0000 (12:17 +0200)]
Merge commit 'remotes/octo/st/netapp' into st/netapp
Sven Trenkel [Wed, 30 Sep 2009 10:17:39 +0000 (12:17 +0200)]
Added snapshot usage stats.
Florian Forster [Wed, 30 Sep 2009 08:59:30 +0000 (10:59 +0200)]
Build system: Link the netapp plugin with libnetapp.
D'oh! ;)
Florian Forster [Wed, 30 Sep 2009 06:11:10 +0000 (08:11 +0200)]
netapp plugin: Don't access a struct after freeing it.
Thanks Sven :)
Florian Forster [Tue, 29 Sep 2009 14:51:45 +0000 (16:51 +0200)]
netapp plugin: Add a shutdown callback.
Florian Forster [Tue, 29 Sep 2009 14:50:22 +0000 (16:50 +0200)]
netapp plugin: free_host_config: Close the connection if applicable.
Florian Forster [Tue, 29 Sep 2009 14:44:49 +0000 (16:44 +0200)]
collectd.conf(5): Document the “Interval” option in all blocks of the netapp plugin.
Florian Forster [Tue, 29 Sep 2009 14:37:48 +0000 (16:37 +0200)]
netapp plugin: Rename the “Capacity” and “Snapshot” options again.
They've been renamed to “GetCapacity” and “GetSnapshot” so the
names used within the “VolumeUsage” block are the same as the names
used elsewhere in the plugin.
Florian Forster [Tue, 29 Sep 2009 14:31:35 +0000 (16:31 +0200)]
netapp plugin: Remove left-over references to volume_t.
Florian Forster [Tue, 29 Sep 2009 14:29:30 +0000 (16:29 +0200)]
netapp plugin: Remove all left-over references to cfg_service_t.
Florian Forster [Tue, 29 Sep 2009 14:24:40 +0000 (16:24 +0200)]
netapp plugin: Refactor the VolumePerf collection.
Same procedure one last time. The “GetVolumePerfData” block has been
renamed to “VolumePerf”. The “Get{IO,Ops,Latency}” options now
use ignore lists, too. Appropriate “IgnoreSelected{IO,Ops,Latency}”
options have been introduced.
Florian Forster [Tue, 29 Sep 2009 13:53:12 +0000 (15:53 +0200)]
netapp plugin: Set the HAVE_VOLUME_USAGE_SIS_SAVED after determining the value.
Florian Forster [Tue, 29 Sep 2009 13:51:07 +0000 (15:51 +0200)]
netapp plugin: Fix handling of the SIS value.
Florian Forster [Tue, 29 Sep 2009 12:33:15 +0000 (14:33 +0200)]
netapp plugin: Refactored volume usage statistics.
Much of this is like disk, wafl and system statistics before. The
“GetVolumeData” has been renamed to “VolumeUsage” and the
“GetDiskUtil” and “GetSnapUtil” options have been changed, too. The
configuration now looks like this:
<VolumeUsage>
Capacity "vol0"
Capacity "vol1"
IgnoreSelectedCapacity false
Snapshot "vol1"
Snapshot "vol3"
IgnoreSelectedSnapshot false
</VolumeUsage>
The code now uses to "ignore lists" to check whether capacity and/or
snapshot information should be collected for a volume. This means the
order in which volumes are listed no longer matters and than you can
use such advanced options as selecting volumes via regular expressions.
Sven Trenkel [Mon, 28 Sep 2009 23:02:48 +0000 (01:02 +0200)]
Fixed NULL pointer bug.
Florian Forster [Mon, 28 Sep 2009 14:05:55 +0000 (16:05 +0200)]
netapp plugin: Inform the user when he screwed up the disk and system blocks, too.
Florian Forster [Mon, 28 Sep 2009 13:56:26 +0000 (15:56 +0200)]
netapp plugin: Print a notice if all WAFL values have been disabled.
This message is printed if the user did supply a <WAFL /> block but
then disabled all supported values. WAFL collection will be disabled
in this case to increase performance.
Florian Forster [Mon, 28 Sep 2009 13:45:13 +0000 (15:45 +0200)]
netapp plugin: Document the graceful return if statistics are not wanted.
Unfortunately this behavior isn't exactly obvious.
Florian Forster [Mon, 28 Sep 2009 13:42:42 +0000 (15:42 +0200)]
netapp plugin: Refactor system statistics.
Same procedure as before: Instead of using the “service handler”,
create a cfg_system_t pointer if the user wants system statistics. Then
call cna_query_system instead of the service handler.
The “GetSystemPerfData” block has been renamed to “System” and the
“Multiplier” option has been replaced by the “Interval” option.
Florian Forster [Mon, 28 Sep 2009 12:43:37 +0000 (14:43 +0200)]
Merge remote branch 'trenkel/st/netapp' into st/netapp
Florian Forster [Mon, 28 Sep 2009 12:41:10 +0000 (14:41 +0200)]
netapp plugin: Refactor handling of the WAFL data.
Basically the same structure as for the Disk data has been used. The
service handler has been removed and replaced by a call to
“cna_query_wafl”.
The “GetWaflPerfData” block has been renamed to “WAFL” to make the
config file easier to read. The “GetBufCache” config option has been
renamed to “GetBufferCache”. Maybe it should be renamed to
“GetBufferHash”, because that's what the NetApp API uses…?
Sven Trenkel [Mon, 28 Sep 2009 11:57:46 +0000 (13:57 +0200)]
Merge commit 'octo/st/netapp' into st/netapp
Florian Forster [Mon, 28 Sep 2009 11:27:13 +0000 (13:27 +0200)]
netapp plugin: Changed Sven's email address at his request.
Florian Forster [Mon, 28 Sep 2009 11:26:34 +0000 (13:26 +0200)]
netapp plugin: Refactored reading of disk data.
Instead of obscuring control-flow with generic function pointers, use a
clear and easy to read function hierarchy. All disk-related action now
starts with “cna_query_disk (host)” instead of
“service->handler (host, data, service->data)”.
The “GetDiskPerfData”block has been renamed to “Disks”. All those
blocks start with “Get” and most end with “PerfData”, distracting
from the actual relevant part.
The “Multiplier” option has been replaced by the “Interval” option,
which expects a time in seconds rather than a factor which is multiplied
to the host interval.
Florian Forster [Mon, 28 Sep 2009 11:14:12 +0000 (13:14 +0200)]
netapp plugin: Fix a typo.
Sven Trenkel [Mon, 28 Sep 2009 10:40:44 +0000 (12:40 +0200)]
Copypasta error in volume usage.
Florian Forster [Mon, 28 Sep 2009 09:59:59 +0000 (11:59 +0200)]
netapp plugin: cna_config_disk: Fix typo.
Sven Trenkel [Sat, 26 Sep 2009 23:39:40 +0000 (01:39 +0200)]
Preparations for collecting snapshot data,
fixed NULL pointer bug,
removed duplicate error message.
Florian Forster [Sat, 26 Sep 2009 09:27:33 +0000 (11:27 +0200)]
netapp plugin: cna_init: Add some comments.
Florian Forster [Sat, 26 Sep 2009 08:48:50 +0000 (10:48 +0200)]
libiptc: Comment out two unused static functions.
Thanks to Sven Trenkel for noticing.
Sven Trenkel [Sat, 26 Sep 2009 01:27:41 +0000 (03:27 +0200)]
Don't try to graph operations that aren't licensed
on this filer.
Doug MacEachern [Fri, 25 Sep 2009 20:25:47 +0000 (13:25 -0700)]
redirect sysctl kern.cp_times stderr > /dev/null
Doug MacEachern [Fri, 25 Sep 2009 20:03:41 +0000 (13:03 -0700)]
use kern.cp_times sysctl for FreeBSD smp support
Doug MacEachern [Fri, 25 Sep 2009 20:02:26 +0000 (13:02 -0700)]
define HAVE_SYSCTL_KERN_CP_TIMES if sysctl supports kern.cp_times
Florian Forster [Thu, 24 Sep 2009 16:03:51 +0000 (18:03 +0200)]
netapp plugin: Improved handling host <Host /> blocks.
Use the new "cf_util_get_string" and "cf_util_get_port_number" functions
and free the host configuration if it fails.
The "Login" option has been split up into the "User" and "Password" options.
Florian Forster [Thu, 24 Sep 2009 15:54:21 +0000 (17:54 +0200)]
netapp plugin: Rename set_global_{perf_,}vol_flag.
Hopefully the new names are more descriptive.
Florian Forster [Thu, 24 Sep 2009 15:38:02 +0000 (17:38 +0200)]
src/configfile.[ch]: Implement "cf_util_get_port_number".
Florian Forster [Thu, 24 Sep 2009 15:37:25 +0000 (17:37 +0200)]
tokyotyrant plugin: Remove no longer needed includes.
Florian Forster [Thu, 24 Sep 2009 15:32:29 +0000 (17:32 +0200)]
src/configfile.[ch]: Implement "cf_util_get_string".
Florian Forster [Thu, 24 Sep 2009 15:30:56 +0000 (17:30 +0200)]
src/common.[ch]: Implement "service_name_to_port_number".
It returns the numeric representation of a service name. The implementation
has been taken from the tokyotyrant plugin.
Florian Forster [Thu, 24 Sep 2009 12:47:12 +0000 (14:47 +0200)]
netapp plugin: Use the "cna_config_" prefix for configuration handling functions.
Florian Forster [Thu, 24 Sep 2009 12:36:53 +0000 (14:36 +0200)]
netapp plugin: Add a short description to most functions.
The order of some functions has been changed, too.
Florian Forster [Thu, 24 Sep 2009 12:19:19 +0000 (14:19 +0200)]
netapp plugin: Add folding markers to all remaining functions.
Florian Forster [Thu, 24 Sep 2009 12:03:53 +0000 (14:03 +0200)]
netapp plugin: Changed some type names.
The structure is roughly like this: Structs that only hold flags to tell
the functions what data to submit are prefixed with "cfg_". Structs that
hold old values for counters are prefixed with "data_".
The "disk_t" type now included flags, too, to indicate valid / invalid
values. The "query_submit_disk_data" function has been changed to honor
those flags.
Various "volume_data" stuff has been renamed to "volume_usage" to make
it more distinguishable from "volume_performance".
Various defines are now also prefixed with "CFG_" to show which flags
are used for configuration and which are used do mark counters valid.
The latter use the "HAVE_" prefix.
Florian Forster [Thu, 24 Sep 2009 10:53:32 +0000 (12:53 +0200)]
AUTHORS: Add Sven Trenkel.
Florian Forster [Thu, 24 Sep 2009 10:53:21 +0000 (12:53 +0200)]
README: Add the “netapp” plugin.
Florian Forster [Thu, 24 Sep 2009 10:48:30 +0000 (12:48 +0200)]
netapp plugin: Split up “collect_perf_wafl_data” …
… into “query_wafl_data” and “submit_wafl_data”.
Again, flags are used to keep track of valid (old) counters.
Florian Forster [Thu, 24 Sep 2009 10:09:03 +0000 (12:09 +0200)]
netapp plugin: Split “collect_perf_volume_data” …
… into “query_volume_perf_data” and “submit_volume_perf_data”. The
functions use the “per_volume_perf_data_t” struct to pass the counters
from one value to the other. The flags have been extended to include
HAVE_* flags. This way we can reliably determine whether an “old”
counter is valid or not.
Florian Forster [Thu, 24 Sep 2009 08:17:27 +0000 (10:17 +0200)]
netapp plugin: Use the "config_get_multiplier" to handle the multiplier configuration.
Florian Forster [Thu, 24 Sep 2009 08:16:42 +0000 (10:16 +0200)]
netapp plugin: process_volume_flag: Use the boolean set/unset option here, too.
Florian Forster [Thu, 24 Sep 2009 08:04:48 +0000 (10:04 +0200)]
netapp plugin: set_global_{perf_,}vol_flag: Make set/unset option a boolean.
Florian Forster [Thu, 24 Sep 2009 07:42:28 +0000 (09:42 +0200)]
netapp plugin: Make "config_init" static.
Florian Forster [Thu, 24 Sep 2009 07:42:12 +0000 (09:42 +0200)]
netapp plugin: build_perf_sys_config: Improve error handling.
Check return value of "malloc".
Florian Forster [Thu, 24 Sep 2009 07:41:27 +0000 (09:41 +0200)]
netapp plugin: Simplify handling of boolean config options.
Florian Forster [Thu, 24 Sep 2009 07:39:31 +0000 (09:39 +0200)]
netapp plugin: perf_system_data_t: Remove CPU counters.
Florian Forster [Thu, 24 Sep 2009 07:14:16 +0000 (09:14 +0200)]
netapp plugin: collect_perf_system_data: Use the submit functions.
Florian Forster [Thu, 24 Sep 2009 07:08:35 +0000 (09:08 +0200)]
netapp plugin: collect_perf_disk_data: Only query "percentage-saved" if required.
Also, add support for "sis_saved_percent == 100". Probably not useful,
but better than simply skipping that case.
Florian Forster [Wed, 23 Sep 2009 16:56:31 +0000 (18:56 +0200)]
Merge commit 'remotes/trenkel/st/netapp' into st/netapp
Florian Forster [Wed, 23 Sep 2009 16:54:15 +0000 (18:54 +0200)]
netapp plugin: collect_perf_disk_data: Add folding markers.
Florian Forster [Wed, 23 Sep 2009 16:53:44 +0000 (18:53 +0200)]
netapp plugin: collect_volume_data: Use "submit_double".
Florian Forster [Wed, 23 Sep 2009 16:51:56 +0000 (18:51 +0200)]
netapp plugin: Use UINT64_MAX as default value.
Meaning "invalid".
Florian Forster [Wed, 23 Sep 2009 16:51:08 +0000 (18:51 +0200)]
netapp plugin: Implement "submit_two_counters".