From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 28 Sep 2009 14:05:55 +0000 (+0200)
Subject: netapp plugin: Inform the user when he screwed up the disk and system blocks, too.
X-Git-Tag: collectd-4.9.0~73^2~19
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a0e8f66ddd88bfff5fb1994b43b4a858ed4b6de3;p=collectd.git

netapp plugin: Inform the user when he screwed up the disk and system blocks, too.
---

diff --git a/src/netapp.c b/src/netapp.c
index c2ebc9f9..55f449b7 100644
--- a/src/netapp.c
+++ b/src/netapp.c
@@ -279,10 +279,24 @@ static void free_cfg_disk (cfg_disk_t *cfg_disk) /* {{{ */
 	if (cfg_disk == NULL)
 		return;
 
+	if (cfg_disk->query != NULL)
+		na_elem_free (cfg_disk->query);
+
 	free_disk (cfg_disk->disks);
 	sfree (cfg_disk);
 } /* }}} void free_cfg_disk */
 
+static void free_cfg_system (cfg_system_t *cs) /* {{{ */
+{
+	if (cs == NULL)
+		return;
+
+	if (cs->query != NULL)
+		na_elem_free (cs->query);
+
+	sfree (cs);
+} /* }}} void free_cfg_system */
+
 static void free_cfg_service (cfg_service_t *service) /* {{{ */
 {
 	cfg_service_t *next;
@@ -317,6 +331,7 @@ static void free_host_config (host_config_t *hc) /* {{{ */
 	free_cfg_service (hc->services);
 	free_cfg_disk (hc->cfg_disk);
 	free_cfg_wafl (hc->cfg_wafl);
+	free_cfg_system (hc->cfg_system);
 	free_volume (hc->volumes);
 
 	sfree (hc);
@@ -1663,6 +1678,14 @@ static int cna_config_disk(host_config_t *host, oconfig_item_t *ci) { /* {{{ */
 			cna_config_bool_to_flag (item, &cfg_disk->flags, CFG_DISK_BUSIEST);
 	}
 
+	if ((cfg_disk->flags & CFG_DISK_ALL) == 0)
+	{
+		NOTICE ("netapp plugin: All disk related values have been disabled. "
+				"Collection of per-disk data will be disabled entirely.");
+		free_cfg_disk (host->cfg_disk);
+		host->cfg_disk = NULL;
+	}
+
 	return (0);
 } /* }}} int cna_config_disk */
 
@@ -1762,6 +1785,14 @@ static int cna_config_system (host_config_t *host, /* {{{ */
 		}
 	}
 
+	if ((cfg_system->flags & CFG_SYSTEM_ALL) == 0)
+	{
+		NOTICE ("netapp plugin: All system related values have been disabled. "
+				"Collection of system data will be disabled entirely.");
+		free_cfg_system (host->cfg_system);
+		host->cfg_system = NULL;
+	}
+
 	return (0);
 } /* }}} int cna_config_system */