X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnetapp.c;h=6e5709ca9ba30a973506845b3dc394e283f40cc3;hb=4a7a253f8048b50b733663d1238e1ac7327b4664;hp=ee8bfcf0383a154684feb754ab63a43ddc22b0c2;hpb=96d86b57692122d76e3687a3464971f1d377eec7;p=collectd.git

diff --git a/src/netapp.c b/src/netapp.c
index ee8bfcf0..6e5709ca 100644
--- a/src/netapp.c
+++ b/src/netapp.c
@@ -209,7 +209,71 @@ struct host_config_s {
 };
 #define HOST_INIT {NULL, NULL, NA_SERVER_TRANSPORT_HTTPS, NULL, 0, NULL, NULL, 10, NULL, NULL, NULL, NULL}
 
-static host_config_t *host_config;
+static host_config_t *global_host_config;
+
+/*
+ * Free functions
+ *
+ * Used to free the various structures above.
+ */
+static void free_volume (volume_t *volume) /* {{{ */
+{
+	volume_t *next;
+
+	next = volume->next;
+
+	sfree (volume->name);
+	sfree (volume);
+
+	free_volume (next);
+} /* }}} void free_volume */
+
+static void free_disk (disk_t *disk) /* {{{ */
+{
+	disk_t *next;
+
+	next = disk->next;
+
+	sfree (disk->name);
+	sfree (disk);
+
+	free_disk (next);
+} /* }}} void free_disk */
+
+static void free_cfg_service (cfg_service_t *service) /* {{{ */
+{
+	cfg_service_t *next;
+
+	next = service->next;
+
+	/* FIXME: Free service->data? */
+	sfree (service);
+
+	free_cfg_service (next);
+} /* }}} void free_cfg_service */
+
+static void free_host_config (host_config_t *hc) /* {{{ */
+{
+	host_config_t *next;
+
+	if (hc == NULL)
+		return;
+
+	next = hc->next;
+
+	sfree (hc->name);
+	sfree (hc->host);
+	sfree (hc->username);
+	sfree (hc->password);
+
+	free_cfg_service (hc->services);
+	free_disk (hc->disks);
+	free_volume (hc->volumes);
+
+	sfree (hc);
+
+	free_host_config (next);
+} /* }}} void free_host_config */
 
 /*
  * Auxiliary functions
@@ -295,7 +359,7 @@ static disk_t *get_disk(host_config_t *host, const char *name) /* {{{ */
 	return v;
 } /* }}} disk_t *get_disk */
 
-static void set_global_perf_vol_flag(const host_config_t *host, /* {{{ */
+static void host_set_all_perf_data_flags(const host_config_t *host, /* {{{ */
 		uint32_t flag, _Bool set)
 {
 	volume_t *v;
@@ -306,9 +370,9 @@ static void set_global_perf_vol_flag(const host_config_t *host, /* {{{ */
 		else /* if (!set) */
 			v->perf_data.flags &= ~flag;
 	}
-} /* }}} void set_global_perf_vol_flag */
+} /* }}} void host_set_all_perf_data_flags */
 
-static void set_global_vol_flag(const host_config_t *host, /* {{{ */
+static void host_set_all_cfg_volume_usage_flags(const host_config_t *host, /* {{{ */
 		uint32_t flag, _Bool set) {
 	volume_t *v;
 	
@@ -318,7 +382,7 @@ static void set_global_vol_flag(const host_config_t *host, /* {{{ */
 		else /* if (!set) */
 			v->cfg_volume_usage.flags &= ~flag;
 	}
-} /* }}} void set_global_vol_flag */
+} /* }}} void host_set_all_cfg_volume_usage_flags */
 
 /*
  * Various submit functions.
@@ -1055,7 +1119,7 @@ static void cna_config_volume_performance_option (host_config_t *host, /* {{{ */
 			else /* if (!set) */
 				perf_volume->flags &= ~flag;
 
-			set_global_perf_vol_flag(host, flag, set);
+			host_set_all_perf_data_flags(host, flag, set);
 			continue;
 		}
 
