X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnetapp.c;h=c50b3dbdbcb707860d7a4658d211e844f1b3fe3a;hb=171d6a4bd5e05b56be83860701d35bfe1373d6a7;hp=aab30e58e636860e4385cc4aa536f2a506c6566a;hpb=7b83066d9ff2da83ce186399aabf209e048124db;p=collectd.git

diff --git a/src/netapp.c b/src/netapp.c
index aab30e58..c50b3dbd 100644
--- a/src/netapp.c
+++ b/src/netapp.c
@@ -29,6 +29,7 @@
 #include "utils_ignorelist.h"
 
 #include <netapp_api.h>
+#include <netapp_errno.h>
 
 #define HAS_ALL_FLAGS(has,needs) (((has) & (needs)) == (needs))
 
@@ -189,12 +190,15 @@ typedef struct {
 #define HAVE_VOLUME_USAGE_SNAP_USED     0x0080
 #define HAVE_VOLUME_USAGE_SIS_SAVED     0x0100
 #define HAVE_VOLUME_USAGE_ALL           0x01f0
+#define IS_VOLUME_USAGE_OFFLINE         0x0200
 struct data_volume_usage_s;
 typedef struct data_volume_usage_s data_volume_usage_t;
 struct data_volume_usage_s {
 	char *name;
 	uint32_t flags;
 
+	na_elem_t *snap_query;
+
 	uint64_t norm_free;
 	uint64_t norm_used;
 	uint64_t snap_reserved;
@@ -249,11 +253,6 @@ struct host_config_s {
 
 	struct host_config_s *next;
 };
-#define HOST_INIT { NULL, NA_SERVER_TRANSPORT_HTTPS, NULL, 0, NULL, NULL, 0, \
-	NULL, NULL, NULL, NULL, NULL, NULL, \
-	NULL}
-
-static host_config_t *global_host_config;
 
 /*
  * Free functions
@@ -343,6 +342,8 @@ static void free_cfg_volume_usage (cfg_volume_usage_t *cvu) /* {{{ */
 	{
 		data_volume_usage_t *next = data->next;
 		sfree (data->name);
+		if (data->snap_query != NULL)
+			na_elem_free(data->snap_query);
 		sfree (data);
 		data = next;
 	}
@@ -384,11 +385,11 @@ static void free_host_config (host_config_t *hc) /* {{{ */
 	free_cfg_volume_usage (hc->cfg_volume_usage);
 	free_cfg_system (hc->cfg_system);
 
-	sfree (hc);
-
 	if (hc->srv != NULL)
 		na_server_close (hc->srv);
 
+	sfree (hc);
+
 	free_host_config (next);
 } /* }}} void free_host_config */
 
@@ -473,8 +474,14 @@ static data_volume_usage_t *get_volume_usage (cfg_volume_usage_t *cvu, /* {{{ */
 
 	if (ignore_capacity == 0)
 		new->flags |= CFG_VOLUME_USAGE_DF;
-	if (ignore_snapshot == 0)
+	if (ignore_snapshot == 0) {
 		new->flags |= CFG_VOLUME_USAGE_SNAP;
+		new->snap_query = na_elem_new ("snapshot-list-info");
+		na_child_add_string(new->snap_query, "target-type", "volume");
+		na_child_add_string(new->snap_query, "target-name", name);
+	} else {
+		new->snap_query = NULL;
+	}
 
 	/* Add to end of list. */
 	if (last == NULL)
@@ -559,7 +566,7 @@ static int submit_values (const char *host, /* {{{ */
 		const char *plugin_inst,
 		const char *type, const char *type_inst,
 		value_t *values, int values_len,
-		time_t timestamp)
+		time_t timestamp, int interval)
 {
 	value_list_t vl = VALUE_LIST_INIT;
 
@@ -569,6 +576,9 @@ static int submit_values (const char *host, /* {{{ */
 	if (timestamp > 0)
 		vl.time = timestamp;
 
+	if (interval > 0)
+		vl.interval = interval;
+
 	if (host != NULL)
 		sstrncpy (vl.host, host, sizeof (vl.host));
 	else
@@ -585,7 +595,7 @@ static int submit_values (const char *host, /* {{{ */
 
 static int submit_two_counters (const char *host, const char *plugin_inst, /* {{{ */
 		const char *type, const char *type_inst, counter_t val0, counter_t val1,
-		time_t timestamp)
+		time_t timestamp, int interval)
 {
 	value_t values[2];
 
@@ -593,23 +603,23 @@ static int submit_two_counters (const char *host, const char *plugin_inst, /* {{
 	values[1].counter = val1;
 
 	return (submit_values (host, plugin_inst, type, type_inst,
-				values, 2, timestamp));
+				values, 2, timestamp, interval));
 } /* }}} int submit_two_counters */
 
 static int submit_counter (const char *host, const char *plugin_inst, /* {{{ */
-		const char *type, const char *type_inst, counter_t counter, time_t timestamp)
+		const char *type, const char *type_inst, counter_t counter, time_t timestamp, int interval)
 {
 	value_t v;
 
 	v.counter = counter;
 
 	return (submit_values (host, plugin_inst, type, type_inst,
-				&v, 1, timestamp));
+				&v, 1, timestamp, interval));
 } /* }}} int submit_counter */
 
 static int submit_two_gauge (const char *host, const char *plugin_inst, /* {{{ */
 		const char *type, const char *type_inst, gauge_t val0, gauge_t val1,
-		time_t timestamp)
+		time_t timestamp, int interval)
 {
 	value_t values[2];
 
@@ -617,18 +627,18 @@ static int submit_two_gauge (const char *host, const char *plugin_inst, /* {{{ *
 	values[1].gauge = val1;
 
 	return (submit_values (host, plugin_inst, type, type_inst,
-				values, 2, timestamp));
+				values, 2, timestamp, interval));
 } /* }}} int submit_two_gauge */
 
 static int submit_double (const char *host, const char *plugin_inst, /* {{{ */
-		const char *type, const char *type_inst, double d, time_t timestamp)
+		const char *type, const char *type_inst, double d, time_t timestamp, int interval)
 {
 	value_t v;
 
 	v.gauge = (gauge_t) d;
 
 	return (submit_values (host, plugin_inst, type, type_inst,
-				&v, 1, timestamp));
+				&v, 1, timestamp, interval));
 } /* }}} int submit_uint64 */
 
 /* Calculate hit ratio from old and new counters and submit the resulting
@@ -640,7 +650,8 @@ static int submit_cache_ratio (const char *host, /* {{{ */
 		uint64_t new_misses,
 		uint64_t old_hits,
 		uint64_t old_misses,
