From 1de709a53e48795be10bbc3a875520c1a5d60217 Mon Sep 17 00:00:00 2001
From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 29 Sep 2009 16:37:48 +0200
Subject: [PATCH] =?utf8?q?netapp=20plugin:=20Rename=20the=20=E2=80=9CCapac?=
 =?utf8?q?ity=E2=80=9D=20and=20=E2=80=9CSnapshot=E2=80=9D=20options=20agai?=
 =?utf8?q?n.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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.
---
 src/collectd.conf.pod | 28 ++++++++++++++--------------
 src/netapp.c          | 30 +++++++++++++++---------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index f3f2f48f..ff44ba15 100644
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -1691,11 +1691,11 @@ Required capabilities are documented below.
     </VolumePerf>
     
     <VolumeUsage>
-      Capacity "vol0"
-      Capacity "vol1"
+      GetCapacity "vol0"
+      GetCapacity "vol1"
       IgnoreSelectedCapacity false
-      Snapshot "vol1"
-      Snapshot "vol3"
+      GetSnapshot "vol1"
+      GetSnapshot "vol3"
       IgnoreSelectedSnapshot false
     </VolumeUsage>
     
@@ -2035,7 +2035,7 @@ capability.
 
 =over 4
 
-=item B<Capacity> I<VolumeName>
+=item B<GetCapacity> I<VolumeName>
 
 The current capacity of the volume will be collected. This will result in two
 to four value lists, depending on the configuration of the volume. All data
@@ -2057,12 +2057,12 @@ Repeat this option to specify multiple volumes.
 
 =item B<IgnoreSelectedCapacity> B<true>|B<false>
 
-Specify whether to collect only the volumes selected by the B<Capacity> option
-or to ignore those volumes. B<IgnoreSelectedCapacity> defaults to B<false>.
-However, if no B<Capacity> option is specified at all, all capacities will be
-selected anyway.
+Specify whether to collect only the volumes selected by the B<GetCapacity>
+option or to ignore those volumes. B<IgnoreSelectedCapacity> defaults to
+B<false>. However, if no B<GetCapacity> option is specified at all, all
+capacities will be selected anyway.
 
-=item B<Snapshot> I<VolumeName>
+=item B<GetSnapshot> I<VolumeName>
 
 B<Defunct!> Select volumes from which to collect snapshot information.
 
@@ -2070,10 +2070,10 @@ Repeat this option to specify multiple volumes.
 
 =item B<IgnoreSelectedSnapshot>
 
-Specify whether to collect only the volumes selected by the B<Snapshot> option
-or to ignore those volumes. B<IgnoreSelectedSnapshot> defaults to B<false>.
-However, if no B<Snapshot> option is specified at all, all capacities will be
-selected anyway.
+Specify whether to collect only the volumes selected by the B<GetSnapshot>
+option or to ignore those volumes. B<IgnoreSelectedSnapshot> defaults to
+B<false>. However, if no B<GetSnapshot> option is specified at all, all
+capacities will be selected anyway.
 
 =back
 
diff --git a/src/netapp.c b/src/netapp.c
index d8077e2b..bea86f65 100644
--- a/src/netapp.c
+++ b/src/netapp.c
@@ -1923,8 +1923,8 @@ static int cna_config_volume_performance (host_config_t *host, /* {{{ */
 	return (0);
 } /* }}} int cna_config_volume_performance */
 
-/* Handling of the "Capacity" and "Snapshot" options within a <VolumeUsage />
- * block. */
+/* Handling of the "GetCapacity" and "GetSnapshot" options within a
+ * <VolumeUsage /> block. */
 static void cna_config_volume_usage_option (cfg_volume_usage_t *cvu, /* {{{ */
 		const oconfig_item_t *ci)
 {
@@ -1940,9 +1940,9 @@ static void cna_config_volume_usage_option (cfg_volume_usage_t *cvu, /* {{{ */
 
 	name = ci->values[0].value.string;
 
-	if (strcasecmp ("Capacity", ci->key) == 0)
+	if (strcasecmp ("GetCapacity", ci->key) == 0)
 		il = cvu->il_capacity;
-	else if (strcasecmp ("Snapshot", ci->key) == 0)
+	else if (strcasecmp ("GetSnapshot", ci->key) == 0)
 		il = cvu->il_snapshot;
 	else
 		return;
@@ -2076,17 +2076,17 @@ static int cna_config_wafl(host_config_t *host, oconfig_item_t *ci) /* {{{ */
 
 /*
  * <VolumeUsage>
- *   Capacity "vol0"
- *   Capacity "vol1"
- *   Capacity "vol2"
- *   Capacity "vol3"
- *   Capacity "vol4"
+ *   GetCapacity "vol0"
+ *   GetCapacity "vol1"
+ *   GetCapacity "vol2"
+ *   GetCapacity "vol3"
+ *   GetCapacity "vol4"
  *   IgnoreSelectedCapacity false
  *
- *   Snapshot "vol0"
- *   Snapshot "vol3"
- *   Snapshot "vol4"
- *   Snapshot "vol7"
+ *   GetSnapshot "vol0"
+ *   GetSnapshot "vol3"
+ *   GetSnapshot "vol4"
+ *   GetSnapshot "vol7"
  *   IgnoreSelectedSnapshot false
  * </VolumeUsage>
  */
@@ -2136,9 +2136,9 @@ static int cna_config_volume_usage(host_config_t *host, /* {{{ */
 		/* if (!item || !item->key || !*item->key) continue; */
 		if (strcasecmp(item->key, "Interval") == 0)
 			cna_config_get_interval (item, &cfg_volume_usage->interval);
-		else if (!strcasecmp(item->key, "Capacity"))
+		else if (!strcasecmp(item->key, "GetCapacity"))
 			cna_config_volume_usage_option (cfg_volume_usage, item);
-		else if (!strcasecmp(item->key, "Snapshot"))
+		else if (!strcasecmp(item->key, "GetSnapshot"))
 			cna_config_volume_usage_option (cfg_volume_usage, item);
 		else if (!strcasecmp(item->key, "IgnoreSelectedCapacity"))
 			cna_config_volume_usage_default (cfg_volume_usage, item);
-- 
2.30.2