@@ -1102,15 +1166,15 @@ static void cna_config_volume_performance(host_config_t *host, const oconfig_ite
 	}
 	if (!had_io) {
 		perf_volume->flags |= CFG_VOLUME_PERF_IO;
-		set_global_perf_vol_flag(host, CFG_VOLUME_PERF_IO, /* set = */ true);
+		host_set_all_perf_data_flags(host, CFG_VOLUME_PERF_IO, /* set = */ true);
 	}
 	if (!had_ops) {
 		perf_volume->flags |= CFG_VOLUME_PERF_OPS;
-		set_global_perf_vol_flag(host, CFG_VOLUME_PERF_OPS, /* set = */ true);
+		host_set_all_perf_data_flags(host, CFG_VOLUME_PERF_OPS, /* set = */ true);
 	}
 	if (!had_latency) {
 		perf_volume->flags |= CFG_VOLUME_PERF_LATENCY;
-		set_global_perf_vol_flag(host, CFG_VOLUME_PERF_LATENCY, /* set = */ true);
+		host_set_all_perf_data_flags(host, CFG_VOLUME_PERF_LATENCY, /* set = */ true);
 	}
 } /* }}} void cna_config_volume_performance */
 
@@ -1146,7 +1210,7 @@ static void cna_config_volume_usage_option (host_config_t *host, /* {{{ */
 			else /* if (!set) */
 				cfg_volume_data->flags &= ~flag;
 
-			set_global_vol_flag(host, flag, set);
+			host_set_all_cfg_volume_usage_flags(host, flag, set);
 			continue;
 		}
 
@@ -1190,7 +1254,7 @@ static void cna_config_volume_usage(host_config_t *host, oconfig_item_t *ci) { /
 	}
 	if (!had_df) {
 		cfg_volume_data->flags |= VOLUME_DF;
-		set_global_vol_flag(host, VOLUME_DF, /* set = */ true);
+		host_set_all_cfg_volume_usage_flags(host, VOLUME_DF, /* set = */ true);
 	}
 } /* }}} void cna_config_volume_usage */
 
@@ -1214,7 +1278,7 @@ static void cna_config_disk(host_config_t *temp, oconfig_item_t *ci) { /* {{{ */
 		if (!strcasecmp(item->key, "Multiplier")) {
 			cna_config_get_multiplier (item, service);
 		} else if (!strcasecmp(item->key, "GetBusy")) {
-			cna_config_bool_to_flag (item, &cfg_disk->flags, CFG_SYSTEM_CPU);
+			cna_config_bool_to_flag (item, &cfg_disk->flags, CFG_DISK_BUSIEST);
 		}
 	}
 } /* }}} void cna_config_disk */
@@ -1311,87 +1375,100 @@ static int cna_config_system (host_config_t *host, /* {{{ */
 static host_config_t *cna_config_host (const oconfig_item_t *ci, /* {{{ */
 		const host_config_t *default_host, const cfg_service_t *def_def_service)
 {
-	int i;
 	oconfig_item_t *item;
-	host_config_t *host, *hc, temp = *default_host;
+	host_config_t *host, *hc;
 	cfg_service_t default_service = *def_def_service;
+	int status;
+	int i;
 	
 	if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING)) {
 		WARNING("netapp plugin: \"Host\" needs exactly one string argument. Ignoring host block.");
 		return 0;
 	}
 