-		time_t timestamp)
+		time_t timestamp,
+		int interval)
 {
 	value_t v;
 
@@ -657,12 +668,12 @@ static int submit_cache_ratio (const char *host, /* {{{ */
 	}
 
 	return (submit_values (host, plugin_inst, "cache_ratio", type_inst,
-				&v, 1, timestamp));
+				&v, 1, timestamp, interval));
 } /* }}} int submit_cache_ratio */
 
 /* Submits all the caches used by WAFL. Uses "submit_cache_ratio". */
 static int submit_wafl_data (const char *hostname, const char *instance, /* {{{ */
-		cfg_wafl_t *old_data, const cfg_wafl_t *new_data)
+		cfg_wafl_t *old_data, const cfg_wafl_t *new_data, int interval)
 {
 	/* Submit requested counters */
 	if (HAS_ALL_FLAGS (old_data->flags, CFG_WAFL_NAME_CACHE | HAVE_WAFL_NAME_CACHE)
@@ -670,28 +681,28 @@ static int submit_wafl_data (const char *hostname, const char *instance, /* {{{
 		submit_cache_ratio (hostname, instance, "name_cache_hit",
 				new_data->name_cache_hit, new_data->name_cache_miss,
 				old_data->name_cache_hit, old_data->name_cache_miss,
-				new_data->timestamp);
+				new_data->timestamp, interval);
 
 	if (HAS_ALL_FLAGS (old_data->flags, CFG_WAFL_DIR_CACHE | HAVE_WAFL_FIND_DIR)
 			&& HAS_ALL_FLAGS (new_data->flags, HAVE_WAFL_FIND_DIR))
 		submit_cache_ratio (hostname, instance, "find_dir_hit",
 				new_data->find_dir_hit, new_data->find_dir_miss,
 				old_data->find_dir_hit, old_data->find_dir_miss,
-				new_data->timestamp);
+				new_data->timestamp, interval);
 
 	if (HAS_ALL_FLAGS (old_data->flags, CFG_WAFL_BUF_CACHE | HAVE_WAFL_BUF_HASH)
 			&& HAS_ALL_FLAGS (new_data->flags, HAVE_WAFL_BUF_HASH))
 		submit_cache_ratio (hostname, instance, "buf_hash_hit",
 				new_data->buf_hash_hit, new_data->buf_hash_miss,
 				old_data->buf_hash_hit, old_data->buf_hash_miss,
-				new_data->timestamp);
+				new_data->timestamp, interval);
 
 	if (HAS_ALL_FLAGS (old_data->flags, CFG_WAFL_INODE_CACHE | HAVE_WAFL_INODE_CACHE)
 			&& HAS_ALL_FLAGS (new_data->flags, HAVE_WAFL_INODE_CACHE))
 		submit_cache_ratio (hostname, instance, "inode_cache_hit",
 				new_data->inode_cache_hit, new_data->inode_cache_miss,
 				old_data->inode_cache_hit, old_data->inode_cache_miss,
-				new_data->timestamp);
+				new_data->timestamp, interval);
 
 	/* Clear old HAVE_* flags */
 	old_data->flags &= ~HAVE_WAFL_ALL;
@@ -717,22 +728,30 @@ static int submit_wafl_data (const char *hostname, const char *instance, /* {{{
  * update flags appropriately. */
 static int submit_volume_perf_data (const char *hostname, /* {{{ */
 		data_volume_perf_t *old_data,
-		const data_volume_perf_t *new_data)
+		const data_volume_perf_t *new_data, int interval)
 {
+	char plugin_instance[DATA_MAX_NAME_LEN];
+
+	if ((hostname == NULL) || (old_data == NULL) || (new_data == NULL))
+		return (-1);
+
+	ssnprintf (plugin_instance, sizeof (plugin_instance),
+			"volume-%s", old_data->name);
+
 	/* Check for and submit disk-octet values */
 	if (HAS_ALL_FLAGS (old_data->flags, CFG_VOLUME_PERF_IO)
 			&& HAS_ALL_FLAGS (new_data->flags, HAVE_VOLUME_PERF_BYTES_READ | HAVE_VOLUME_PERF_BYTES_WRITE))
 	{
-		submit_two_counters (hostname, old_data->name, "disk_octets", /* type instance = */ NULL,
-				(counter_t) new_data->read_bytes, (counter_t) new_data->write_bytes, new_data->timestamp);
+		submit_two_counters (hostname, plugin_instance, "disk_octets", /* type instance = */ NULL,
+				(counter_t) new_data->read_bytes, (counter_t) new_data->write_bytes, new_data->timestamp, interval);
 	}
 
 	/* Check for and submit disk-operations values */
 	if (HAS_ALL_FLAGS (old_data->flags, CFG_VOLUME_PERF_OPS)
 			&& HAS_ALL_FLAGS (new_data->flags, HAVE_VOLUME_PERF_OPS_READ | HAVE_VOLUME_PERF_OPS_WRITE))
 	{
-		submit_two_counters (hostname, old_data->name, "disk_ops", /* type instance = */ NULL,
-				(counter_t) new_data->read_ops, (counter_t) new_data->write_ops, new_data->timestamp);
+		submit_two_counters (hostname, plugin_instance, "disk_ops", /* type instance = */ NULL,
+				(counter_t) new_data->read_ops, (counter_t) new_data->write_ops, new_data->timestamp, interval);
 	}
 
 	/* Check for, calculate and submit disk-latency values */
@@ -775,8 +794,8 @@ static int submit_volume_perf_data (const char *hostname, /* {{{ */
 				latency_per_op_write = ((gauge_t) diff_latency_write) / ((gauge_t) diff_ops_write);
 		}
 
-		submit_two_gauge (hostname, old_data->name, "disk_latency", /* type instance = */ NULL,
-				latency_per_op_read, latency_per_op_write, new_data->timestamp);
+		submit_two_gauge (hostname, plugin_instance, "disk_latency", /* type instance = */ NULL,
+				latency_per_op_read, latency_per_op_write, new_data->timestamp, interval);
 	}
 
 	/* Clear all HAVE_* flags. */
@@ -805,7 +824,7 @@ static int submit_volume_perf_data (const char *hostname, /* {{{ */
  */
 /* Data corresponding to <WAFL /> */
 static int cna_handle_wafl_data (const char *hostname, cfg_wafl_t *cfg_wafl, /* {{{ */
-		na_elem_t *data)
+		na_elem_t *data, int interval)
 {
 	cfg_wafl_t perf_data;
 	const char *plugin_inst;
@@ -822,7 +841,8 @@ static int cna_handle_wafl_data (const char *hostname, cfg_wafl_t *cfg_wafl, /*
 	if (instances == NULL)
 	{
 		ERROR ("netapp plugin: cna_handle_wafl_data: "
-				"na_elem_child (\"instances\") failed.");
+				"na_elem_child (\"instances\") failed "
+				"for host %s.", hostname);
 		return (-1);
 	}
 
@@ -830,7 +850,8 @@ static int cna_handle_wafl_data (const char *hostname, cfg_wafl_t *cfg_wafl, /*
 	if (plugin_inst == NULL)
 	{
 		ERROR ("netapp plugin: cna_handle_wafl_data: "
-				"na_child_get_string (\"name\") failed.");
+				"na_child_get_string (\"name\") failed "
+				"for host %s.", hostname);
 		return (-1);
 	}
 
@@ -877,11 +898,12 @@ static int cna_handle_wafl_data (const char *hostname, cfg_wafl_t *cfg_wafl, /*
 			perf_data.flags |= HAVE_WAFL_INODE_CACHE_MISS;
 		} else {
 			DEBUG("netapp plugin: cna_handle_wafl_data: "
-					"Found unexpected child: %s", name);
+					"Found unexpected child: %s "
+					"for host %s.", name, hostname);
 		}
 	}
 
-	return (submit_wafl_data (hostname, plugin_inst, cfg_wafl, &perf_data));
+	return (submit_wafl_data (hostname, plugin_inst, cfg_wafl, &perf_data, interval));
 } /* }}} void cna_handle_wafl_data */
 
 static int cna_setup_wafl (cfg_wafl_t *cw) /* {{{ */
@@ -910,14 +932,14 @@ static int cna_setup_wafl (cfg_wafl_t *cw) /* {{{ */
 		ERROR ("netapp plugin: na_elem_new failed.");
 		return (-1);
 	}
-	na_child_add_string(e, "foo", "name_cache_hit");
-	na_child_add_string(e, "foo", "name_cache_miss");
-	na_child_add_string(e, "foo", "find_dir_hit");
-	na_child_add_string(e, "foo", "find_dir_miss");
-	na_child_add_string(e, "foo", "buf_hash_hit");
-	na_child_add_string(e, "foo", "buf_hash_miss");
-	na_child_add_string(e, "foo", "inode_cache_hit");
-	na_child_add_string(e, "foo", "inode_cache_miss");
+	na_child_add_string(e, "counter", "name_cache_hit");
+	na_child_add_string(e, "counter", "name_cache_miss");
+	na_child_add_string(e, "counter", "find_dir_hit");
+	na_child_add_string(e, "counter", "find_dir_miss");
+	na_child_add_string(e, "counter", "buf_hash_hit");
+	na_child_add_string(e, "counter", "buf_hash_miss");
+	na_child_add_string(e, "counter", "inode_cache_hit");
+	na_child_add_string(e, "counter", "inode_cache_miss");
 
 	na_child_add(cw->query, e);
 
@@ -949,13 +971,13 @@ static int cna_query_wafl (host_config_t *host) /* {{{ */
 	data = na_server_invoke_elem(host->srv, host->cfg_wafl->query);
 	if (na_results_status (data) != NA_OK)
 	{
-		ERROR ("netapp plugin: cna_query_wafl: na_server_invoke_elem failed: %s",
-				na_results_reason (data));
+		ERROR ("netapp plugin: cna_query_wafl: na_server_invoke_elem failed for host %s: %s",
+				host->name, na_results_reason (data));
 		na_elem_free (data);
 		return (-1);
 	}
 
-	status = cna_handle_wafl_data (host->name, host->cfg_wafl, data);
+	status = cna_handle_wafl_data (host->name, host->cfg_wafl, data, host->interval);
 
 	if (status == 0)
 		host->cfg_wafl->interval.last_read = now;
@@ -966,7 +988,7 @@ static int cna_query_wafl (host_config_t *host) /* {{{ */
 
 /* Data corresponding to <Disks /> */
 static int cna_handle_disk_data (const char *hostname, /* {{{ */
-		cfg_disk_t *cfg_disk, na_elem_t *data)
+		cfg_disk_t *cfg_disk, na_elem_t *data, int interval)
 {
 	time_t timestamp;
 	na_elem_t *instances;
@@ -983,7 +1005,8 @@ static int cna_handle_disk_data (const char *hostname, /* {{{ */
 	if (instances == NULL)
 	{
 		ERROR ("netapp plugin: cna_handle_disk_data: "
-				"na_elem_child (\"instances\") failed.");
+				"na_elem_child (\"instances\") failed "
+				"for host %s.", hostname);
 		return (-1);
 	}
 
@@ -1079,7 +1102,7 @@ static int cna_handle_disk_data (const char *hostname, /* {{{ */
 
 	if ((cfg_disk->flags & CFG_DISK_BUSIEST) && (worst_disk != NULL))
 		submit_double (hostname, "system", "percent", "disk_busy",
-				worst_disk->disk_busy_percent, timestamp);
+				worst_disk->disk_busy_percent, timestamp, interval);
 
 	return (0);
 } /* }}} int cna_handle_disk_data */
@@ -1110,8 +1133,8 @@ static int cna_setup_disk (cfg_disk_t *cd) /* {{{ */
 		ERROR ("netapp plugin: na_elem_new failed.");
 		return (-1);
 	}
-	na_child_add_string(e, "foo", "disk_busy");
-	na_child_add_string(e, "foo", "base_for_disk_busy");
+	na_child_add_string(e, "counter", "disk_busy");
+	na_child_add_string(e, "counter", "base_for_disk_busy");
 	na_child_add(cd->query, e);
 
 	return (0);
@@ -1143,13 +1166,13 @@ static int cna_query_disk (host_config_t *host) /* {{{ */
 	data = na_server_invoke_elem(host->srv, host->cfg_disk->query);
 	if (na_results_status (data) != NA_OK)
 	{
-		ERROR ("netapp plugin: cna_query_disk: na_server_invoke_elem failed: %s",
-				na_results_reason (data));
+		ERROR ("netapp plugin: cna_query_disk: na_server_invoke_elem failed for host %s: %s",
+				host->name, na_results_reason (data));
 		na_elem_free (data);
 		return (-1);
 	}
 
-	status = cna_handle_disk_data (host->name, host->cfg_disk, data);
+	status = cna_handle_disk_data (host->name, host->cfg_disk, data, host->interval);
 
 	if (status == 0)
 		host->cfg_disk->interval.last_read = now;
@@ -1160,7 +1183,7 @@ static int cna_query_disk (host_config_t *host) /* {{{ */
 
 /* Data corresponding to <VolumePerf /> */
 static int cna_handle_volume_perf_data (const char *hostname, /* {{{ */
-		cfg_volume_perf_t *cvp, na_elem_t *data)
+		cfg_volume_perf_t *cvp, na_elem_t *data, int interval)
 {
 	time_t timestamp;
 	na_elem_t *elem_instances;
@@ -1173,7 +1196,8 @@ static int cna_handle_volume_perf_data (const char *hostname, /* {{{ */
 	if (elem_instances == NULL)
 	{
 		ERROR ("netapp plugin: handle_volume_perf_data: "
-				"na_elem_child (\"instances\") failed.");
+				"na_elem_child (\"instances\") failed "
+				"for host %s.", hostname);
 		return (-1);
 	}
 
@@ -1199,7 +1223,7 @@ static int cna_handle_volume_perf_data (const char *hostname, /* {{{ */
 			continue;
 
 		/* get_volume_perf may return NULL if this volume is to be ignored. */
-		v = get_volume_perf (cvp, perf_data.name);
+		v = get_volume_perf (cvp, name);
 		if (v == NULL)
 			continue;
 
@@ -1244,7 +1268,7 @@ static int cna_handle_volume_perf_data (const char *hostname, /* {{{ */
 			}
 		} /* for (elem_counter) */
 
-		submit_volume_perf_data (hostname, v, &perf_data);
+		submit_volume_perf_data (hostname, v, &perf_data, interval);
 	} /* for (volume) */
 
 	return (0);
@@ -1276,13 +1300,12 @@ static int cna_setup_volume_perf (cfg_volume_perf_t *cd) /* {{{ */
 		ERROR ("netapp plugin: na_elem_new failed.");
 		return (-1);
 	}
