X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnetapp.c;h=f761e290dfb509432f24fa6a2b5f6e517c2e5963;hb=6518cae7c97b5bb1ac3e1d1eca841fe41b5cb656;hp=ac595c2bcb35f8875fff280f26eba07e3f90c4f6;hpb=77a69360da55e89f2ede7b5c8942703221bfde9a;p=collectd.git diff --git a/src/netapp.c b/src/netapp.c index ac595c2b..f761e290 100644 --- a/src/netapp.c +++ b/src/netapp.c @@ -1524,7 +1524,7 @@ static int cna_change_volume_status (const char *hostname, /* {{{ */ { notification_t n; - memset (&n, 0, sizeof (&n)); + memset (&n, 0, sizeof (n)); n.time = cdtime (); sstrncpy (n.host, hostname, sizeof (n.host)); sstrncpy (n.plugin, "netapp", sizeof (n.plugin)); @@ -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); }