-	temp.name = ci->values[0].value.string;
+	host = malloc(sizeof(*host));
+	memcpy (host, default_host, sizeof (*host));
+
+	status = cf_util_get_string (ci, &host->name);
+	if (status != 0)
+	{
+		sfree (host);
+		return (NULL);
+	}
+
 	for (i = 0; i < ci->children_num; ++i) {
 		item = ci->children + i;
 
-		/* if (!item || !item->key || !*item->key) continue; */
+		status = 0;
+
 		if (!strcasecmp(item->key, "Address")) {
-			if ((item->values_num != 1) || (item->values[0].type != OCONFIG_TYPE_STRING)) {
-				WARNING("netapp plugin: \"Name\" needs exactly one string argument. Ignoring host block \"%s\".", ci->values[0].value.string);
-				return 0;
-			}
-			temp.host = item->values[0].value.string;
+			status = cf_util_get_string (item, &host->host);
 		} else if (!strcasecmp(item->key, "Port")) {
-			if ((item->values_num != 1) || (item->values[0].type != OCONFIG_TYPE_NUMBER) || (item->values[0].value.number != (int) (item->values[0].value.number)) || (item->values[0].value.number < 1) || (item->values[0].value.number > 65535)) {
-				WARNING("netapp plugin: \"Port\" needs exactly one integer argument in the range of 1-65535. Ignoring host block \"%s\".", ci->values[0].value.string);
-				return 0;
-			}
-			temp.port = item->values[0].value.number;
+			int tmp;
+
+			tmp = cf_util_get_port_number (item);
+			if (tmp > 0)
+				host->port = tmp;
 		} else if (!strcasecmp(item->key, "Protocol")) {
 			if ((item->values_num != 1) || (item->values[0].type != OCONFIG_TYPE_STRING) || (strcasecmp(item->values[0].value.string, "http") && strcasecmp(item->values[0].value.string, "https"))) {
 				WARNING("netapp plugin: \"Protocol\" needs to be either \"http\" or \"https\". Ignoring host block \"%s\".", ci->values[0].value.string);
 				return 0;
 			}
-			if (!strcasecmp(item->values[0].value.string, "http")) temp.protocol = NA_SERVER_TRANSPORT_HTTP;
-			else temp.protocol = NA_SERVER_TRANSPORT_HTTPS;
-		} else if (!strcasecmp(item->key, "Login")) {
-			if ((item->values_num != 2) || (item->values[0].type != OCONFIG_TYPE_STRING) || (item->values[1].type != OCONFIG_TYPE_STRING)) {
-				WARNING("netapp plugin: \"Login\" needs exactly two string arguments, username and password. Ignoring host block \"%s\".", ci->values[0].value.string);
-				return 0;
-			}
-			temp.username = item->values[0].value.string;
-			temp.password = item->values[1].value.string;
+			if (!strcasecmp(item->values[0].value.string, "http")) host->protocol = NA_SERVER_TRANSPORT_HTTP;
+			else host->protocol = NA_SERVER_TRANSPORT_HTTPS;
+		} else if (!strcasecmp(item->key, "User")) {
+			status = cf_util_get_string (item, &host->username);
+		} else if (!strcasecmp(item->key, "Password")) {
+			status = cf_util_get_string (item, &host->password);
 		} else if (!strcasecmp(item->key, "Interval")) {
 			if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_NUMBER || item->values[0].value.number != (int) item->values[0].value.number || item->values[0].value.number < 2) {
 				WARNING("netapp plugin: \"Interval\" of host %s needs exactly one integer argument.", ci->values[0].value.string);
 				continue;
 			}
-			temp.interval = item->values[0].value.number;
+			host->interval = item->values[0].value.number;
 		} else if (!strcasecmp(item->key, "GetVolumePerfData")) {
-			cna_config_volume_performance(&temp, item);
+			cna_config_volume_performance(host, item);
 		} else if (!strcasecmp(item->key, "GetSystemPerfData")) {
-			cna_config_system(&temp, item, &default_service);
+			cna_config_system(host, item, &default_service);
 		} else if (!strcasecmp(item->key, "GetWaflPerfData")) {
-			cna_config_wafl(&temp, item);
+			cna_config_wafl(host, item);
 		} else if (!strcasecmp(item->key, "GetDiskPerfData")) {
-			cna_config_disk(&temp, item);
+			cna_config_disk(host, item);
 		} else if (!strcasecmp(item->key, "GetVolumeData")) {
-			cna_config_volume_usage(&temp, item);
+			cna_config_volume_usage(host, item);
 		} else {
 			WARNING("netapp plugin: Ignoring unknown config option \"%s\" in host block \"%s\".",
 					item->key, ci->values[0].value.string);
 		}
+
+		if (status != 0)
+			break;
 	}