-	/* "foo" means: This string has to be here but the content doesn't matter. */
-	na_child_add_string(e, "foo", "read_ops");
-	na_child_add_string(e, "foo", "write_ops");
-	na_child_add_string(e, "foo", "read_data");
-	na_child_add_string(e, "foo", "write_data");
-	na_child_add_string(e, "foo", "read_latency");
-	na_child_add_string(e, "foo", "write_latency");
+	na_child_add_string(e, "counter", "read_ops");
+	na_child_add_string(e, "counter", "write_ops");
+	na_child_add_string(e, "counter", "read_data");
+	na_child_add_string(e, "counter", "write_data");
+	na_child_add_string(e, "counter", "read_latency");
+	na_child_add_string(e, "counter", "write_latency");
 	na_child_add(cd->query, e);
 
 	return (0);
@@ -1314,13 +1337,13 @@ static int cna_query_volume_perf (host_config_t *host) /* {{{ */
 	data = na_server_invoke_elem (host->srv, host->cfg_volume_perf->query);
 	if (na_results_status (data) != NA_OK)
 	{
-		ERROR ("netapp plugin: cna_query_volume_perf: na_server_invoke_elem failed: %s",
-				na_results_reason (data));
+		ERROR ("netapp plugin: cna_query_volume_perf: na_server_invoke_elem failed for host %s: %s",
+				host->name, na_results_reason (data));
 		na_elem_free (data);
 		return (-1);
 	}
 
