X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnetapp.c;h=f446d597de1f27610b0be1c7e2cfde8957509a79;hb=baf396c9088643cfd6578edc5c6fb3012750c685;hp=e65ec0e6ee78d390e77832fb9d2f8967bfb8650f;hpb=194379810c9113c8eedd79c883ab6e960e5b4162;p=collectd.git diff --git a/src/netapp.c b/src/netapp.c index e65ec0e6..f446d597 100644 --- a/src/netapp.c +++ b/src/netapp.c @@ -1,6 +1,7 @@ /** * collectd - src/netapp.c * Copyright (C) 2009,2010 Sven Trenkel + * Copyright (C) 2012-2013 teamix GmbH * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -21,7 +22,8 @@ * DEALINGS IN THE SOFTWARE. * * Authors: - * Sven Trenkel + * Sven Trenkel + * Sebastian 'tokkee' Harl **/ #include "collectd.h" @@ -181,16 +183,18 @@ typedef struct { * * \brief Configuration struct for volume usage data (free / used). */ -#define CFG_VOLUME_USAGE_DF 0x0002 -#define CFG_VOLUME_USAGE_SNAP 0x0004 -#define CFG_VOLUME_USAGE_ALL 0x0006 -#define HAVE_VOLUME_USAGE_NORM_FREE 0x0010 -#define HAVE_VOLUME_USAGE_NORM_USED 0x0020 -#define HAVE_VOLUME_USAGE_SNAP_RSVD 0x0040 -#define HAVE_VOLUME_USAGE_SNAP_USED 0x0080 -#define HAVE_VOLUME_USAGE_SIS_SAVED 0x0100 -#define HAVE_VOLUME_USAGE_ALL 0x01f0 -#define IS_VOLUME_USAGE_OFFLINE 0x0200 +#define CFG_VOLUME_USAGE_DF 0x0002 +#define CFG_VOLUME_USAGE_SNAP 0x0004 +#define CFG_VOLUME_USAGE_ALL 0x0006 +#define HAVE_VOLUME_USAGE_NORM_FREE 0x0010 +#define HAVE_VOLUME_USAGE_NORM_USED 0x0020 +#define HAVE_VOLUME_USAGE_SNAP_RSVD 0x0040 +#define HAVE_VOLUME_USAGE_SNAP_USED 0x0080 +#define HAVE_VOLUME_USAGE_SIS_SAVED 0x0100 +#define HAVE_VOLUME_USAGE_COMPRESS_SAVED 0x0200 +#define HAVE_VOLUME_USAGE_DEDUP_SAVED 0x0400 +#define HAVE_VOLUME_USAGE_ALL 0x07f0 +#define IS_VOLUME_USAGE_OFFLINE 0x0800 struct data_volume_usage_s; typedef struct data_volume_usage_s data_volume_usage_t; struct data_volume_usage_s { @@ -204,6 +208,8 @@ struct data_volume_usage_s { uint64_t snap_reserved; uint64_t snap_used; uint64_t sis_saved; + uint64_t compress_saved; + uint64_t dedup_saved; data_volume_usage_t *next; }; @@ -219,6 +225,16 @@ typedef struct { } cfg_volume_usage_t; /* }}} cfg_volume_usage_t */ +/*! Data types for quota statistics {{{ + * + * \brief Persistent data for quota statistics + */ +typedef struct { + cna_interval_t interval; + na_elem_t *query; +} cfg_quota_t; +/* }}} cfg_quota_t */ + /*! Data types for SnapVault statistics {{{ * * \brief Persistent data for SnapVault(R) statistics @@ -260,6 +276,7 @@ struct host_config_s { cfg_disk_t *cfg_disk; cfg_volume_perf_t *cfg_volume_perf; cfg_volume_usage_t *cfg_volume_usage; + cfg_quota_t *cfg_quota; cfg_snapvault_t *cfg_snapvault; cfg_system_t *cfg_system; @@ -366,6 +383,17 @@ static void free_cfg_volume_usage (cfg_volume_usage_t *cvu) /* {{{ */ sfree (cvu); } /* }}} void free_cfg_volume_usage */ +static void free_cfg_quota (cfg_quota_t *q) /* {{{ */ +{ + if (q == NULL) + return; + + if (q->query != NULL) + na_elem_free (q->query); + + sfree (q); +} /* }}} void free_cfg_quota */ + static void free_cfg_snapvault (cfg_snapvault_t *sv) /* {{{ */ { if (sv == NULL) @@ -407,6 +435,7 @@ static void free_host_config (host_config_t *hc) /* {{{ */ free_cfg_wafl (hc->cfg_wafl); free_cfg_volume_perf (hc->cfg_volume_perf); free_cfg_volume_usage (hc->cfg_volume_usage); + free_cfg_quota (hc->cfg_quota); free_cfg_snapvault (hc->cfg_snapvault); free_cfg_system (hc->cfg_system); @@ -700,7 +729,7 @@ static int submit_cache_ratio (const char *host, /* {{{ */ /* Submits all the caches used by WAFL. Uses "submit_cache_ratio". */ static int submit_wafl_data (const char *hostname, const char *instance, /* {{{ */ - cfg_wafl_t *old_data, const cfg_wafl_t *new_data, int interval) + cfg_wafl_t *old_data, const cfg_wafl_t *new_data, cdtime_t interval) { /* Submit requested counters */ if (HAS_ALL_FLAGS (old_data->flags, CFG_WAFL_NAME_CACHE | HAVE_WAFL_NAME_CACHE) @@ -861,7 +890,7 @@ static cdtime_t cna_child_get_cdtime (na_elem_t *data) /* {{{ */ */ /* Data corresponding to */ static int cna_handle_wafl_data (const char *hostname, cfg_wafl_t *cfg_wafl, /* {{{ */ - na_elem_t *data, int interval) + na_elem_t *data, cdtime_t interval) { cfg_wafl_t perf_data; const char *plugin_inst; @@ -1014,7 +1043,8 @@ static int cna_query_wafl (host_config_t *host) /* {{{ */ return (-1); } - status = cna_handle_wafl_data (host->name, host->cfg_wafl, data, host->interval); + status = cna_handle_wafl_data (host->name, host->cfg_wafl, data, + host->cfg_wafl->interval.interval); if (status == 0) host->cfg_wafl->interval.last_read = now; @@ -1209,7 +1239,8 @@ static int cna_query_disk (host_config_t *host) /* {{{ */ return (-1); } - status = cna_handle_disk_data (host->name, host->cfg_disk, data, host->interval); + status = cna_handle_disk_data (host->name, host->cfg_disk, data, + host->cfg_disk->interval.interval); if (status == 0) host->cfg_disk->interval.last_read = now; @@ -1380,7 +1411,8 @@ static int cna_query_volume_perf (host_config_t *host) /* {{{ */ return (-1); } - status = cna_handle_volume_perf_data (host->name, host->cfg_volume_perf, data, host->interval); + status = cna_handle_volume_perf_data (host->name, host->cfg_volume_perf, data, + host->cfg_volume_perf->interval.interval); if (status == 0) host->cfg_volume_perf->interval.last_read = now; @@ -1402,6 +1434,8 @@ static int cna_submit_volume_usage_data (const char *hostname, /* {{{ */ uint64_t norm_used = v->norm_used; uint64_t norm_free = v->norm_free; uint64_t sis_saved = v->sis_saved; + uint64_t compress_saved = v->compress_saved; + uint64_t dedup_saved = v->dedup_saved; uint64_t snap_reserve_used = 0; uint64_t snap_reserve_free = v->snap_reserved; uint64_t snap_norm_used = v->snap_used; @@ -1446,6 +1480,16 @@ static int cna_submit_volume_usage_data (const char *hostname, /* {{{ */ "df_complex", "sis_saved", (double) sis_saved, /* timestamp = */ 0, interval); + if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_COMPRESS_SAVED)) + submit_double (hostname, /* plugin instance = */ plugin_instance, + "df_complex", "compression_saved", + (double) compress_saved, /* timestamp = */ 0, interval); + + if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_DEDUP_SAVED)) + submit_double (hostname, /* plugin instance = */ plugin_instance, + "df_complex", "dedup_saved", + (double) dedup_saved, /* timestamp = */ 0, interval); + if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_NORM_USED)) submit_double (hostname, /* plugin instance = */ plugin_instance, "df_complex", "used", @@ -1554,6 +1598,101 @@ static void cna_handle_volume_snap_usage(const host_config_t *host, /* {{{ */ v->flags |= HAVE_VOLUME_USAGE_SNAP_USED; } /* }}} void cna_handle_volume_snap_usage */ +static void cna_handle_volume_sis_data (const host_config_t *host, /* {{{ */ + data_volume_usage_t *v, na_elem_t *sis) +{ + const char *sis_state; + uint64_t sis_saved_reported; + + if (na_elem_child(sis, "sis-info")) + sis = na_elem_child(sis, "sis-info"); + + sis_state = na_child_get_string(sis, "state"); + if (sis_state == NULL) + return; + + /* If SIS is not enabled, there's nothing left to do for this volume. */ + if (strcmp ("enabled", sis_state) != 0) + return; + + sis_saved_reported = na_child_get_uint64(sis, "size-saved", UINT64_MAX); + if (sis_saved_reported == UINT64_MAX) + return; + + /* size-saved is actually a 32 bit number, so ... time for some guesswork. */ + if ((sis_saved_reported >> 32) != 0) { + /* In case they ever fix this bug. */ + v->sis_saved = sis_saved_reported; + v->flags |= HAVE_VOLUME_USAGE_SIS_SAVED; + } else { /* really hacky work-around code. {{{ */ + uint64_t sis_saved_percent; + uint64_t sis_saved_guess; + uint64_t overflow_guess; + uint64_t guess1, guess2, guess3; + + /* Check if we have v->norm_used. Without it, we cannot calculate + * sis_saved_guess. */ + if ((v->flags & HAVE_VOLUME_USAGE_NORM_USED) == 0) + return; + + sis_saved_percent = na_child_get_uint64(sis, "percentage-saved", UINT64_MAX); + if (sis_saved_percent > 100) + return; + + /* The "size-saved" value is a 32bit unsigned integer. This is a bug and + * will hopefully be fixed in later versions. To work around the bug, try + * to figure out how often the 32bit integer wrapped around by using the + * "percentage-saved" value. Because the percentage is in the range + * [0-100], this should work as long as the saved space does not exceed + * 400 GBytes. */ + /* percentage-saved = size-saved / (size-saved + size-used) */ + if (sis_saved_percent < 100) + sis_saved_guess = v->norm_used * sis_saved_percent / (100 - sis_saved_percent); + else + sis_saved_guess = v->norm_used; + + overflow_guess = sis_saved_guess >> 32; + guess1 = overflow_guess ? ((overflow_guess - 1) << 32) + sis_saved_reported : sis_saved_reported; + guess2 = (overflow_guess << 32) + sis_saved_reported; + guess3 = ((overflow_guess + 1) << 32) + sis_saved_reported; + + if (sis_saved_guess < guess2) { + if ((sis_saved_guess - guess1) < (guess2 - sis_saved_guess)) + v->sis_saved = guess1; + else + v->sis_saved = guess2; + } else { + if ((sis_saved_guess - guess2) < (guess3 - sis_saved_guess)) + v->sis_saved = guess2; + else + v->sis_saved = guess3; + } + v->flags |= HAVE_VOLUME_USAGE_SIS_SAVED; + } /* }}} end of 32-bit workaround */ +} /* }}} void cna_handle_volume_sis_data */ + +/* ONTAP >= 8.1 uses SIS for managing dedup and compression */ +static void cna_handle_volume_sis_saved (const host_config_t *host, /* {{{ */ + data_volume_usage_t *v, na_elem_t *sis) +{ + uint64_t saved; + + if (na_elem_child(sis, "sis-info")) + sis = na_elem_child(sis, "sis-info"); + + saved = na_child_get_uint64(sis, "compress-saved", UINT64_MAX); + if (saved != UINT64_MAX) { + v->compress_saved = saved; + v->flags |= HAVE_VOLUME_USAGE_COMPRESS_SAVED; + } + + saved = na_child_get_uint64(sis, "dedup-saved", UINT64_MAX); + if (saved != UINT64_MAX) { + v->dedup_saved = saved; + v->flags |= HAVE_VOLUME_USAGE_DEDUP_SAVED; + } +} /* }}} void cna_handle_volume_sis_saved */ + static int cna_handle_volume_usage_data (const host_config_t *host, /* {{{ */ cfg_volume_usage_t *cfg_volume, na_elem_t *data) { @@ -1581,8 +1720,6 @@ static int cna_handle_volume_usage_data (const host_config_t *host, /* {{{ */ uint64_t value; na_elem_t *sis; - const char *sis_state; - uint64_t sis_saved_reported; volume_name = na_child_get_string (elem_volume, "name"); if (volume_name == NULL) @@ -1624,77 +1761,14 @@ static int cna_handle_volume_usage_data (const host_config_t *host, /* {{{ */ } sis = na_elem_child(elem_volume, "sis"); - if (sis == NULL) - continue; - - if (na_elem_child(sis, "sis-info")) - sis = na_elem_child(sis, "sis-info"); - - sis_state = na_child_get_string(sis, "state"); - if (sis_state == NULL) - continue; - - /* If SIS is not enabled, there's nothing left to do for this volume. */ - if (strcmp ("enabled", sis_state) != 0) - continue; - - sis_saved_reported = na_child_get_uint64(sis, "size-saved", UINT64_MAX); - if (sis_saved_reported == UINT64_MAX) - continue; - - /* size-saved is actually a 32 bit number, so ... time for some guesswork. */ - if ((sis_saved_reported >> 32) != 0) { - /* In case they ever fix this bug. */ - v->sis_saved = sis_saved_reported; - v->flags |= HAVE_VOLUME_USAGE_SIS_SAVED; - } else { /* really hacky work-around code. {{{ */ - uint64_t sis_saved_percent; - uint64_t sis_saved_guess; - uint64_t overflow_guess; - uint64_t guess1, guess2, guess3; - - /* Check if we have v->norm_used. Without it, we cannot calculate - * sis_saved_guess. */ - if ((v->flags & HAVE_VOLUME_USAGE_NORM_USED) == 0) - continue; - - sis_saved_percent = na_child_get_uint64(sis, "percentage-saved", UINT64_MAX); - if (sis_saved_percent > 100) - continue; - - /* The "size-saved" value is a 32bit unsigned integer. This is a bug and - * will hopefully be fixed in later versions. To work around the bug, try - * to figure out how often the 32bit integer wrapped around by using the - * "percentage-saved" value. Because the percentage is in the range - * [0-100], this should work as long as the saved space does not exceed - * 400 GBytes. */ - /* percentage-saved = size-saved / (size-saved + size-used) */ - if (sis_saved_percent < 100) - sis_saved_guess = v->norm_used * sis_saved_percent / (100 - sis_saved_percent); - else - sis_saved_guess = v->norm_used; - - overflow_guess = sis_saved_guess >> 32; - guess1 = overflow_guess ? ((overflow_guess - 1) << 32) + sis_saved_reported : sis_saved_reported; - guess2 = (overflow_guess << 32) + sis_saved_reported; - guess3 = ((overflow_guess + 1) << 32) + sis_saved_reported; - - if (sis_saved_guess < guess2) { - if ((sis_saved_guess - guess1) < (guess2 - sis_saved_guess)) - v->sis_saved = guess1; - else - v->sis_saved = guess2; - } else { - if ((sis_saved_guess - guess2) < (guess3 - sis_saved_guess)) - v->sis_saved = guess2; - else - v->sis_saved = guess3; - } - v->flags |= HAVE_VOLUME_USAGE_SIS_SAVED; - } /* }}} end of 32-bit workaround */ + if (sis != NULL) { + cna_handle_volume_sis_data (host, v, sis); + cna_handle_volume_sis_saved (host, v, sis); + } } /* for (elem_volume) */ - return (cna_submit_volume_usage_data (host->name, cfg_volume, host->interval)); + return (cna_submit_volume_usage_data (host->name, cfg_volume, + host->cfg_volume_usage->interval.interval)); } /* }}} int cna_handle_volume_usage_data */ static int cna_setup_volume_usage (cfg_volume_usage_t *cvu) /* {{{ */ @@ -1756,6 +1830,132 @@ static int cna_query_volume_usage (host_config_t *host) /* {{{ */ return (status); } /* }}} int cna_query_volume_usage */ +/* Data corresponding to */ +static int cna_handle_quota_data (const host_config_t *host, /* {{{ */ + cfg_quota_t *cfg_quota, na_elem_t *data) +{ + na_elem_t *elem_quota; + na_elem_t *elem_quotas; + na_elem_iter_t iter_quota; + + elem_quotas = na_elem_child (data, "quotas"); + if (elem_quotas == NULL) + { + ERROR ("netapp plugin: cna_handle_quota_data: " + "na_elem_child (\"quotas\") failed " + "for host %s.", host->name); + return (-1); + } + + iter_quota = na_child_iterator (elem_quotas); + for (elem_quota = na_iterator_next (&iter_quota); + elem_quota != NULL; + elem_quota = na_iterator_next (&iter_quota)) + { + const char *quota_type, *volume_name, *tree_name; + uint64_t value; + + char plugin_instance[DATA_MAX_NAME_LEN]; + + quota_type = na_child_get_string (elem_quota, "quota-type"); + if (quota_type == NULL) + continue; + + /* possible TODO: support other types as well */ + if (strcmp (quota_type, "tree") != 0) + continue; + + tree_name = na_child_get_string (elem_quota, "tree"); + if ((tree_name == NULL) || (*tree_name == '\0')) + continue; + + volume_name = na_child_get_string (elem_quota, "volume"); + if (volume_name == NULL) + continue; + + ssnprintf (plugin_instance, sizeof (plugin_instance), + "quota-%s-%s", volume_name, tree_name); + + value = na_child_get_uint64 (elem_quota, "disk-used", UINT64_MAX); + if (value != UINT64_MAX) { + value *= 1024; /* disk-used reports kilobytes */ + submit_double (host->name, plugin_instance, + /* type = */ "df_complex", /* type instance = */ NULL, + (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->cfg_quota->interval.interval); + } + } /* for (elem_quota) */ + + return (0); +} /* }}} int cna_handle_volume_usage_data */ + +static int cna_setup_quota (cfg_quota_t *cq) /* {{{ */ +{ + if (cq == NULL) + return (EINVAL); + + if (cq->query != NULL) + return (0); + + cq->query = na_elem_new ("quota-report"); + if (cq->query == NULL) + { + ERROR ("netapp plugin: na_elem_new failed."); + return (-1); + } + + return (0); +} /* }}} int cna_setup_quota */ + +static int cna_query_quota (host_config_t *host) /* {{{ */ +{ + na_elem_t *data; + int status; + cdtime_t now; + + if (host == NULL) + return (EINVAL); + + /* If the user did not configure quota statistics, return without + * doing anything. */ + if (host->cfg_quota == NULL) + return (0); + + now = cdtime (); + if ((host->cfg_quota->interval.interval + host->cfg_quota->interval.last_read) > now) + return (0); + + status = cna_setup_quota (host->cfg_quota); + if (status != 0) + return (status); + assert (host->cfg_quota->query != NULL); + + data = na_server_invoke_elem (host->srv, host->cfg_quota->query); + if (na_results_status (data) != NA_OK) + { + ERROR ("netapp plugin: cna_query_quota: na_server_invoke_elem failed for host %s: %s", + host->name, na_results_reason (data)); + na_elem_free (data); + return (-1); + } + + status = cna_handle_quota_data (host, host->cfg_quota, data); + + if (status == 0) + host->cfg_quota->interval.last_read = now; + + na_elem_free (data); + return (status); +} /* }}} int cna_query_quota */ + /* Data corresponding to */ static int cna_handle_snapvault_data (const char *hostname, /* {{{ */ cfg_snapvault_t *cfg_snapvault, na_elem_t *data, cdtime_t interval) @@ -1848,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); } @@ -2065,7 +2266,8 @@ static int cna_query_system (host_config_t *host) /* {{{ */ return (-1); } - status = cna_handle_system_data (host->name, host->cfg_system, data, host->interval); + status = cna_handle_system_data (host->name, host->cfg_system, data, + host->cfg_system->interval.interval); if (status == 0) host->cfg_system->interval.last_read = now; @@ -2320,6 +2522,40 @@ static void cna_config_volume_usage_default (cfg_volume_usage_t *cvu, /* {{{ */ ignorelist_set_invert (il, /* invert = */ 1); } /* }}} void cna_config_volume_usage_default */ +/* Corresponds to a block */ +static int cna_config_quota (host_config_t *host, oconfig_item_t *ci) /* {{{ */ +{ + cfg_quota_t *cfg_quota; + int i; + + if ((host == NULL) || (ci == NULL)) + return (EINVAL); + + if (host->cfg_quota == NULL) + { + cfg_quota = malloc (sizeof (*cfg_quota)); + if (cfg_quota == NULL) + return (ENOMEM); + memset (cfg_quota, 0, sizeof (*cfg_quota)); + cfg_quota->query = NULL; + + host->cfg_quota = cfg_quota; + } + cfg_quota = host->cfg_quota; + + for (i = 0; i < ci->children_num; ++i) { + oconfig_item_t *item = ci->children + i; + + if (strcasecmp (item->key, "Interval") == 0) + cna_config_get_interval (item, &cfg_quota->interval); + else + WARNING ("netapp plugin: The option %s is not allowed within " + "`Quota' blocks.", item->key); + } + + return (0); +} /* }}} int cna_config_quota */ + /* Corresponds to a block */ static int cna_config_disk(host_config_t *host, oconfig_item_t *ci) { /* {{{ */ cfg_disk_t *cfg_disk; @@ -2607,6 +2843,7 @@ static host_config_t *cna_alloc_host (void) /* {{{ */ host->cfg_disk = NULL; host->cfg_volume_perf = NULL; host->cfg_volume_usage = NULL; + host->cfg_quota = NULL; host->cfg_snapvault = NULL; host->cfg_system = NULL; @@ -2746,6 +2983,8 @@ static int cna_config_host (host_config_t *host, /* {{{ */ cna_config_volume_performance(host, item); } else if (!strcasecmp(item->key, "VolumeUsage")) { cna_config_volume_usage(host, item); + } else if (!strcasecmp(item->key, "Quota")) { + cna_config_quota(host, item); } else if (!strcasecmp(item->key, "SnapVault")) { cna_config_snapvault(host, item); } else if (!strcasecmp(item->key, "System")) { @@ -2880,6 +3119,10 @@ static int cna_read_internal (host_config_t *host) { /* {{{ */ if (status != 0) return (status); + status = cna_query_quota (host); + if (status != 0) + return (status); + status = cna_query_snapvault (host); if (status != 0) return (status);