-	
-	if (!temp.host) temp.host = temp.name;
-	if (!temp.port) temp.port = temp.protocol == NA_SERVER_TRANSPORT_HTTP ? 80 : 443;
-	if (!temp.username) {
-		WARNING("netapp plugin: Please supply login information for host \"%s\". Ignoring host block.", temp.name);
-		return 0;
+
+	if (host->host == NULL)
+		host->host = strdup (host->name);
+
+	if (host->host == NULL)
+		status = -1;
+
+	if (host->port <= 0)
+		host->port = (host->protocol == NA_SERVER_TRANSPORT_HTTP) ? 80 : 443;
+
+	if ((host->username == NULL) || (host->password == NULL)) {
+		WARNING("netapp plugin: Please supply login information for host \"%s\". "
+				"Ignoring host block.", host->name);
+		status = -1;
+	}
+
+	if (status != 0)
+	{
+		free_host_config (host);
+		return (NULL);
 	}
-	for (hc = host_config; hc; hc = hc->next) {
-		if (!strcasecmp(hc->name, temp.name)) WARNING("netapp plugin: Duplicate definition of host \"%s\". This is probably a bad idea.", hc->name);
+
+	for (hc = global_host_config; hc; hc = hc->next) {
+		if (!strcasecmp(hc->name, host->name)) WARNING("netapp plugin: Duplicate definition of host \"%s\". This is probably a bad idea.", hc->name);
 	}
-	host = malloc(sizeof(*host));
-	*host = temp;
-	host->name = strdup(temp.name);
-	host->protocol = temp.protocol;
-	host->host = strdup(temp.host);
-	host->username = strdup(temp.username);
-	host->password = strdup(temp.password);
-	host->next = host_config;
-	host_config = host;
 	return host;
 } /* }}} host_config_t *cna_config_host */
 
@@ -1406,34 +1483,46 @@ static int cna_init(void) { /* {{{ */
 	host_config_t *host;
 	cfg_service_t *service;
 	
-	if (!host_config) {
+	if (!global_host_config) {
 		WARNING("netapp plugin: Plugin loaded but no hosts defined.");
 		return 1;
 	}
 
+	memset (err, 0, sizeof (err));
 	if (!na_startup(err, sizeof(err))) {
+		err[sizeof (err) - 1] = 0;
 		ERROR("netapp plugin: Error initializing netapp API: %s", err);
 		return 1;
 	}
 
-	for (host = host_config; host; host = host->next) {
-		host->srv = na_server_open(host->host, 1, 1); 
-		na_server_set_transport_type(host->srv, host->protocol, 0);
+	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;
+		}
+
+		if (host->interval < interval_g)
+			host->interval = interval_g;
+
+		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);
+		na_server_set_timeout(host->srv, 5 /* seconds */);
+
 		for (service = host->services; service; service = service->next) {
 			service->interval = host->interval * service->multiplier;
+
 			if (service->handler == collect_perf_system_data) {
 				service->query = na_elem_new("perf-object-get-instances");
 				na_child_add_string(service->query, "objectname", "system");
 			} else if (service->handler == query_volume_perf_data) {
 				service->query = na_elem_new("perf-object-get-instances");
 				na_child_add_string(service->query, "objectname", "volume");
-/*				e = na_elem_new("instances");
-				na_child_add_string(e, "foo", "system");
-				na_child_add(root, e);*/
 				e = na_elem_new("counters");
 				na_child_add_string(e, "foo", "read_ops");
 				na_child_add_string(e, "foo", "write_ops");
@@ -1445,9 +1534,6 @@ static int cna_init(void) { /* {{{ */
 			} else if (service->handler == query_wafl_data) {
 				service->query = na_elem_new("perf-object-get-instances");
 				na_child_add_string(service->query, "objectname", "wafl");
-/*				e = na_elem_new("instances");
-				na_child_add_string(e, "foo", "system");
-				na_child_add(root, e);*/
 				e = na_elem_new("counters");
 				na_child_add_string(e, "foo", "name_cache_hit");
 				na_child_add_string(e, "foo", "name_cache_miss");
@@ -1489,7 +1575,29 @@ static int cna_config (oconfig_item_t *ci) { /* {{{ */
 
 		/* if (!item || !item->key || !*item->key) continue; */
 		if (!strcasecmp(item->key, "Host")) {
-			cna_config_host(item, &default_host, &default_service);
+			host_config_t *host;
+			host_config_t *tmp;
+
+			host = cna_config_host(item, &default_host, &default_service);
+			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);
+
+				if (tmp->next == NULL)
+					break;
+			}
+
+			host->next = NULL;
+			if (tmp == NULL)
+				global_host_config = host;
+			else
+				tmp->next = host;
 		} else {
 			WARNING("netapp plugin: Ignoring unknown config option \"%s\".", item->key);
 		}
@@ -1502,7 +1610,7 @@ static int cna_read(void) { /* {{{ */
 	host_config_t *host;
 	cfg_service_t *service;
 	
-	for (host = host_config; host; host = host->next) {
+	for (host = global_host_config; host; host = host->next) {
 		for (service = host->services; service; service = service->next) {
 			if (--service->skip_countdown > 0) continue;
 			service->skip_countdown = service->multiplier;