-	status = cna_handle_volume_perf_data (host->name, host->cfg_volume_perf, data);
+	status = cna_handle_volume_perf_data (host->name, host->cfg_volume_perf, data, host->interval);
 
 	if (status == 0)
 		host->cfg_volume_perf->interval.last_read = now;
@@ -1331,36 +1354,80 @@ static int cna_query_volume_perf (host_config_t *host) /* {{{ */
 
 /* Data corresponding to <VolumeUsage /> */
 static int cna_submit_volume_usage_data (const char *hostname, /* {{{ */
-		cfg_volume_usage_t *cfg_volume)
+		cfg_volume_usage_t *cfg_volume, int interval)
 {
 	data_volume_usage_t *v;
 
 	for (v = cfg_volume->volumes; v != NULL; v = v->next)
 	{
+		char plugin_instance[DATA_MAX_NAME_LEN];
+
+		uint64_t norm_used = v->norm_used;
+		uint64_t norm_free = v->norm_free;
+		uint64_t sis_saved = v->sis_saved;
+		uint64_t snap_reserve_used = 0;
+		uint64_t snap_reserve_free = v->snap_reserved;
+		uint64_t snap_norm_used = v->snap_used;
+
+		ssnprintf (plugin_instance, sizeof (plugin_instance),
+				"volume-%s", v->name);
+
+		if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_SNAP_USED | HAVE_VOLUME_USAGE_SNAP_RSVD)) {
+			if (v->snap_reserved > v->snap_used) {
+				snap_reserve_free = v->snap_reserved - v->snap_used;
+				snap_reserve_used = v->snap_used;
+				snap_norm_used = 0;
+			} else {
+				snap_reserve_free = 0;
+				snap_reserve_used = v->snap_reserved;
+				snap_norm_used = v->snap_used - v->snap_reserved;
+			}
+		}
+
+		/* The space used by snapshots but not reserved for them is included in
+		 * both, norm_used and snap_norm_used. If possible, subtract this here. */
+		if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_NORM_USED | HAVE_VOLUME_USAGE_SNAP_USED))
+		{
+			if (norm_used >= snap_norm_used)
+				norm_used -= snap_norm_used;
+			else
+			{
+				ERROR ("netapp plugin: (norm_used = %"PRIu64") < (snap_norm_used = "
+						"%"PRIu64") for host %s. Invalidating both.",
+						norm_used, snap_norm_used, hostname);
+				v->flags &= ~(HAVE_VOLUME_USAGE_NORM_USED | HAVE_VOLUME_USAGE_SNAP_USED);
+			}
+		}
+
 		if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_NORM_FREE))
