From: Florian Forster <octo@collectd.org>
Date: Sun, 7 Apr 2013 17:26:13 +0000 (+0200)
Subject: netapp plugin: Fix the interval used by the SnapVault and quota metrics.
X-Git-Tag: collectd-5.3.0~7
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=33fdd7d22e7e122c337b0092d3c8d26e5f3caa70;p=collectd.git

netapp plugin: Fix the interval used by the SnapVault and quota metrics.

Additional fix for Github issue #288.
---

diff --git a/src/netapp.c b/src/netapp.c
index ac595c2b..f446d597 100644
--- a/src/netapp.c
+++ b/src/netapp.c
@@ -1881,14 +1881,16 @@ static int cna_handle_quota_data (const host_config_t *host, /* {{{ */
 			value *= 1024; /* disk-used reports kilobytes */
 			submit_double (host->name, plugin_instance,
 					/* type = */ "df_complex", /* type instance = */ NULL,
-					(double)value, /* timestamp = */ 0, host->interval);
+					(double)value, /* timestamp = */ 0,
+					host->cfg_quota->interval.interval);
 		}
 
 		value = na_child_get_uint64 (elem_quota, "files-used", UINT64_MAX);
 		if (value != UINT64_MAX) {
 			submit_double (host->name, plugin_instance,
 					/* type = */ "files", /* type instance = */ NULL,
-					(double)value, /* timestamp = */ 0, host->interval);
+					(double)value, /* timestamp = */ 0,
+					host->cfg_quota->interval.interval);
 		}
 	} /* for (elem_quota) */
 
@@ -2046,7 +2048,8 @@ static int cna_handle_snapvault_iter (host_config_t *host, /* {{{ */
 			return (-1);
 		}
 
-		cna_handle_snapvault_data (host->name, host->cfg_snapvault, elem, host->interval);
+		cna_handle_snapvault_data (host->name, host->cfg_snapvault, elem,
+				host->cfg_snapvault->interval.interval);
 		na_elem_free (elem);
 	}