X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnetapp.c;h=317b0fe40d51936e924244a23321f7b7f4b29e68;hb=37e18082cfb22491138e282074c5267df48dd8de;hp=b11e9fa263281aff605b1881f7e1912f0f09e261;hpb=7936f094388707ee066b2e9f3fc75659e1715181;p=collectd.git

diff --git a/src/netapp.c b/src/netapp.c
index b11e9fa2..317b0fe4 100644
--- a/src/netapp.c
+++ b/src/netapp.c
@@ -253,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
@@ -842,7 +837,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);
 	}
 
@@ -850,7 +846,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);
 	}
 
@@ -897,7 +894,8 @@ 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);
 		}
 	}
 
@@ -930,14 +928,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);
 
@@ -969,8 +967,8 @@ 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);
 	}
@@ -1003,7 +1001,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);
 	}
 
@@ -1130,8 +1129,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);
@@ -1163,8 +1162,8 @@ 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);
 	}
@@ -1193,7 +1192,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);
 	}
 
@@ -1296,13 +1296,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);
@@ -1334,8 +1333,8 @@ 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);
 	}
@@ -1390,8 +1389,8 @@ static int cna_submit_volume_usage_data (const char *hostname, /* {{{ */
 			else
 			{
 				ERROR ("netapp plugin: (norm_used = %"PRIu64") < (snap_norm_used = "
-						"%"PRIu64"). Invalidating both.",
-						norm_used, 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);
 			}
 		}
@@ -1476,8 +1475,8 @@ static void cna_handle_volume_snap_usage(const host_config_t *host, /* {{{ */
 				cna_change_volume_status (host->name, v);
 		} else {
 			ERROR ("netapp plugin: cna_handle_volume_snap_usage: na_server_invoke_elem for "
-					"volume \"%s\" failed with error %d: %s", v->name,
-					na_results_errno(data), na_results_reason(data));
+					"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;
@@ -1490,7 +1489,8 @@ static void cna_handle_volume_snap_usage(const host_config_t *host, /* {{{ */
 	if (elem_snapshots == NULL)
 	{
 		ERROR ("netapp plugin: cna_handle_volume_snap_usage: "
-				"na_elem_child (\"snapshots\") failed.");
+				"na_elem_child (\"snapshots\") failed "
+				"for host %s.", host->name);
 		na_elem_free(data);
 		return;
 	}
@@ -1524,7 +1524,8 @@ static int cna_handle_volume_usage_data (const host_config_t *host, /* {{{ */
 	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);
 	}
 
@@ -1696,8 +1697,8 @@ 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);
 	}
@@ -1733,7 +1734,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);
 	}
 
@@ -1741,7 +1743,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);
 	}
 
@@ -1853,8 +1856,8 @@ 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);
 	}
@@ -2356,8 +2359,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;
@@ -2370,7 +2372,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)
@@ -2457,15 +2470,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;
@@ -2473,84 +2507,76 @@ 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) /* {{{ */
 {
-	free_host_config (global_host_config);
-	global_host_config = NULL;
+	/* Clean up system resources and stuff. */
+	na_shutdown ();
 
 	return (0);
 } /* }}} int cna_shutdown */
@@ -2558,7 +2584,6 @@ static int cna_shutdown (void) /* {{{ */
 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);
 }