-			submit_double (hostname, /* plugin instance = */ v->name,
+			submit_double (hostname, /* plugin instance = */ plugin_instance,
 					"df_complex", "free",
-					(double) v->norm_free, /* timestamp = */ 0);
+					(double) norm_free, /* timestamp = */ 0, interval);
+
+		if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_SIS_SAVED))
+			submit_double (hostname, /* plugin instance = */ plugin_instance,
+					"df_complex", "sis_saved",
+					(double) sis_saved, /* timestamp = */ 0, interval);
 
 		if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_NORM_USED))
-			submit_double (hostname, /* plugin instance = */ v->name,
+			submit_double (hostname, /* plugin instance = */ plugin_instance,
 					"df_complex", "used",
-					(double) v->norm_used, /* timestamp = */ 0);
+					(double) norm_used, /* timestamp = */ 0, interval);
 
 		if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_SNAP_RSVD))
-			submit_double (hostname, /* plugin instance = */ v->name,
+			submit_double (hostname, /* plugin instance = */ plugin_instance,
 					"df_complex", "snap_reserved",
-					(double) v->snap_reserved, /* timestamp = */ 0);
+					(double) snap_reserve_free, /* timestamp = */ 0, interval);
 
-		if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_SNAP_USED))
-			submit_double (hostname, /* plugin instance = */ v->name,
-					"df_complex", "snap_used",
-					(double) v->snap_used, /* timestamp = */ 0);
+		if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_SNAP_USED | HAVE_VOLUME_USAGE_SNAP_RSVD))
+			submit_double (hostname, /* plugin instance = */ plugin_instance,
+					"df_complex", "snap_reserve_used",
+					(double) snap_reserve_used, /* timestamp = */ 0, interval);
 
-		if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_SIS_SAVED))
-			submit_double (hostname, /* plugin instance = */ v->name,
-					"df_complex", "sis_saved",
-					(double) v->sis_saved, /* timestamp = */ 0);
+		if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_SNAP_USED))
+			submit_double (hostname, /* plugin instance = */ plugin_instance,
+					"df_complex", "snap_normal_used",
+					(double) snap_norm_used, /* timestamp = */ 0, interval);
 
 		/* Clear all the HAVE_* flags */
 		v->flags &= ~HAVE_VOLUME_USAGE_ALL;
@@ -1369,7 +1436,88 @@ static int cna_submit_volume_usage_data (const char *hostname, /* {{{ */
 	return (0);
 } /* }}} int cna_submit_volume_usage_data */
 
-static int cna_handle_volume_usage_data (const char *hostname, /* {{{ */
+/* Switch the state of a volume between online and offline and send out a
+ * notification. */
+static int cna_change_volume_status (const char *hostname, /* {{{ */
+		data_volume_usage_t *v)
+{
+	notification_t n;
+
+	memset (&n, 0, sizeof (&n));
+	n.time = time (NULL);
+	sstrncpy (n.host, hostname, sizeof (n.host));
+	sstrncpy (n.plugin, "netapp", sizeof (n.plugin));
+	sstrncpy (n.plugin_instance, v->name, sizeof (n.plugin_instance));
+
+	if ((v->flags & IS_VOLUME_USAGE_OFFLINE) != 0) {
+		n.severity = NOTIF_OKAY;
+		ssnprintf (n.message, sizeof (n.message),
+				"Volume %s is now online.", v->name);
+		v->flags &= ~IS_VOLUME_USAGE_OFFLINE;
+	} else {
+		n.severity = NOTIF_WARNING;
+		ssnprintf (n.message, sizeof (n.message),
+				"Volume %s is now offline.", v->name);
+		v->flags |= IS_VOLUME_USAGE_OFFLINE;
+	}
+
+	return (plugin_dispatch_notification (&n));
+} /* }}} int cna_change_volume_status */
+
+static void cna_handle_volume_snap_usage(const host_config_t *host, /* {{{ */
+		data_volume_usage_t *v)
+{
+	uint64_t snap_used = 0, value;
+	na_elem_t *data, *elem_snap, *elem_snapshots;
+	na_elem_iter_t iter_snap;
+
+	data = na_server_invoke_elem(host->srv, v->snap_query);
+	if (na_results_status(data) != NA_OK)
+	{
+		if (na_results_errno(data) == EVOLUMEOFFLINE) {
+			if ((v->flags & IS_VOLUME_USAGE_OFFLINE) == 0)
+				cna_change_volume_status (host->name, v);
+		} else {
+			ERROR ("netapp plugin: cna_handle_volume_snap_usage: na_server_invoke_elem for "
+					"volume \"%s\" on host %s failed with error %d: %s", v->name,
+					host->name, na_results_errno(data), na_results_reason(data));
+		}
+		na_elem_free(data);
+		return;
+	}
+
+	if ((v->flags & IS_VOLUME_USAGE_OFFLINE) != 0)
+		cna_change_volume_status (host->name, v);
+
+	elem_snapshots = na_elem_child (data, "snapshots");
+	if (elem_snapshots == NULL)
+	{
+		ERROR ("netapp plugin: cna_handle_volume_snap_usage: "
+				"na_elem_child (\"snapshots\") failed "
+				"for host %s.", host->name);
+		na_elem_free(data);
+		return;
+	}
+
+	iter_snap = na_child_iterator (elem_snapshots);
+	for (elem_snap = na_iterator_next (&iter_snap);
+			elem_snap != NULL;
+			elem_snap = na_iterator_next (&iter_snap))
+	{
+		value = na_child_get_uint64(elem_snap, "cumulative-total", 0);
+		/* "cumulative-total" is the total size of the oldest snapshot plus all
+		 * newer ones in blocks (1KB). We therefore are looking for the highest
+		 * number of all snapshots - that's the size required for the snapshots. */
+		if (value > snap_used)
+			snap_used = value;
+	}
+	na_elem_free (data);
+	/* snap_used is in 1024 byte blocks */
+	v->snap_used = snap_used * 1024;
+	v->flags |= HAVE_VOLUME_USAGE_SNAP_USED;
+} /* }}} void cna_handle_volume_snap_usage */
+
+static int cna_handle_volume_usage_data (const host_config_t *host, /* {{{ */
 		cfg_volume_usage_t *cfg_volume, na_elem_t *data)
 {
 	na_elem_t *elem_volume;
@@ -1380,7 +1528,8 @@ static int cna_handle_volume_usage_data (const char *hostname, /* {{{ */
 	if (elem_volumes == NULL)
 	{
 		ERROR ("netapp plugin: cna_handle_volume_usage_data: "
-				"na_elem_child (\"volumes\") failed.");
+				"na_elem_child (\"volumes\") failed "
+				"for host %s.", host->name);
 		return (-1);
 	}
 
@@ -1389,7 +1538,7 @@ static int cna_handle_volume_usage_data (const char *hostname, /* {{{ */
 			elem_volume != NULL;
 			elem_volume = na_iterator_next (&iter_volume))
 	{
-		const char *volume_name;
+		const char *volume_name, *state;
 
 		data_volume_usage_t *v;
 		uint64_t value;
@@ -1402,11 +1551,18 @@ static int cna_handle_volume_usage_data (const char *hostname, /* {{{ */
 		if (volume_name == NULL)
 			continue;
 
+		state = na_child_get_string (elem_volume, "state");
+		if ((state == NULL) || (strcmp(state, "online") != 0))
+			continue;
+
 		/* get_volume_usage may return NULL if the volume is to be ignored. */
 		v = get_volume_usage (cfg_volume, volume_name);
 		if (v == NULL)
 			continue;
 
+		if ((v->flags & CFG_VOLUME_USAGE_SNAP) != 0)
+			cna_handle_volume_snap_usage(host, v);
+		
 		if ((v->flags & CFG_VOLUME_USAGE_DF) == 0)
 			continue;
 
@@ -1426,7 +1582,7 @@ static int cna_handle_volume_usage_data (const char *hostname, /* {{{ */
 		value = na_child_get_uint64(elem_volume, "snapshot-blocks-reserved", UINT64_MAX);
 		if (value != UINT64_MAX) {
 			/* 1 block == 1024 bytes  as per API docs */
-			v->norm_used = 1024 * value;
+			v->snap_reserved = 1024 * value;
 			v->flags |= HAVE_VOLUME_USAGE_SNAP_RSVD;
 		}
 
@@ -1438,13 +1594,9 @@ static int cna_handle_volume_usage_data (const char *hostname, /* {{{ */
 		if (sis_state == NULL)
 			continue;
 
-		/* If SIS is not enabled, set the HAVE_VOLUME_USAGE_SIS_SAVED flag and set
-		 * sis_saved to UINT64_MAX to signal this condition to the submit function. */
-		if (strcmp ("enabled", sis_state) != 0) {
-			v->sis_saved = UINT64_MAX;
-			v->flags |= HAVE_VOLUME_USAGE_SIS_SAVED;
+		/* If SIS is not enabled, there's nothing left to do for this volume. */
+		if (strcmp ("enabled", sis_state) != 0)
 			continue;
-		}
 
 		sis_saved_reported = na_child_get_uint64(sis, "size-saved", UINT64_MAX);
 		if (sis_saved_reported == UINT64_MAX)
@@ -1502,7 +1654,7 @@ static int cna_handle_volume_usage_data (const char *hostname, /* {{{ */
 		} /* }}} end of 32-bit workaround */
 	} /* for (elem_volume) */
 
-	return (cna_submit_volume_usage_data (hostname, cfg_volume));
+	return (cna_submit_volume_usage_data (host->name, cfg_volume, host->interval));
 } /* }}} int cna_handle_volume_usage_data */
 
 static int cna_setup_volume_usage (cfg_volume_usage_t *cvu) /* {{{ */
@@ -1520,8 +1672,6 @@ static int cna_setup_volume_usage (cfg_volume_usage_t *cvu) /* {{{ */
 		return (-1);
 	}
 
-	/* TODO: cvu->snap_query = na_elem_new("snapshot-list-info"); */
-
 	return (0);
 } /* }}} int cna_setup_volume_usage */
 
@@ -1551,13 +1701,13 @@ static int cna_query_volume_usage (host_config_t *host) /* {{{ */
 	data = na_server_invoke_elem(host->srv, host->cfg_volume_usage->query);
 	if (na_results_status (data) != NA_OK)
 	{
-		ERROR ("netapp plugin: cna_query_volume_usage: na_server_invoke_elem failed: %s",
-				na_results_reason (data));
+		ERROR ("netapp plugin: cna_query_volume_usage: na_server_invoke_elem failed for host %s: %s",
+				host->name, na_results_reason (data));
 		na_elem_free (data);
 		return (-1);
 	}
 
-	status = cna_handle_volume_usage_data (host->name, host->cfg_volume_usage, data);
+	status = cna_handle_volume_usage_data (host, host->cfg_volume_usage, data);
 
 	if (status == 0)
 		host->cfg_volume_usage->interval.last_read = now;
@@ -1568,7 +1718,7 @@ static int cna_query_volume_usage (host_config_t *host) /* {{{ */
 
 /* Data corresponding to <System /> */
 static int cna_handle_system_data (const char *hostname, /* {{{ */
-		cfg_system_t *cfg_system, na_elem_t *data)
+		cfg_system_t *cfg_system, na_elem_t *data, int interval)
 {
 	na_elem_t *instances;
 	na_elem_t *counter;
@@ -1588,7 +1738,8 @@ static int cna_handle_system_data (const char *hostname, /* {{{ */
 	if (instances == NULL)
 	{
 		ERROR ("netapp plugin: cna_handle_system_data: "
-				"na_elem_child (\"instances\") failed.");
+				"na_elem_child (\"instances\") failed "
+				"for host %s.", hostname);
 		return (-1);
 	}
 
@@ -1596,7 +1747,8 @@ static int cna_handle_system_data (const char *hostname, /* {{{ */
 	if (instance == NULL)
 	{
 		ERROR ("netapp plugin: cna_handle_system_data: "
-				"na_child_get_string (\"name\") failed.");
+				"na_child_get_string (\"name\") failed "
+				"for host %s.", hostname);
 		return (-1);
 	}
 
@@ -1638,27 +1790,27 @@ static int cna_handle_system_data (const char *hostname, /* {{{ */
 				&& (value > 0) && (strlen(name) > 4)
 				&& (!strcmp(name + strlen(name) - 4, "_ops"))) {
 			submit_counter (hostname, instance, "disk_ops_complex", name,
-					(counter_t) value, timestamp);
+					(counter_t) value, timestamp, interval);
 		}
 	} /* for (counter) */
 
 	if ((cfg_system->flags & CFG_SYSTEM_DISK)
 			&& (HAS_ALL_FLAGS (counter_flags, 0x01 | 0x02)))
 		submit_two_counters (hostname, instance, "disk_octets", NULL,
-				disk_read, disk_written, timestamp);
+				disk_read, disk_written, timestamp, interval);
 				
 	if ((cfg_system->flags & CFG_SYSTEM_NET)
 			&& (HAS_ALL_FLAGS (counter_flags, 0x04 | 0x08)))
 		submit_two_counters (hostname, instance, "if_octets", NULL,
-				net_recv, net_sent, timestamp);
+				net_recv, net_sent, timestamp, interval);
 
 	if ((cfg_system->flags & CFG_SYSTEM_CPU)
 			&& (HAS_ALL_FLAGS (counter_flags, 0x10 | 0x20)))
 	{
 		submit_counter (hostname, instance, "cpu", "system",
-				cpu_busy, timestamp);
+				cpu_busy, timestamp, interval);
 		submit_counter (hostname, instance, "cpu", "idle",
-				cpu_total - cpu_busy, timestamp);
+				cpu_total - cpu_busy, timestamp, interval);
 	}
 
 	return (0);
@@ -1708,13 +1860,13 @@ static int cna_query_system (host_config_t *host) /* {{{ */
 	data = na_server_invoke_elem(host->srv, host->cfg_system->query);
 	if (na_results_status (data) != NA_OK)
 	{
-		ERROR ("netapp plugin: cna_query_system: na_server_invoke_elem failed: %s",
-				na_results_reason (data));
+		ERROR ("netapp plugin: cna_query_system: na_server_invoke_elem failed for host %s: %s",
+				host->name, na_results_reason (data));
 		na_elem_free (data);
 		return (-1);
 	}
 
-	status = cna_handle_system_data (host->name, host->cfg_system, data);
+	status = cna_handle_system_data (host->name, host->cfg_system, data, host->interval);
 
 	if (status == 0)
 		host->cfg_system->interval.last_read = now;
@@ -1760,14 +1912,14 @@ static int cna_config_get_interval (const oconfig_item_t *ci, /* {{{ */
 
 	if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_NUMBER))
 	{
-		WARNING ("netapp plugin: The `Multiplier' option needs exactly one numeric argument.");
+		WARNING ("netapp plugin: The `Interval' option needs exactly one numeric argument.");
 		return (-1);
 	}
 
 	tmp = (time_t) (ci->values[0].value.number + .5);
 	if (tmp < 1)
 	{
-		WARNING ("netapp plugin: The `Multiplier' option needs a positive integer argument.");
+		WARNING ("netapp plugin: The `Interval' option needs a positive integer argument.");
 		return (-1);
 	}
 
@@ -2211,8 +2363,7 @@ static int cna_config_system (host_config_t *host, /* {{{ */
 } /* }}} int cna_config_system */
 
 /* Corresponds to a <Host /> block. */
-static host_config_t *cna_config_host (const oconfig_item_t *ci, /* {{{ */
-		const host_config_t *default_host)
+static host_config_t *cna_config_host (const oconfig_item_t *ci) /* {{{ */
 {
 	oconfig_item_t *item;
 	host_config_t *host;
@@ -2225,7 +2376,18 @@ static host_config_t *cna_config_host (const oconfig_item_t *ci, /* {{{ */
 	}
 
 	host = malloc(sizeof(*host));
-	memcpy (host, default_host, sizeof (*host));
+	memset (host, 0, sizeof (*host));
+	host->name = NULL;
+	host->protocol = NA_SERVER_TRANSPORT_HTTPS;
+	host->host = NULL;
+	host->username = NULL;
+	host->password = NULL;
+	host->srv = NULL;
+	host->cfg_wafl = NULL;
+	host->cfg_disk = NULL;
+	host->cfg_volume_perf = NULL;
+	host->cfg_volume_usage = NULL;
+	host->cfg_system = NULL;
 
 	status = cf_util_get_string (ci, &host->name);
 	if (status != 0)
@@ -2312,15 +2474,36 @@ static host_config_t *cna_config_host (const oconfig_item_t *ci, /* {{{ */
  *
  * Pretty standard stuff here.
  */
-static int cna_init(void) { /* {{{ */
-	char err[256];
-	host_config_t *host;
-	
-	if (!global_host_config) {
-		WARNING("netapp plugin: Plugin loaded but no hosts defined.");
-		return 1;
+static int cna_init_host (host_config_t *host) /* {{{ */
+{
+	if (host == NULL)
+		return (EINVAL);
+
+	if (host->srv != NULL)
+		return (0);
+
+	/* Request version 1.1 of the ONTAP API */
+	host->srv = na_server_open(host->host,
+			/* major version = */ 1, /* minor version = */ 1); 
+	if (host->srv == NULL) {
+		ERROR ("netapp plugin: na_server_open (%s) failed.", host->host);
+		return (-1);
 	}
 
+	na_server_set_transport_type(host->srv, host->protocol,
+			/* transportarg = */ NULL);
+	na_server_set_port(host->srv, host->port);
+	na_server_style(host->srv, NA_STYLE_LOGIN_PASSWORD);
+	na_server_adminuser(host->srv, host->username, host->password);
+	na_server_set_timeout(host->srv, 5 /* seconds */);
+
+	return 0;
+} /* }}} int cna_init_host */
+
+static int cna_init (void) /* {{{ */
+{
+	char err[256];
+
 	memset (err, 0, sizeof (err));
 	if (!na_startup(err, sizeof(err))) {
 		err[sizeof (err) - 1] = 0;
@@ -2328,84 +2511,84 @@ static int cna_init(void) { /* {{{ */
 		return 1;
 	}
 
-	for (host = global_host_config; host; host = host->next) {
-		/* Request version 1.1 of the ONTAP API */
-		host->srv = na_server_open(host->host,
-				/* major version = */ 1, /* minor version = */ 1); 
-		if (host->srv == NULL) {
-			ERROR ("netapp plugin: na_server_open (%s) failed.", host->host);
-			continue;
-		}
+	return (0);
+} /* }}} cna_init */
 
-		if (host->interval < interval_g)
-			host->interval = interval_g;
+static int cna_read (user_data_t *ud) { /* {{{ */
+	host_config_t *host;
+	int status;
+
+	if ((ud == NULL) || (ud->data == NULL))
+		return (-1);
+
+	host = ud->data;
+
+	status = cna_init_host (host);
+	if (status != 0)
+		return (status);
+	
+	cna_query_wafl (host);
+	cna_query_disk (host);
+	cna_query_volume_perf (host);
+	cna_query_volume_usage (host);
+	cna_query_system (host);
 
-		na_server_set_transport_type(host->srv, host->protocol,
-				/* transportarg = */ NULL);
-		na_server_set_port(host->srv, host->port);
-		na_server_style(host->srv, NA_STYLE_LOGIN_PASSWORD);
-		na_server_adminuser(host->srv, host->username, host->password);
-		na_server_set_timeout(host->srv, 5 /* seconds */);
-	}
 	return 0;
-} /* }}} int cna_init */
+} /* }}} int cna_read */
 
 static int cna_config (oconfig_item_t *ci) { /* {{{ */
 	int i;
 	oconfig_item_t *item;
-	host_config_t default_host = HOST_INIT;
-	
+
 	for (i = 0; i < ci->children_num; ++i) {
 		item = ci->children + i;
 
-		if (!strcasecmp(item->key, "Host")) {
+		if (strcasecmp(item->key, "Host") == 0)
+		{
 			host_config_t *host;
-			host_config_t *tmp;
+			char cb_name[256];
+			struct timespec interval;
+			user_data_t ud;
 
-			host = cna_config_host(item, &default_host);
+			host = cna_config_host (item);
 			if (host == NULL)
 				continue;
 
-			for (tmp = global_host_config; tmp != NULL; tmp = tmp->next)
-			{
-				if (strcasecmp (host->name, tmp->name) == 0)
-					WARNING ("netapp plugin: Duplicate definition of host `%s'. "
-							"This is probably a bad idea.",
-							host->name);
+			ssnprintf (cb_name, sizeof (cb_name), "netapp-%s", host->name);
 
-				if (tmp->next == NULL)
-					break;
-			}
+			memset (&interval, 0, sizeof (interval));
+			interval.tv_sec = host->interval;
 
-			host->next = NULL;
-			if (tmp == NULL)
-				global_host_config = host;
-			else
-				tmp->next = host;
-		} else {
+			memset (&ud, 0, sizeof (ud));
+			ud.data = host;
+			ud.free_func = (void (*) (void *)) free_host_config;
+
+			plugin_register_complex_read (/* group = */ NULL, cb_name,
+					/* callback  = */ cna_read, 
+					/* interval  = */ (host->interval > 0) ? &interval : NULL,
+					/* user data = */ &ud);
+			continue;
+		}
+		else /* if (item->key != "Host") */
+		{
 			WARNING("netapp plugin: Ignoring unknown config option \"%s\".", item->key);
 		}
 	}
 	return 0;
 } /* }}} int cna_config */
 
-static int cna_read (void) { /* {{{ */
-	host_config_t *host;
-	
-	for (host = global_host_config; host; host = host->next) {
-		cna_query_wafl (host);
-		cna_query_disk (host);
-		cna_query_volume_perf (host);
-		cna_query_volume_usage (host);
-		cna_query_system (host);
-	}
-	return 0;
-} /* }}} int cna_read */
+static int cna_shutdown (void) /* {{{ */
+{
+	/* Clean up system resources and stuff. */
+	na_shutdown ();
+
+	return (0);
+} /* }}} int cna_shutdown */
 
 void module_register(void) {
 	plugin_register_complex_config("netapp", cna_config);
 	plugin_register_init("netapp", cna_init);
-	plugin_register_read("netapp", cna_read);
+	plugin_register_shutdown("netapp", cna_shutdown);
 }
 
 /* vim: set sw=2 ts=2 noet fdm=marker : */