X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnetapp.c;h=5d100a69ca5f0eb23d5149a4f426becb6dfbd6b1;hb=853b3da5d4c6614d7db4093f57b1ca4f57b6c485;hp=c2ebc9f96efbe202147edfcdcdb5f32299279ca8;hpb=7658e9919a3ac9efafe4c7c2c76112ec67eeee3b;p=collectd.git diff --git a/src/netapp.c b/src/netapp.c index c2ebc9f9..5d100a69 100644 --- a/src/netapp.c +++ b/src/netapp.c @@ -26,8 +26,10 @@ #include "collectd.h" #include "common.h" +#include "utils_ignorelist.h" #include +#include #define HAS_ALL_FLAGS(has,needs) (((has) & (needs)) == (needs)) @@ -36,26 +38,13 @@ typedef void service_handler_t(host_config_t *host, na_elem_t *result, void *dat struct cna_interval_s { - time_t interval; - time_t last_read; + cdtime_t interval; + cdtime_t last_read; }; typedef struct cna_interval_s cna_interval_t; -/*! - * \brief Persistent data for system performance counters - */ -#define CFG_SYSTEM_CPU 0x01 -#define CFG_SYSTEM_NET 0x02 -#define CFG_SYSTEM_OPS 0x04 -#define CFG_SYSTEM_DISK 0x08 -#define CFG_SYSTEM_ALL 0x0F -typedef struct { - uint32_t flags; - cna_interval_t interval; - na_elem_t *query; -} cfg_system_t; - -/*! +/*! Data types for WAFL statistics {{{ + * * \brief Persistent data for WAFL performance counters. (a.k.a. cache performance) * * The cache counters use old counter values to calculate a hit ratio for each @@ -90,7 +79,7 @@ typedef struct { cna_interval_t interval; na_elem_t *query; - time_t timestamp; + cdtime_t timestamp; uint64_t name_cache_hit; uint64_t name_cache_miss; uint64_t find_dir_hit; @@ -100,8 +89,40 @@ typedef struct { uint64_t inode_cache_hit; uint64_t inode_cache_miss; } cfg_wafl_t; +/* }}} cfg_wafl_t */ + +/*! Data types for disk statistics {{{ + * + * \brief A disk in the NetApp. + * + * A disk doesn't have any more information than its name at the moment. + * The name includes the "disk_" prefix. + */ +#define HAVE_DISK_BUSY 0x10 +#define HAVE_DISK_BASE 0x20 +#define HAVE_DISK_ALL 0x30 +typedef struct disk_s { + char *name; + uint32_t flags; + cdtime_t timestamp; + uint64_t disk_busy; + uint64_t base_for_disk_busy; + double disk_busy_percent; + struct disk_s *next; +} disk_t; -/*! +#define CFG_DISK_BUSIEST 0x01 +#define CFG_DISK_ALL 0x01 +typedef struct { + uint32_t flags; + cna_interval_t interval; + na_elem_t *query; + disk_t *disks; +} cfg_disk_t; +/* }}} cfg_disk_t */ + +/*! Data types for volume performance statistics {{{ + * * \brief Persistent data for volume performance data. * * The code below uses the difference of the operations and latency counters to @@ -110,8 +131,8 @@ typedef struct { * kept for completeness sake. The "flags" member indicates if each counter is * valid or not. * - * The "query_volume_perf_data" function will fill a new struct of this type - * and pass both, old and new data, to "submit_volume_perf_data". In that + * The "cna_handle_volume_perf_data" function will fill a new struct of this + * type and pass both, old and new data, to "submit_volume_perf_data". In that * function, the per-operation latency is calculated and dispatched, then the * old counters are updated. */ @@ -127,88 +148,92 @@ typedef struct { #define HAVE_VOLUME_PERF_LATENCY_READ 0x0100 #define HAVE_VOLUME_PERF_LATENCY_WRITE 0x0200 #define HAVE_VOLUME_PERF_ALL 0x03F0 -typedef struct { +struct data_volume_perf_s; +typedef struct data_volume_perf_s data_volume_perf_t; +struct data_volume_perf_s { + char *name; uint32_t flags; -} cfg_volume_perf_t; + cdtime_t timestamp; -typedef struct { - uint32_t flags; - time_t timestamp; uint64_t read_bytes; uint64_t write_bytes; uint64_t read_ops; uint64_t write_ops; uint64_t read_latency; uint64_t write_latency; -} data_volume_perf_t; -/*! + data_volume_perf_t *next; +}; + +typedef struct { + cna_interval_t interval; + na_elem_t *query; + + ignorelist_t *il_octets; + ignorelist_t *il_operations; + ignorelist_t *il_latency; + + data_volume_perf_t *volumes; +} cfg_volume_perf_t; +/* }}} data_volume_perf_t */ + +/*! Data types for volume usage statistics {{{ + * * \brief Configuration struct for volume usage data (free / used). */ -#define CFG_VOLUME_USAGE_INIT 0x0001 #define CFG_VOLUME_USAGE_DF 0x0002 #define CFG_VOLUME_USAGE_SNAP 0x0004 -#define HAVE_VOLUME_USAGE_SNAP 0x0008 -typedef struct { +#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 +struct data_volume_usage_s; +typedef struct data_volume_usage_s data_volume_usage_t; +struct data_volume_usage_s { + char *name; uint32_t flags; + + na_elem_t *snap_query; + + uint64_t norm_free; + uint64_t norm_used; + uint64_t snap_reserved; uint64_t snap_used; -} cfg_volume_usage_t; + uint64_t sis_saved; + + data_volume_usage_t *next; +}; -typedef struct service_config_s { +typedef struct { + cna_interval_t interval; na_elem_t *query; - service_handler_t *handler; - int multiplier; - int skip_countdown; - int interval; - void *data; - struct service_config_s *next; -} cfg_service_t; -#define SERVICE_INIT {0, 0, 1, 1, 0, 0, 0} - -/*! - * \brief Struct representing a volume. - * - * A volume currently has a name and two sets of values: - * - * - Performance data, such as bytes read/written, number of operations - * performed and average time per operation. - * - * - Usage data, i. e. amount of used and free space in the volume. - */ -typedef struct volume_s { - char *name; - data_volume_perf_t perf_data; - cfg_volume_usage_t cfg_volume_usage; - struct volume_s *next; -} volume_t; -/*! - * \brief A disk in the NetApp. + ignorelist_t *il_capacity; + ignorelist_t *il_snapshot; + + data_volume_usage_t *volumes; +} cfg_volume_usage_t; +/* }}} cfg_volume_usage_t */ + +/*! Data types for system statistics {{{ * - * A disk doesn't have any more information than its name at the moment. - * The name includes the "disk_" prefix. + * \brief Persistent data for system performance counters */ -#define HAVE_DISK_BUSY 0x10 -#define HAVE_DISK_BASE 0x20 -#define HAVE_DISK_ALL 0x30 -typedef struct disk_s { - char *name; - uint32_t flags; - time_t timestamp; - uint64_t disk_busy; - uint64_t base_for_disk_busy; - double disk_busy_percent; - struct disk_s *next; -} disk_t; - -#define CFG_DISK_BUSIEST 0x01 -#define CFG_DISK_ALL 0x01 +#define CFG_SYSTEM_CPU 0x01 +#define CFG_SYSTEM_NET 0x02 +#define CFG_SYSTEM_OPS 0x04 +#define CFG_SYSTEM_DISK 0x08 +#define CFG_SYSTEM_ALL 0x0F typedef struct { uint32_t flags; cna_interval_t interval; na_elem_t *query; - disk_t *disks; -} cfg_disk_t; +} cfg_system_t; +/* }}} cfg_system_t */ struct host_config_s { char *name; @@ -217,44 +242,30 @@ struct host_config_s { int port; char *username; char *password; - int interval; + cdtime_t interval; na_server_t *srv; - cfg_service_t *services; - cfg_disk_t *cfg_disk; cfg_wafl_t *cfg_wafl; + cfg_disk_t *cfg_disk; + cfg_volume_perf_t *cfg_volume_perf; + cfg_volume_usage_t *cfg_volume_usage; cfg_system_t *cfg_system; - volume_t *volumes; struct host_config_s *next; }; -#define HOST_INIT { NULL, NA_SERVER_TRANSPORT_HTTPS, NULL, 0, NULL, NULL, 0, \ - NULL, NULL, NULL, NULL, \ - NULL} - -static host_config_t *global_host_config; /* * Free functions * * Used to free the various structures above. */ -static void free_volume (volume_t *volume) /* {{{ */ -{ - volume_t *next; - - next = volume->next; - - sfree (volume->name); - sfree (volume); - - free_volume (next); -} /* }}} void free_volume */ - static void free_disk (disk_t *disk) /* {{{ */ { disk_t *next; + if (disk == NULL) + return; + next = disk->next; sfree (disk->name); @@ -279,26 +290,80 @@ 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_service (cfg_service_t *service) /* {{{ */ +static void free_cfg_volume_perf (cfg_volume_perf_t *cvp) /* {{{ */ { - cfg_service_t *next; + data_volume_perf_t *data; - if (service == NULL) + if (cvp == NULL) return; - - next = service->next; - /* FIXME: Free service->data? */ - na_elem_free(service->query); - - sfree (service); + /* Free the ignorelists */ + ignorelist_free (cvp->il_octets); + ignorelist_free (cvp->il_operations); + ignorelist_free (cvp->il_latency); + + /* Free the linked list of volumes */ + data = cvp->volumes; + while (data != NULL) + { + data_volume_perf_t *next = data->next; + sfree (data->name); + sfree (data); + data = next; + } + + if (cvp->query != NULL) + na_elem_free (cvp->query); + + sfree (cvp); +} /* }}} void free_cfg_volume_perf */ + +static void free_cfg_volume_usage (cfg_volume_usage_t *cvu) /* {{{ */ +{ + data_volume_usage_t *data; + + if (cvu == NULL) + return; + + /* Free the ignorelists */ + ignorelist_free (cvu->il_capacity); + ignorelist_free (cvu->il_snapshot); + + /* Free the linked list of volumes */ + data = cvu->volumes; + while (data != NULL) + { + data_volume_usage_t *next = data->next; + sfree (data->name); + if (data->snap_query != NULL) + na_elem_free(data->snap_query); + sfree (data); + data = next; + } + + if (cvu->query != NULL) + na_elem_free (cvu->query); + + sfree (cvu); +} /* }}} void free_cfg_volume_usage */ - free_cfg_service (next); -} /* }}} void free_cfg_service */ +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_host_config (host_config_t *hc) /* {{{ */ { @@ -314,10 +379,14 @@ static void free_host_config (host_config_t *hc) /* {{{ */ sfree (hc->username); sfree (hc->password); - free_cfg_service (hc->services); free_cfg_disk (hc->cfg_disk); free_cfg_wafl (hc->cfg_wafl); - free_volume (hc->volumes); + free_cfg_volume_perf (hc->cfg_volume_perf); + free_cfg_volume_usage (hc->cfg_volume_usage); + free_cfg_system (hc->cfg_system); + + if (hc->srv != NULL) + na_server_close (hc->srv); sfree (hc); @@ -329,56 +398,6 @@ static void free_host_config (host_config_t *hc) /* {{{ */ * * Used to look up volumes and disks or to handle flags. */ -static volume_t *get_volume (host_config_t *host, const char *name, /* {{{ */ - uint32_t vol_usage_flags, uint32_t vol_perf_flags) -{ - volume_t *v; - - if (name == NULL) - return (NULL); - - /* Make sure the default flags include the init-bit. */ - if (vol_usage_flags != 0) - vol_usage_flags |= CFG_VOLUME_USAGE_INIT; - if (vol_perf_flags != 0) - vol_perf_flags |= CFG_VOLUME_PERF_INIT; - - for (v = host->volumes; v; v = v->next) { - if (strcmp(v->name, name) != 0) - continue; - - /* Check if the flags have been initialized. */ - if (((v->cfg_volume_usage.flags & CFG_VOLUME_USAGE_INIT) == 0) - && (vol_usage_flags != 0)) - v->cfg_volume_usage.flags = vol_usage_flags; - if (((v->perf_data.flags & CFG_VOLUME_PERF_INIT) == 0) - && (vol_perf_flags != 0)) - v->perf_data.flags = vol_perf_flags; - - return v; - } - - DEBUG ("netapp plugin: Allocating new entry for volume %s.", name); - v = malloc(sizeof(*v)); - if (v == NULL) - return (NULL); - memset (v, 0, sizeof (*v)); - - v->cfg_volume_usage.flags = vol_usage_flags; - v->perf_data.flags = vol_perf_flags; - - v->name = strdup(name); - if (v->name == NULL) { - sfree (v); - return (NULL); - } - - v->next = host->volumes; - host->volumes = v; - - return v; -} /* }}} volume_t *get_volume */ - static disk_t *get_disk(cfg_disk_t *cd, const char *name) /* {{{ */ { disk_t *d; @@ -409,30 +428,133 @@ static disk_t *get_disk(cfg_disk_t *cd, const char *name) /* {{{ */ return d; } /* }}} disk_t *get_disk */ -static void host_set_all_perf_data_flags(const host_config_t *host, /* {{{ */ - uint32_t flag, _Bool set) +static data_volume_usage_t *get_volume_usage (cfg_volume_usage_t *cvu, /* {{{ */ + const char *name) { - volume_t *v; - - for (v = host->volumes; v; v = v->next) { - if (set) - v->perf_data.flags |= flag; - else /* if (!set) */ - v->perf_data.flags &= ~flag; + data_volume_usage_t *last; + data_volume_usage_t *new; + + int ignore_capacity = 0; + int ignore_snapshot = 0; + + if ((cvu == NULL) || (name == NULL)) + return (NULL); + + last = cvu->volumes; + while (last != NULL) + { + if (strcmp (last->name, name) == 0) + return (last); + + if (last->next == NULL) + break; + + last = last->next; } -} /* }}} void host_set_all_perf_data_flags */ -static void host_set_all_cfg_volume_usage_flags(const host_config_t *host, /* {{{ */ - uint32_t flag, _Bool set) { - volume_t *v; - - for (v = host->volumes; v; v = v->next) { - if (set) - v->cfg_volume_usage.flags |= flag; - else /* if (!set) */ - v->cfg_volume_usage.flags &= ~flag; + /* Check the ignorelists. If *both* tell us to ignore a volume, return NULL. */ + ignore_capacity = ignorelist_match (cvu->il_capacity, name); + ignore_snapshot = ignorelist_match (cvu->il_snapshot, name); + if ((ignore_capacity != 0) && (ignore_snapshot != 0)) + return (NULL); + + /* Not found: allocate. */ + new = malloc (sizeof (*new)); + if (new == NULL) + return (NULL); + memset (new, 0, sizeof (*new)); + new->next = NULL; + + new->name = strdup (name); + if (new->name == NULL) + { + sfree (new); + return (NULL); + } + + if (ignore_capacity == 0) + new->flags |= CFG_VOLUME_USAGE_DF; + if (ignore_snapshot == 0) { + new->flags |= CFG_VOLUME_USAGE_SNAP; + new->snap_query = na_elem_new ("snapshot-list-info"); + na_child_add_string(new->snap_query, "target-type", "volume"); + na_child_add_string(new->snap_query, "target-name", name); + } else { + new->snap_query = NULL; + } + + /* Add to end of list. */ + if (last == NULL) + cvu->volumes = new; + else + last->next = new; + + return (new); +} /* }}} data_volume_usage_t *get_volume_usage */ + +static data_volume_perf_t *get_volume_perf (cfg_volume_perf_t *cvp, /* {{{ */ + const char *name) +{ + data_volume_perf_t *last; + data_volume_perf_t *new; + + int ignore_octets = 0; + int ignore_operations = 0; + int ignore_latency = 0; + + if ((cvp == NULL) || (name == NULL)) + return (NULL); + + last = cvp->volumes; + while (last != NULL) + { + if (strcmp (last->name, name) == 0) + return (last); + + if (last->next == NULL) + break; + + last = last->next; + } + + /* Check the ignorelists. If *all three* tell us to ignore a volume, return + * NULL. */ + ignore_octets = ignorelist_match (cvp->il_octets, name); + ignore_operations = ignorelist_match (cvp->il_operations, name); + ignore_latency = ignorelist_match (cvp->il_latency, name); + if ((ignore_octets != 0) || (ignore_operations != 0) + || (ignore_latency != 0)) + return (NULL); + + /* Not found: allocate. */ + new = malloc (sizeof (*new)); + if (new == NULL) + return (NULL); + memset (new, 0, sizeof (*new)); + new->next = NULL; + + new->name = strdup (name); + if (new->name == NULL) + { + sfree (new); + return (NULL); } -} /* }}} void host_set_all_cfg_volume_usage_flags */ + + if (ignore_octets == 0) + new->flags |= CFG_VOLUME_PERF_IO; + if (ignore_operations == 0) + new->flags |= CFG_VOLUME_PERF_OPS; + if (ignore_latency == 0) + new->flags |= CFG_VOLUME_PERF_LATENCY; + + /* Add to end of list. */ + if (last == NULL) + cvp->volumes = new; + else + last->next = new; + + return (new); +} /* }}} data_volume_perf_t *get_volume_perf */ /* * Various submit functions. @@ -444,7 +566,7 @@ static int submit_values (const char *host, /* {{{ */ const char *plugin_inst, const char *type, const char *type_inst, value_t *values, int values_len, - time_t timestamp) + cdtime_t timestamp, cdtime_t interval) { value_list_t vl = VALUE_LIST_INIT; @@ -454,6 +576,9 @@ static int submit_values (const char *host, /* {{{ */ if (timestamp > 0) vl.time = timestamp; + if (interval > 0) + vl.interval = interval; + if (host != NULL) sstrncpy (vl.host, host, sizeof (vl.host)); else @@ -470,7 +595,7 @@ static int submit_values (const char *host, /* {{{ */ static int submit_two_counters (const char *host, const char *plugin_inst, /* {{{ */ const char *type, const char *type_inst, counter_t val0, counter_t val1, - time_t timestamp) + cdtime_t timestamp, cdtime_t interval) { value_t values[2]; @@ -478,23 +603,24 @@ static int submit_two_counters (const char *host, const char *plugin_inst, /* {{ values[1].counter = val1; return (submit_values (host, plugin_inst, type, type_inst, - values, 2, timestamp)); + values, 2, timestamp, interval)); } /* }}} int submit_two_counters */ static int submit_counter (const char *host, const char *plugin_inst, /* {{{ */ - const char *type, const char *type_inst, counter_t counter, time_t timestamp) + const char *type, const char *type_inst, counter_t counter, + cdtime_t timestamp, cdtime_t interval) { value_t v; v.counter = counter; return (submit_values (host, plugin_inst, type, type_inst, - &v, 1, timestamp)); + &v, 1, timestamp, interval)); } /* }}} int submit_counter */ static int submit_two_gauge (const char *host, const char *plugin_inst, /* {{{ */ const char *type, const char *type_inst, gauge_t val0, gauge_t val1, - time_t timestamp) + cdtime_t timestamp, cdtime_t interval) { value_t values[2]; @@ -502,18 +628,19 @@ static int submit_two_gauge (const char *host, const char *plugin_inst, /* {{{ * values[1].gauge = val1; return (submit_values (host, plugin_inst, type, type_inst, - values, 2, timestamp)); + values, 2, timestamp, interval)); } /* }}} int submit_two_gauge */ static int submit_double (const char *host, const char *plugin_inst, /* {{{ */ - const char *type, const char *type_inst, double d, time_t timestamp) + const char *type, const char *type_inst, double d, + cdtime_t timestamp, cdtime_t interval) { value_t v; v.gauge = (gauge_t) d; return (submit_values (host, plugin_inst, type, type_inst, - &v, 1, timestamp)); + &v, 1, timestamp, interval)); } /* }}} int submit_uint64 */ /* Calculate hit ratio from old and new counters and submit the resulting @@ -525,7 +652,8 @@ static int submit_cache_ratio (const char *host, /* {{{ */ uint64_t new_misses, uint64_t old_hits, uint64_t old_misses, - time_t timestamp) + cdtime_t timestamp, + cdtime_t interval) { value_t v; @@ -542,12 +670,12 @@ static int submit_cache_ratio (const char *host, /* {{{ */ } return (submit_values (host, plugin_inst, "cache_ratio", type_inst, - &v, 1, timestamp)); + &v, 1, timestamp, interval)); } /* }}} int submit_cache_ratio */ /* 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) + cfg_wafl_t *old_data, const cfg_wafl_t *new_data, int interval) { /* Submit requested counters */ if (HAS_ALL_FLAGS (old_data->flags, CFG_WAFL_NAME_CACHE | HAVE_WAFL_NAME_CACHE) @@ -555,28 +683,28 @@ static int submit_wafl_data (const char *hostname, const char *instance, /* {{{ submit_cache_ratio (hostname, instance, "name_cache_hit", new_data->name_cache_hit, new_data->name_cache_miss, old_data->name_cache_hit, old_data->name_cache_miss, - new_data->timestamp); + new_data->timestamp, interval); if (HAS_ALL_FLAGS (old_data->flags, CFG_WAFL_DIR_CACHE | HAVE_WAFL_FIND_DIR) && HAS_ALL_FLAGS (new_data->flags, HAVE_WAFL_FIND_DIR)) submit_cache_ratio (hostname, instance, "find_dir_hit", new_data->find_dir_hit, new_data->find_dir_miss, old_data->find_dir_hit, old_data->find_dir_miss, - new_data->timestamp); + new_data->timestamp, interval); if (HAS_ALL_FLAGS (old_data->flags, CFG_WAFL_BUF_CACHE | HAVE_WAFL_BUF_HASH) && HAS_ALL_FLAGS (new_data->flags, HAVE_WAFL_BUF_HASH)) submit_cache_ratio (hostname, instance, "buf_hash_hit", new_data->buf_hash_hit, new_data->buf_hash_miss, old_data->buf_hash_hit, old_data->buf_hash_miss, - new_data->timestamp); + new_data->timestamp, interval); if (HAS_ALL_FLAGS (old_data->flags, CFG_WAFL_INODE_CACHE | HAVE_WAFL_INODE_CACHE) && HAS_ALL_FLAGS (new_data->flags, HAVE_WAFL_INODE_CACHE)) submit_cache_ratio (hostname, instance, "inode_cache_hit", new_data->inode_cache_hit, new_data->inode_cache_miss, old_data->inode_cache_hit, old_data->inode_cache_miss, - new_data->timestamp); + new_data->timestamp, interval); /* Clear old HAVE_* flags */ old_data->flags &= ~HAVE_WAFL_ALL; @@ -600,28 +728,36 @@ static int submit_wafl_data (const char *hostname, const char *instance, /* {{{ /* Submits volume performance data to the daemon, taking care to honor and * update flags appropriately. */ -static int submit_volume_perf_data (const host_config_t *host, /* {{{ */ - volume_t *volume, - const data_volume_perf_t *new_data) +static int submit_volume_perf_data (const char *hostname, /* {{{ */ + data_volume_perf_t *old_data, + const data_volume_perf_t *new_data, int interval) { + char plugin_instance[DATA_MAX_NAME_LEN]; + + if ((hostname == NULL) || (old_data == NULL) || (new_data == NULL)) + return (-1); + + ssnprintf (plugin_instance, sizeof (plugin_instance), + "volume-%s", old_data->name); + /* Check for and submit disk-octet values */ - if (HAS_ALL_FLAGS (volume->perf_data.flags, CFG_VOLUME_PERF_IO) + if (HAS_ALL_FLAGS (old_data->flags, CFG_VOLUME_PERF_IO) && HAS_ALL_FLAGS (new_data->flags, HAVE_VOLUME_PERF_BYTES_READ | HAVE_VOLUME_PERF_BYTES_WRITE)) { - submit_two_counters (host->name, volume->name, "disk_octets", /* type instance = */ NULL, - (counter_t) new_data->read_bytes, (counter_t) new_data->write_bytes, new_data->timestamp); + submit_two_counters (hostname, plugin_instance, "disk_octets", /* type instance = */ NULL, + (counter_t) new_data->read_bytes, (counter_t) new_data->write_bytes, new_data->timestamp, interval); } /* Check for and submit disk-operations values */ - if (HAS_ALL_FLAGS (volume->perf_data.flags, CFG_VOLUME_PERF_OPS) + if (HAS_ALL_FLAGS (old_data->flags, CFG_VOLUME_PERF_OPS) && HAS_ALL_FLAGS (new_data->flags, HAVE_VOLUME_PERF_OPS_READ | HAVE_VOLUME_PERF_OPS_WRITE)) { - submit_two_counters (host->name, volume->name, "disk_ops", /* type instance = */ NULL, - (counter_t) new_data->read_ops, (counter_t) new_data->write_ops, new_data->timestamp); + submit_two_counters (hostname, plugin_instance, "disk_ops", /* type instance = */ NULL, + (counter_t) new_data->read_ops, (counter_t) new_data->write_ops, new_data->timestamp, interval); } /* Check for, calculate and submit disk-latency values */ - if (HAS_ALL_FLAGS (volume->perf_data.flags, CFG_VOLUME_PERF_LATENCY + if (HAS_ALL_FLAGS (old_data->flags, CFG_VOLUME_PERF_LATENCY | HAVE_VOLUME_PERF_OPS_READ | HAVE_VOLUME_PERF_OPS_WRITE | HAVE_VOLUME_PERF_LATENCY_READ | HAVE_VOLUME_PERF_LATENCY_WRITE) && HAS_ALL_FLAGS (new_data->flags, HAVE_VOLUME_PERF_OPS_READ | HAVE_VOLUME_PERF_OPS_WRITE @@ -634,54 +770,64 @@ static int submit_volume_perf_data (const host_config_t *host, /* {{{ */ latency_per_op_write = NAN; /* Check if a counter wrapped around. */ - if ((new_data->read_ops > volume->perf_data.read_ops) - && (new_data->read_latency > volume->perf_data.read_latency)) + if ((new_data->read_ops > old_data->read_ops) + && (new_data->read_latency > old_data->read_latency)) { uint64_t diff_ops_read; uint64_t diff_latency_read; - diff_ops_read = new_data->read_ops - volume->perf_data.read_ops; - diff_latency_read = new_data->read_latency - volume->perf_data.read_latency; + diff_ops_read = new_data->read_ops - old_data->read_ops; + diff_latency_read = new_data->read_latency - old_data->read_latency; if (diff_ops_read > 0) latency_per_op_read = ((gauge_t) diff_latency_read) / ((gauge_t) diff_ops_read); } - if ((new_data->write_ops > volume->perf_data.write_ops) - && (new_data->write_latency > volume->perf_data.write_latency)) + if ((new_data->write_ops > old_data->write_ops) + && (new_data->write_latency > old_data->write_latency)) { uint64_t diff_ops_write; uint64_t diff_latency_write; - diff_ops_write = new_data->write_ops - volume->perf_data.write_ops; - diff_latency_write = new_data->write_latency - volume->perf_data.write_latency; + diff_ops_write = new_data->write_ops - old_data->write_ops; + diff_latency_write = new_data->write_latency - old_data->write_latency; if (diff_ops_write > 0) latency_per_op_write = ((gauge_t) diff_latency_write) / ((gauge_t) diff_ops_write); } - submit_two_gauge (host->name, volume->name, "disk_latency", /* type instance = */ NULL, - latency_per_op_read, latency_per_op_write, new_data->timestamp); + submit_two_gauge (hostname, plugin_instance, "disk_latency", /* type instance = */ NULL, + latency_per_op_read, latency_per_op_write, new_data->timestamp, interval); } /* Clear all HAVE_* flags. */ - volume->perf_data.flags &= ~HAVE_VOLUME_PERF_ALL; + old_data->flags &= ~HAVE_VOLUME_PERF_ALL; /* Copy all counters */ - volume->perf_data.timestamp = new_data->timestamp; - volume->perf_data.read_bytes = new_data->read_bytes; - volume->perf_data.write_bytes = new_data->write_bytes; - volume->perf_data.read_ops = new_data->read_ops; - volume->perf_data.write_ops = new_data->write_ops; - volume->perf_data.read_latency = new_data->read_latency; - volume->perf_data.write_latency = new_data->write_latency; + old_data->timestamp = new_data->timestamp; + old_data->read_bytes = new_data->read_bytes; + old_data->write_bytes = new_data->write_bytes; + old_data->read_ops = new_data->read_ops; + old_data->write_ops = new_data->write_ops; + old_data->read_latency = new_data->read_latency; + old_data->write_latency = new_data->write_latency; /* Copy the HAVE_* flags */ - volume->perf_data.flags |= (new_data->flags & HAVE_VOLUME_PERF_ALL); + old_data->flags |= (new_data->flags & HAVE_VOLUME_PERF_ALL); return (0); } /* }}} int submit_volume_perf_data */ +static cdtime_t cna_child_get_cdtime (na_elem_t *data) /* {{{ */ +{ + time_t t; + + t = (time_t) na_child_get_uint64 (data, "timestamp", /* default = */ 0); + + return (TIME_T_TO_CDTIME_T (t)); +} /* }}} cdtime_t cna_child_get_cdtime */ + + /* * Query functions * @@ -690,7 +836,7 @@ static int submit_volume_perf_data (const host_config_t *host, /* {{{ */ */ /* Data corresponding to */ static int cna_handle_wafl_data (const char *hostname, cfg_wafl_t *cfg_wafl, /* {{{ */ - na_elem_t *data) + na_elem_t *data, int interval) { cfg_wafl_t perf_data; const char *plugin_inst; @@ -701,13 +847,14 @@ static int cna_handle_wafl_data (const char *hostname, cfg_wafl_t *cfg_wafl, /* memset (&perf_data, 0, sizeof (perf_data)); - perf_data.timestamp = (time_t) na_child_get_uint64 (data, "timestamp", 0); + perf_data.timestamp = cna_child_get_cdtime (data); instances = na_elem_child(na_elem_child (data, "instances"), "instance-data"); if (instances == NULL) { ERROR ("netapp plugin: cna_handle_wafl_data: " - "na_elem_child (\"instances\") failed."); + "na_elem_child (\"instances\") failed " + "for host %s.", hostname); return (-1); } @@ -715,7 +862,8 @@ static int cna_handle_wafl_data (const char *hostname, cfg_wafl_t *cfg_wafl, /* if (plugin_inst == NULL) { ERROR ("netapp plugin: cna_handle_wafl_data: " - "na_child_get_string (\"name\") failed."); + "na_child_get_string (\"name\") failed " + "for host %s.", hostname); return (-1); } @@ -762,11 +910,12 @@ static int cna_handle_wafl_data (const char *hostname, cfg_wafl_t *cfg_wafl, /* perf_data.flags |= HAVE_WAFL_INODE_CACHE_MISS; } else { DEBUG("netapp plugin: cna_handle_wafl_data: " - "Found unexpected child: %s", name); + "Found unexpected child: %s " + "for host %s.", name, hostname); } } - return (submit_wafl_data (hostname, plugin_inst, cfg_wafl, &perf_data)); + return (submit_wafl_data (hostname, plugin_inst, cfg_wafl, &perf_data, interval)); } /* }}} void cna_handle_wafl_data */ static int cna_setup_wafl (cfg_wafl_t *cw) /* {{{ */ @@ -795,14 +944,14 @@ static int cna_setup_wafl (cfg_wafl_t *cw) /* {{{ */ ERROR ("netapp plugin: na_elem_new failed."); return (-1); } - na_child_add_string(e, "foo", "name_cache_hit"); - na_child_add_string(e, "foo", "name_cache_miss"); - na_child_add_string(e, "foo", "find_dir_hit"); - na_child_add_string(e, "foo", "find_dir_miss"); - na_child_add_string(e, "foo", "buf_hash_hit"); - na_child_add_string(e, "foo", "buf_hash_miss"); - na_child_add_string(e, "foo", "inode_cache_hit"); - na_child_add_string(e, "foo", "inode_cache_miss"); + na_child_add_string(e, "counter", "name_cache_hit"); + na_child_add_string(e, "counter", "name_cache_miss"); + na_child_add_string(e, "counter", "find_dir_hit"); + na_child_add_string(e, "counter", "find_dir_miss"); + na_child_add_string(e, "counter", "buf_hash_hit"); + na_child_add_string(e, "counter", "buf_hash_miss"); + na_child_add_string(e, "counter", "inode_cache_hit"); + na_child_add_string(e, "counter", "inode_cache_miss"); na_child_add(cw->query, e); @@ -813,7 +962,7 @@ static int cna_query_wafl (host_config_t *host) /* {{{ */ { na_elem_t *data; int status; - time_t now; + cdtime_t now; if (host == NULL) return (EINVAL); @@ -822,7 +971,7 @@ static int cna_query_wafl (host_config_t *host) /* {{{ */ if (host->cfg_wafl == NULL) return (0); - now = time (NULL); + now = cdtime (); if ((host->cfg_wafl->interval.interval + host->cfg_wafl->interval.last_read) > now) return (0); @@ -834,13 +983,13 @@ static int cna_query_wafl (host_config_t *host) /* {{{ */ data = na_server_invoke_elem(host->srv, host->cfg_wafl->query); if (na_results_status (data) != NA_OK) { - ERROR ("netapp plugin: cna_query_wafl: na_server_invoke_elem failed: %s", - na_results_reason (data)); + ERROR ("netapp plugin: cna_query_wafl: na_server_invoke_elem failed for host %s: %s", + host->name, na_results_reason (data)); na_elem_free (data); return (-1); } - status = cna_handle_wafl_data (host->name, host->cfg_wafl, data); + status = cna_handle_wafl_data (host->name, host->cfg_wafl, data, host->interval); if (status == 0) host->cfg_wafl->interval.last_read = now; @@ -851,9 +1000,9 @@ static int cna_query_wafl (host_config_t *host) /* {{{ */ /* Data corresponding to */ static int cna_handle_disk_data (const char *hostname, /* {{{ */ - cfg_disk_t *cfg_disk, na_elem_t *data) + cfg_disk_t *cfg_disk, na_elem_t *data, cdtime_t interval) { - time_t timestamp; + cdtime_t timestamp; na_elem_t *instances; na_elem_t *instance; na_elem_iter_t instance_iter; @@ -862,13 +1011,14 @@ static int cna_handle_disk_data (const char *hostname, /* {{{ */ if ((cfg_disk == NULL) || (data == NULL)) return (EINVAL); - timestamp = (time_t) na_child_get_uint64(data, "timestamp", 0); + timestamp = cna_child_get_cdtime (data); instances = na_elem_child (data, "instances"); if (instances == NULL) { ERROR ("netapp plugin: cna_handle_disk_data: " - "na_elem_child (\"instances\") failed."); + "na_elem_child (\"instances\") failed " + "for host %s.", hostname); return (-1); } @@ -964,7 +1114,7 @@ static int cna_handle_disk_data (const char *hostname, /* {{{ */ if ((cfg_disk->flags & CFG_DISK_BUSIEST) && (worst_disk != NULL)) submit_double (hostname, "system", "percent", "disk_busy", - worst_disk->disk_busy_percent, timestamp); + worst_disk->disk_busy_percent, timestamp, interval); return (0); } /* }}} int cna_handle_disk_data */ @@ -995,8 +1145,8 @@ static int cna_setup_disk (cfg_disk_t *cd) /* {{{ */ ERROR ("netapp plugin: na_elem_new failed."); return (-1); } - na_child_add_string(e, "foo", "disk_busy"); - na_child_add_string(e, "foo", "base_for_disk_busy"); + na_child_add_string(e, "counter", "disk_busy"); + na_child_add_string(e, "counter", "base_for_disk_busy"); na_child_add(cd->query, e); return (0); @@ -1006,7 +1156,7 @@ static int cna_query_disk (host_config_t *host) /* {{{ */ { na_elem_t *data; int status; - time_t now; + cdtime_t now; if (host == NULL) return (EINVAL); @@ -1016,7 +1166,7 @@ static int cna_query_disk (host_config_t *host) /* {{{ */ if (host->cfg_disk == NULL) return (0); - now = time (NULL); + now = cdtime (); if ((host->cfg_disk->interval.interval + host->cfg_disk->interval.last_read) > now) return (0); @@ -1028,13 +1178,13 @@ static int cna_query_disk (host_config_t *host) /* {{{ */ data = na_server_invoke_elem(host->srv, host->cfg_disk->query); if (na_results_status (data) != NA_OK) { - ERROR ("netapp plugin: cna_query_disk: na_server_invoke_elem failed: %s", - na_results_reason (data)); + ERROR ("netapp plugin: cna_query_disk: na_server_invoke_elem failed for host %s: %s", + host->name, na_results_reason (data)); na_elem_free (data); return (-1); } - status = cna_handle_disk_data (host->name, host->cfg_disk, data); + status = cna_handle_disk_data (host->name, host->cfg_disk, data, host->interval); if (status == 0) host->cfg_disk->interval.last_read = now; @@ -1043,146 +1193,69 @@ static int cna_query_disk (host_config_t *host) /* {{{ */ return (status); } /* }}} int cna_query_disk */ -/* Data corresponding to */ -static void collect_volume_data(host_config_t *host, na_elem_t *out, void *data) { /* {{{ */ - na_elem_t *inst; - volume_t *volume; - cfg_volume_usage_t *cfg_volume_data = data; - - out = na_elem_child(out, "volumes"); - na_elem_iter_t inst_iter = na_child_iterator(out); - for (inst = na_iterator_next(&inst_iter); inst; inst = na_iterator_next(&inst_iter)) { - uint64_t size_free = 0, size_used = 0, snap_reserved = 0; +/* Data corresponding to */ +static int cna_handle_volume_perf_data (const char *hostname, /* {{{ */ + cfg_volume_perf_t *cvp, na_elem_t *data, cdtime_t interval) +{ + cdtime_t timestamp; + na_elem_t *elem_instances; + na_elem_iter_t iter_instances; + na_elem_t *elem_instance; + + timestamp = cna_child_get_cdtime (data); - na_elem_t *sis; - const char *sis_state; - uint64_t sis_saved_reported; - uint64_t sis_saved; + elem_instances = na_elem_child(data, "instances"); + if (elem_instances == NULL) + { + ERROR ("netapp plugin: handle_volume_perf_data: " + "na_elem_child (\"instances\") failed " + "for host %s.", hostname); + return (-1); + } - volume = get_volume(host, na_child_get_string(inst, "name"), - cfg_volume_data->flags, /* perf_flags = */ 0); - if (volume == NULL) - continue; + iter_instances = na_child_iterator (elem_instances); + for (elem_instance = na_iterator_next(&iter_instances); + elem_instance != NULL; + elem_instance = na_iterator_next(&iter_instances)) + { + const char *name; - if (!(volume->cfg_volume_usage.flags & CFG_VOLUME_USAGE_DF)) - continue; + data_volume_perf_t perf_data; + data_volume_perf_t *v; - /* 2^4 exa-bytes? This will take a while ;) */ - size_free = na_child_get_uint64(inst, "size-available", UINT64_MAX); - if (size_free != UINT64_MAX) - submit_double (host->name, volume->name, "df_complex", "free", - (double) size_free, /* time = */ 0); - - size_used = na_child_get_uint64(inst, "size-used", UINT64_MAX); - if (size_used != UINT64_MAX) { - if ((volume->cfg_volume_usage.flags & HAVE_VOLUME_USAGE_SNAP) - && (size_used >= volume->cfg_volume_usage.snap_used)) - size_used -= volume->cfg_volume_usage.snap_used; - submit_double (host->name, volume->name, "df_complex", "used", - (double) size_used, /* time = */ 0); - } + na_elem_t *elem_counters; + na_elem_iter_t iter_counters; + na_elem_t *elem_counter; - snap_reserved = na_child_get_uint64(inst, "snapshot-blocks-reserved", UINT64_MAX); - if (!(volume->cfg_volume_usage.flags & HAVE_VOLUME_USAGE_SNAP) && (snap_reserved != UINT64_MAX)) - /* If we have snap usage data this value has already been submitted. */ - /* 1 block == 1024 bytes as per API docs */ - submit_double (host->name, volume->name, "df_complex", "snap_reserved", - (double) (1024 * snap_reserved), /* time = */ 0); + memset (&perf_data, 0, sizeof (perf_data)); + perf_data.timestamp = timestamp; - sis = na_elem_child(inst, "sis"); - if (sis == NULL) + name = na_child_get_string (elem_instance, "name"); + if (name == NULL) continue; - sis_state = na_child_get_string(sis, "state"); - if ((sis_state == NULL) - || (strcmp ("enabled", sis_state) != 0)) + /* get_volume_perf may return NULL if this volume is to be ignored. */ + v = get_volume_perf (cvp, name); + if (v == NULL) continue; - sis_saved_reported = na_child_get_uint64(sis, "size-saved", UINT64_MAX); - if (sis_saved_reported == UINT64_MAX) + elem_counters = na_elem_child (elem_instance, "counters"); + if (elem_counters == NULL) 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. */ - sis_saved = sis_saved_reported; - } else { - uint64_t sis_saved_percent; - uint64_t sis_saved_guess; - uint64_t overflow_guess; - uint64_t guess1, guess2, guess3; + iter_counters = na_child_iterator (elem_counters); + for (elem_counter = na_iterator_next(&iter_counters); + elem_counter != NULL; + elem_counter = na_iterator_next(&iter_counters)) + { + const char *name; + uint64_t value; - sis_saved_percent = na_child_get_uint64(sis, "percentage-saved", UINT64_MAX); - if (sis_saved_percent > 100) + name = na_child_get_string (elem_counter, "name"); + if (name == NULL) 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 = size_used * sis_saved_percent / (100 - sis_saved_percent); - else - sis_saved_guess = size_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)) - sis_saved = guess1; - else - sis_saved = guess2; - } else { - if ((sis_saved_guess - guess2) < (guess3 - sis_saved_guess)) - sis_saved = guess2; - else - sis_saved = guess3; - } - } /* end of 32-bit workaround */ - - submit_double (host->name, volume->name, "df_complex", "sis_saved", - (double) sis_saved, /* time = */ 0); - } -} /* }}} void collect_volume_data */ - -/* Data corresponding to */ -static void query_volume_perf_data(host_config_t *host, na_elem_t *out, void *data) { /* {{{ */ - cfg_volume_perf_t *cfg_volume_perf = data; - time_t timestamp; - na_elem_t *counter, *inst; - - timestamp = (time_t) na_child_get_uint64(out, "timestamp", 0); - - out = na_elem_child(out, "instances"); - na_elem_iter_t inst_iter = na_child_iterator(out); - for (inst = na_iterator_next(&inst_iter); inst; inst = na_iterator_next(&inst_iter)) { - data_volume_perf_t perf_data; - volume_t *volume; - - memset (&perf_data, 0, sizeof (perf_data)); - perf_data.timestamp = timestamp; - - volume = get_volume(host, na_child_get_string(inst, "name"), - /* data_flags = */ 0, cfg_volume_perf->flags); - if (volume == NULL) - continue; - - na_elem_iter_t count_iter = na_child_iterator(na_elem_child(inst, "counters")); - for (counter = na_iterator_next(&count_iter); counter; counter = na_iterator_next(&count_iter)) { - const char *name; - uint64_t value; - - name = na_child_get_string(counter, "name"); - if (name == NULL) - continue; - - value = na_child_get_uint64(counter, "value", UINT64_MAX); + value = na_child_get_uint64 (elem_counter, "value", UINT64_MAX); if (value == UINT64_MAX) continue; @@ -1205,15 +1278,462 @@ static void query_volume_perf_data(host_config_t *host, na_elem_t *out, void *da perf_data.write_latency = value; perf_data.flags |= HAVE_VOLUME_PERF_LATENCY_WRITE; } - } + } /* for (elem_counter) */ - submit_volume_perf_data (host, volume, &perf_data); + submit_volume_perf_data (hostname, v, &perf_data, interval); } /* for (volume) */ -} /* }}} void query_volume_perf_data */ + + return (0); +} /* }}} int cna_handle_volume_perf_data */ + +static int cna_setup_volume_perf (cfg_volume_perf_t *cd) /* {{{ */ +{ + na_elem_t *e; + + if (cd == NULL) + return (EINVAL); + + if (cd->query != NULL) + return (0); + + cd->query = na_elem_new ("perf-object-get-instances"); + if (cd->query == NULL) + { + ERROR ("netapp plugin: na_elem_new failed."); + return (-1); + } + na_child_add_string (cd->query, "objectname", "volume"); + + e = na_elem_new("counters"); + if (e == NULL) + { + na_elem_free (cd->query); + cd->query = NULL; + ERROR ("netapp plugin: na_elem_new failed."); + return (-1); + } + na_child_add_string(e, "counter", "read_ops"); + na_child_add_string(e, "counter", "write_ops"); + na_child_add_string(e, "counter", "read_data"); + na_child_add_string(e, "counter", "write_data"); + na_child_add_string(e, "counter", "read_latency"); + na_child_add_string(e, "counter", "write_latency"); + na_child_add(cd->query, e); + + return (0); +} /* }}} int cna_setup_volume_perf */ + +static int cna_query_volume_perf (host_config_t *host) /* {{{ */ +{ + na_elem_t *data; + int status; + cdtime_t now; + + if (host == NULL) + return (EINVAL); + + /* If the user did not configure volume performance statistics, return + * without doing anything. */ + if (host->cfg_volume_perf == NULL) + return (0); + + now = cdtime (); + if ((host->cfg_volume_perf->interval.interval + host->cfg_volume_perf->interval.last_read) > now) + return (0); + + status = cna_setup_volume_perf (host->cfg_volume_perf); + if (status != 0) + return (status); + assert (host->cfg_volume_perf->query != NULL); + + data = na_server_invoke_elem (host->srv, host->cfg_volume_perf->query); + if (na_results_status (data) != NA_OK) + { + ERROR ("netapp plugin: cna_query_volume_perf: na_server_invoke_elem failed for host %s: %s", + host->name, na_results_reason (data)); + na_elem_free (data); + return (-1); + } + + status = cna_handle_volume_perf_data (host->name, host->cfg_volume_perf, data, host->interval); + + if (status == 0) + host->cfg_volume_perf->interval.last_read = now; + + na_elem_free (data); + return (status); +} /* }}} int cna_query_volume_perf */ + +/* Data corresponding to */ +static int cna_submit_volume_usage_data (const char *hostname, /* {{{ */ + cfg_volume_usage_t *cfg_volume, int interval) +{ + data_volume_usage_t *v; + + for (v = cfg_volume->volumes; v != NULL; v = v->next) + { + char plugin_instance[DATA_MAX_NAME_LEN]; + + uint64_t norm_used = v->norm_used; + uint64_t norm_free = v->norm_free; + uint64_t sis_saved = v->sis_saved; + uint64_t snap_reserve_used = 0; + uint64_t snap_reserve_free = v->snap_reserved; + uint64_t snap_norm_used = v->snap_used; + + ssnprintf (plugin_instance, sizeof (plugin_instance), + "volume-%s", v->name); + + if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_SNAP_USED | HAVE_VOLUME_USAGE_SNAP_RSVD)) { + if (v->snap_reserved > v->snap_used) { + snap_reserve_free = v->snap_reserved - v->snap_used; + snap_reserve_used = v->snap_used; + snap_norm_used = 0; + } else { + snap_reserve_free = 0; + snap_reserve_used = v->snap_reserved; + snap_norm_used = v->snap_used - v->snap_reserved; + } + } + + /* The space used by snapshots but not reserved for them is included in + * both, norm_used and snap_norm_used. If possible, subtract this here. */ + if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_NORM_USED | HAVE_VOLUME_USAGE_SNAP_USED)) + { + if (norm_used >= snap_norm_used) + norm_used -= snap_norm_used; + else + { + ERROR ("netapp plugin: (norm_used = %"PRIu64") < (snap_norm_used = " + "%"PRIu64") for host %s. Invalidating both.", + norm_used, snap_norm_used, hostname); + v->flags &= ~(HAVE_VOLUME_USAGE_NORM_USED | HAVE_VOLUME_USAGE_SNAP_USED); + } + } + + if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_NORM_FREE)) + submit_double (hostname, /* plugin instance = */ plugin_instance, + "df_complex", "free", + (double) norm_free, /* timestamp = */ 0, interval); + + if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_SIS_SAVED)) + submit_double (hostname, /* plugin instance = */ plugin_instance, + "df_complex", "sis_saved", + (double) sis_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", + (double) norm_used, /* timestamp = */ 0, interval); + + if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_SNAP_RSVD)) + submit_double (hostname, /* plugin instance = */ plugin_instance, + "df_complex", "snap_reserved", + (double) snap_reserve_free, /* timestamp = */ 0, interval); + + if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_SNAP_USED | HAVE_VOLUME_USAGE_SNAP_RSVD)) + submit_double (hostname, /* plugin instance = */ plugin_instance, + "df_complex", "snap_reserve_used", + (double) snap_reserve_used, /* timestamp = */ 0, interval); + + if (HAS_ALL_FLAGS (v->flags, HAVE_VOLUME_USAGE_SNAP_USED)) + submit_double (hostname, /* plugin instance = */ plugin_instance, + "df_complex", "snap_normal_used", + (double) snap_norm_used, /* timestamp = */ 0, interval); + + /* Clear all the HAVE_* flags */ + v->flags &= ~HAVE_VOLUME_USAGE_ALL; + } /* for (v = cfg_volume->volumes) */ + + return (0); +} /* }}} int cna_submit_volume_usage_data */ + +/* Switch the state of a volume between online and offline and send out a + * notification. */ +static int cna_change_volume_status (const char *hostname, /* {{{ */ + data_volume_usage_t *v) +{ + notification_t n; + + memset (&n, 0, sizeof (&n)); + n.time = cdtime (); + sstrncpy (n.host, hostname, sizeof (n.host)); + sstrncpy (n.plugin, "netapp", sizeof (n.plugin)); + sstrncpy (n.plugin_instance, v->name, sizeof (n.plugin_instance)); + + if ((v->flags & IS_VOLUME_USAGE_OFFLINE) != 0) { + n.severity = NOTIF_OKAY; + ssnprintf (n.message, sizeof (n.message), + "Volume %s is now online.", v->name); + v->flags &= ~IS_VOLUME_USAGE_OFFLINE; + } else { + n.severity = NOTIF_WARNING; + ssnprintf (n.message, sizeof (n.message), + "Volume %s is now offline.", v->name); + v->flags |= IS_VOLUME_USAGE_OFFLINE; + } + + return (plugin_dispatch_notification (&n)); +} /* }}} int cna_change_volume_status */ + +static void cna_handle_volume_snap_usage(const host_config_t *host, /* {{{ */ + data_volume_usage_t *v) +{ + uint64_t snap_used = 0, value; + na_elem_t *data, *elem_snap, *elem_snapshots; + na_elem_iter_t iter_snap; + + data = na_server_invoke_elem(host->srv, v->snap_query); + if (na_results_status(data) != NA_OK) + { + if (na_results_errno(data) == EVOLUMEOFFLINE) { + if ((v->flags & IS_VOLUME_USAGE_OFFLINE) == 0) + cna_change_volume_status (host->name, v); + } else { + ERROR ("netapp plugin: cna_handle_volume_snap_usage: na_server_invoke_elem for " + "volume \"%s\" on host %s failed with error %d: %s", v->name, + host->name, na_results_errno(data), na_results_reason(data)); + } + na_elem_free(data); + return; + } + + if ((v->flags & IS_VOLUME_USAGE_OFFLINE) != 0) + cna_change_volume_status (host->name, v); + + elem_snapshots = na_elem_child (data, "snapshots"); + if (elem_snapshots == NULL) + { + ERROR ("netapp plugin: cna_handle_volume_snap_usage: " + "na_elem_child (\"snapshots\") failed " + "for host %s.", host->name); + na_elem_free(data); + return; + } + + iter_snap = na_child_iterator (elem_snapshots); + for (elem_snap = na_iterator_next (&iter_snap); + elem_snap != NULL; + elem_snap = na_iterator_next (&iter_snap)) + { + value = na_child_get_uint64(elem_snap, "cumulative-total", 0); + /* "cumulative-total" is the total size of the oldest snapshot plus all + * newer ones in blocks (1KB). We therefore are looking for the highest + * number of all snapshots - that's the size required for the snapshots. */ + if (value > snap_used) + snap_used = value; + } + na_elem_free (data); + /* snap_used is in 1024 byte blocks */ + v->snap_used = snap_used * 1024; + v->flags |= HAVE_VOLUME_USAGE_SNAP_USED; +} /* }}} void cna_handle_volume_snap_usage */ + +static int cna_handle_volume_usage_data (const host_config_t *host, /* {{{ */ + cfg_volume_usage_t *cfg_volume, na_elem_t *data) +{ + na_elem_t *elem_volume; + na_elem_t *elem_volumes; + na_elem_iter_t iter_volume; + + elem_volumes = na_elem_child (data, "volumes"); + if (elem_volumes == NULL) + { + ERROR ("netapp plugin: cna_handle_volume_usage_data: " + "na_elem_child (\"volumes\") failed " + "for host %s.", host->name); + return (-1); + } + + iter_volume = na_child_iterator (elem_volumes); + for (elem_volume = na_iterator_next (&iter_volume); + elem_volume != NULL; + elem_volume = na_iterator_next (&iter_volume)) + { + const char *volume_name, *state; + + data_volume_usage_t *v; + 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) + continue; + + state = na_child_get_string (elem_volume, "state"); + if ((state == NULL) || (strcmp(state, "online") != 0)) + continue; + + /* get_volume_usage may return NULL if the volume is to be ignored. */ + v = get_volume_usage (cfg_volume, volume_name); + if (v == NULL) + continue; + + if ((v->flags & CFG_VOLUME_USAGE_SNAP) != 0) + cna_handle_volume_snap_usage(host, v); + + if ((v->flags & CFG_VOLUME_USAGE_DF) == 0) + continue; + + /* 2^4 exa-bytes? This will take a while ;) */ + value = na_child_get_uint64(elem_volume, "size-available", UINT64_MAX); + if (value != UINT64_MAX) { + v->norm_free = value; + v->flags |= HAVE_VOLUME_USAGE_NORM_FREE; + } + + value = na_child_get_uint64(elem_volume, "size-used", UINT64_MAX); + if (value != UINT64_MAX) { + v->norm_used = value; + v->flags |= HAVE_VOLUME_USAGE_NORM_USED; + } + + value = na_child_get_uint64(elem_volume, "snapshot-blocks-reserved", UINT64_MAX); + if (value != UINT64_MAX) { + /* 1 block == 1024 bytes as per API docs */ + v->snap_reserved = 1024 * value; + v->flags |= HAVE_VOLUME_USAGE_SNAP_RSVD; + } + + 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 */ + } /* for (elem_volume) */ + + return (cna_submit_volume_usage_data (host->name, cfg_volume, host->interval)); +} /* }}} int cna_handle_volume_usage_data */ + +static int cna_setup_volume_usage (cfg_volume_usage_t *cvu) /* {{{ */ +{ + if (cvu == NULL) + return (EINVAL); + + if (cvu->query != NULL) + return (0); + + cvu->query = na_elem_new ("volume-list-info"); + if (cvu->query == NULL) + { + ERROR ("netapp plugin: na_elem_new failed."); + return (-1); + } + + return (0); +} /* }}} int cna_setup_volume_usage */ + +static int cna_query_volume_usage (host_config_t *host) /* {{{ */ +{ + na_elem_t *data; + int status; + cdtime_t now; + + if (host == NULL) + return (EINVAL); + + /* If the user did not configure volume_usage statistics, return without + * doing anything. */ + if (host->cfg_volume_usage == NULL) + return (0); + + now = cdtime (); + if ((host->cfg_volume_usage->interval.interval + host->cfg_volume_usage->interval.last_read) > now) + return (0); + + status = cna_setup_volume_usage (host->cfg_volume_usage); + if (status != 0) + return (status); + assert (host->cfg_volume_usage->query != NULL); + + data = na_server_invoke_elem(host->srv, host->cfg_volume_usage->query); + if (na_results_status (data) != NA_OK) + { + ERROR ("netapp plugin: cna_query_volume_usage: na_server_invoke_elem failed for host %s: %s", + host->name, na_results_reason (data)); + na_elem_free (data); + return (-1); + } + + status = cna_handle_volume_usage_data (host, host->cfg_volume_usage, data); + + if (status == 0) + host->cfg_volume_usage->interval.last_read = now; + + na_elem_free (data); + return (status); +} /* }}} int cna_query_volume_usage */ /* Data corresponding to */ static int cna_handle_system_data (const char *hostname, /* {{{ */ - cfg_system_t *cfg_system, na_elem_t *data) + cfg_system_t *cfg_system, na_elem_t *data, int interval) { na_elem_t *instances; na_elem_t *counter; @@ -1225,15 +1745,16 @@ static int cna_handle_system_data (const char *hostname, /* {{{ */ uint32_t counter_flags = 0; const char *instance; - time_t timestamp; + cdtime_t timestamp; - timestamp = (time_t) na_child_get_uint64 (data, "timestamp", 0); + timestamp = cna_child_get_cdtime (data); instances = na_elem_child(na_elem_child (data, "instances"), "instance-data"); if (instances == NULL) { ERROR ("netapp plugin: cna_handle_system_data: " - "na_elem_child (\"instances\") failed."); + "na_elem_child (\"instances\") failed " + "for host %s.", hostname); return (-1); } @@ -1241,7 +1762,8 @@ static int cna_handle_system_data (const char *hostname, /* {{{ */ if (instance == NULL) { ERROR ("netapp plugin: cna_handle_system_data: " - "na_child_get_string (\"name\") failed."); + "na_child_get_string (\"name\") failed " + "for host %s.", hostname); return (-1); } @@ -1283,27 +1805,27 @@ static int cna_handle_system_data (const char *hostname, /* {{{ */ && (value > 0) && (strlen(name) > 4) && (!strcmp(name + strlen(name) - 4, "_ops"))) { submit_counter (hostname, instance, "disk_ops_complex", name, - (counter_t) value, timestamp); + (counter_t) value, timestamp, interval); } } /* for (counter) */ if ((cfg_system->flags & CFG_SYSTEM_DISK) && (HAS_ALL_FLAGS (counter_flags, 0x01 | 0x02))) submit_two_counters (hostname, instance, "disk_octets", NULL, - disk_read, disk_written, timestamp); + disk_read, disk_written, timestamp, interval); if ((cfg_system->flags & CFG_SYSTEM_NET) && (HAS_ALL_FLAGS (counter_flags, 0x04 | 0x08))) submit_two_counters (hostname, instance, "if_octets", NULL, - net_recv, net_sent, timestamp); + net_recv, net_sent, timestamp, interval); if ((cfg_system->flags & CFG_SYSTEM_CPU) && (HAS_ALL_FLAGS (counter_flags, 0x10 | 0x20))) { submit_counter (hostname, instance, "cpu", "system", - cpu_busy, timestamp); + cpu_busy, timestamp, interval); submit_counter (hostname, instance, "cpu", "idle", - cpu_total - cpu_busy, timestamp); + cpu_total - cpu_busy, timestamp, interval); } return (0); @@ -1332,7 +1854,7 @@ static int cna_query_system (host_config_t *host) /* {{{ */ { na_elem_t *data; int status; - time_t now; + cdtime_t now; if (host == NULL) return (EINVAL); @@ -1341,7 +1863,7 @@ static int cna_query_system (host_config_t *host) /* {{{ */ if (host->cfg_system == NULL) return (0); - now = time (NULL); + now = cdtime (); if ((host->cfg_system->interval.interval + host->cfg_system->interval.last_read) > now) return (0); @@ -1353,13 +1875,13 @@ static int cna_query_system (host_config_t *host) /* {{{ */ data = na_server_invoke_elem(host->srv, host->cfg_system->query); if (na_results_status (data) != NA_OK) { - ERROR ("netapp plugin: cna_query_system: na_server_invoke_elem failed: %s", - na_results_reason (data)); + ERROR ("netapp plugin: cna_query_system: na_server_invoke_elem failed for host %s: %s", + host->name, na_results_reason (data)); na_elem_free (data); return (-1); } - status = cna_handle_system_data (host->name, host->cfg_system, data); + status = cna_handle_system_data (host->name, host->cfg_system, data, host->interval); if (status == 0) host->cfg_system->interval.last_read = now; @@ -1394,55 +1916,16 @@ static int cna_config_bool_to_flag (const oconfig_item_t *ci, /* {{{ */ return (0); } /* }}} int cna_config_bool_to_flag */ -/* Handling of the "Multiplier" option which is allowed in every block. */ -static int cna_config_get_multiplier (const oconfig_item_t *ci, /* {{{ */ - cfg_service_t *service) -{ - int tmp; - - if ((ci == NULL) || (service == NULL)) - return (EINVAL); - - if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_NUMBER)) - { - WARNING ("netapp plugin: The `Multiplier' option needs exactly one numeric argument."); - return (-1); - } - - tmp = (int) (ci->values[0].value.number + .5); - if (tmp < 1) - { - WARNING ("netapp plugin: The `Multiplier' option needs a positive integer argument."); - return (-1); - } - - service->multiplier = tmp; - service->skip_countdown = tmp; - - return (0); -} /* }}} int cna_config_get_multiplier */ - /* Handling of the "Interval" option which is allowed in every block. */ static int cna_config_get_interval (const oconfig_item_t *ci, /* {{{ */ cna_interval_t *out_interval) { - time_t tmp; - - if ((ci == NULL) || (out_interval == NULL)) - return (EINVAL); - - if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_NUMBER)) - { - WARNING ("netapp plugin: The `Multiplier' option needs exactly one numeric argument."); - return (-1); - } + cdtime_t tmp = 0; + int status; - tmp = (time_t) (ci->values[0].value.number + .5); - if (tmp < 1) - { - WARNING ("netapp plugin: The `Multiplier' option needs a positive integer argument."); - return (-1); - } + status = cf_util_get_cdtime (ci, &tmp); + if (status != 0) + return (status); out_interval->interval = tmp; out_interval->last_read = 0; @@ -1451,183 +1934,207 @@ static int cna_config_get_interval (const oconfig_item_t *ci, /* {{{ */ } /* }}} int cna_config_get_interval */ /* Handling of the "GetIO", "GetOps" and "GetLatency" options within a - * block. */ -static void cna_config_volume_performance_option (host_config_t *host, /* {{{ */ - cfg_volume_perf_t *perf_volume, const oconfig_item_t *item, - uint32_t flag) + * block. */ +static void cna_config_volume_perf_option (cfg_volume_perf_t *cvp, /* {{{ */ + const oconfig_item_t *ci) { - int i; - - for (i = 0; i < item->values_num; ++i) { - const char *name; - volume_t *v; - _Bool set = true; + char *name; + ignorelist_t * il; - if (item->values[i].type != OCONFIG_TYPE_STRING) { - WARNING("netapp plugin: Ignoring non-string argument in " - "\"GetVolumePerfData\" block for host %s", host->name); - continue; - } + if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING)) + { + WARNING ("netapp plugin: The %s option requires exactly one string argument.", + ci->key); + return; + } - name = item->values[i].value.string; - if (name[0] == '+') { - set = true; - ++name; - } else if (name[0] == '-') { - set = false; - ++name; - } + name = ci->values[0].value.string; - if (!name[0]) { - if (set) - perf_volume->flags |= flag; - else /* if (!set) */ - perf_volume->flags &= ~flag; + if (strcasecmp ("GetIO", ci->key) == 0) + il = cvp->il_octets; + else if (strcasecmp ("GetOps", ci->key) == 0) + il = cvp->il_operations; + else if (strcasecmp ("GetLatency", ci->key) == 0) + il = cvp->il_latency; + else + return; - host_set_all_perf_data_flags(host, flag, set); - continue; - } + ignorelist_add (il, name); +} /* }}} void cna_config_volume_perf_option */ - v = get_volume (host, name, /* data_flags = */ 0, perf_volume->flags); - if (v == NULL) - continue; +/* Handling of the "IgnoreSelectedIO", "IgnoreSelectedOps" and + * "IgnoreSelectedLatency" options within a block. */ +static void cna_config_volume_perf_default (cfg_volume_perf_t *cvp, /* {{{ */ + const oconfig_item_t *ci) +{ + ignorelist_t *il; - if (set) - v->perf_data.flags |= flag; - else /* if (!set) */ - v->perf_data.flags &= ~flag; - } /* for (i = 0 .. item->values_num) */ -} /* }}} void cna_config_volume_performance_option */ - -/* Corresponds to a block */ -static void cna_config_volume_performance(host_config_t *host, const oconfig_item_t *ci) { /* {{{ */ - int i, had_io = 0, had_ops = 0, had_latency = 0; - cfg_service_t *service; - cfg_volume_perf_t *perf_volume; - - service = malloc(sizeof(*service)); - service->query = 0; - service->handler = query_volume_perf_data; - perf_volume = service->data = malloc(sizeof(*perf_volume)); - perf_volume->flags = CFG_VOLUME_PERF_INIT; - service->next = host->services; - host->services = service; - for (i = 0; i < ci->children_num; ++i) { - oconfig_item_t *item = ci->children + i; - - /* if (!item || !item->key || !*item->key) continue; */ - if (!strcasecmp(item->key, "Multiplier")) { - cna_config_get_multiplier (item, service); - } else if (!strcasecmp(item->key, "GetIO")) { - had_io = 1; - cna_config_volume_performance_option(host, perf_volume, item, CFG_VOLUME_PERF_IO); - } else if (!strcasecmp(item->key, "GetOps")) { - had_ops = 1; - cna_config_volume_performance_option(host, perf_volume, item, CFG_VOLUME_PERF_OPS); - } else if (!strcasecmp(item->key, "GetLatency")) { - had_latency = 1; - cna_config_volume_performance_option(host, perf_volume, item, CFG_VOLUME_PERF_LATENCY); - } - } - if (!had_io) { - perf_volume->flags |= CFG_VOLUME_PERF_IO; - host_set_all_perf_data_flags(host, CFG_VOLUME_PERF_IO, /* set = */ true); - } - if (!had_ops) { - perf_volume->flags |= CFG_VOLUME_PERF_OPS; - host_set_all_perf_data_flags(host, CFG_VOLUME_PERF_OPS, /* set = */ true); - } - if (!had_latency) { - perf_volume->flags |= CFG_VOLUME_PERF_LATENCY; - host_set_all_perf_data_flags(host, CFG_VOLUME_PERF_LATENCY, /* set = */ true); + if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_BOOLEAN)) + { + WARNING ("netapp plugin: The %s option requires exactly one string argument.", + ci->key); + return; } -} /* }}} void cna_config_volume_performance */ -/* Handling of the "GetDiskUtil" option within a block. */ -static void cna_config_volume_usage_option (host_config_t *host, /* {{{ */ - cfg_volume_usage_t *cfg_volume_data, const oconfig_item_t *item, uint32_t flag) + if (strcasecmp ("IgnoreSelectedIO", ci->key) == 0) + il = cvp->il_octets; + else if (strcasecmp ("IgnoreSelectedOps", ci->key) == 0) + il = cvp->il_operations; + else if (strcasecmp ("IgnoreSelectedLatency", ci->key) == 0) + il = cvp->il_latency; + else + return; + + if (ci->values[0].value.boolean) + ignorelist_set_invert (il, /* invert = */ 0); + else + ignorelist_set_invert (il, /* invert = */ 1); +} /* }}} void cna_config_volume_perf_default */ + +/* Corresponds to a block */ +/* + * + * GetIO "vol0" + * GetIO "vol1" + * IgnoreSelectedIO false + * + * GetOps "vol0" + * GetOps "vol2" + * IgnoreSelectedOps false + * + * GetLatency "vol2" + * GetLatency "vol3" + * IgnoreSelectedLatency false + * + */ +/* Corresponds to a block */ +static int cna_config_volume_performance (host_config_t *host, /* {{{ */ + const oconfig_item_t *ci) { + cfg_volume_perf_t *cfg_volume_perf; int i; - - for (i = 0; i < item->values_num; ++i) { - const char *name; - volume_t *v; - _Bool set = true; - if (item->values[i].type != OCONFIG_TYPE_STRING) { - WARNING("netapp plugin: Ignoring non-string argument in \"GetVolData\"" - "block for host %s", host->name); - continue; - } + if ((host == NULL) || (ci == NULL)) + return (EINVAL); - name = item->values[i].value.string; - if (name[0] == '+') { - set = true; - ++name; - } else if (name[0] == '-') { - set = false; - ++name; - } + if (host->cfg_volume_perf == NULL) + { + cfg_volume_perf = malloc (sizeof (*cfg_volume_perf)); + if (cfg_volume_perf == NULL) + return (ENOMEM); + memset (cfg_volume_perf, 0, sizeof (*cfg_volume_perf)); - if (!name[0]) { - if (set) - cfg_volume_data->flags |= flag; - else /* if (!set) */ - cfg_volume_data->flags &= ~flag; + /* Set default flags */ + cfg_volume_perf->query = NULL; + cfg_volume_perf->volumes = NULL; - host_set_all_cfg_volume_usage_flags(host, flag, set); - continue; + cfg_volume_perf->il_octets = ignorelist_create (/* invert = */ 1); + if (cfg_volume_perf->il_octets == NULL) + { + sfree (cfg_volume_perf); + return (ENOMEM); } - v = get_volume(host, name, cfg_volume_data->flags, /* perf_flags = */ 0); - if (v == NULL) - continue; + cfg_volume_perf->il_operations = ignorelist_create (/* invert = */ 1); + if (cfg_volume_perf->il_operations == NULL) + { + ignorelist_free (cfg_volume_perf->il_octets); + sfree (cfg_volume_perf); + return (ENOMEM); + } - if (!v->cfg_volume_usage.flags) - v->cfg_volume_usage.flags = cfg_volume_data->flags; + cfg_volume_perf->il_latency = ignorelist_create (/* invert = */ 1); + if (cfg_volume_perf->il_latency == NULL) + { + ignorelist_free (cfg_volume_perf->il_octets); + ignorelist_free (cfg_volume_perf->il_operations); + sfree (cfg_volume_perf); + return (ENOMEM); + } - if (set) - v->cfg_volume_usage.flags |= flag; - else /* if (!set) */ - v->cfg_volume_usage.flags &= ~flag; + host->cfg_volume_perf = cfg_volume_perf; } -} /* }}} void cna_config_volume_usage_option */ - -/* Corresponds to a block */ -static void cna_config_volume_usage(host_config_t *host, oconfig_item_t *ci) { /* {{{ */ - int i, had_df = 0; - cfg_service_t *service; - cfg_volume_usage_t *cfg_volume_data; + cfg_volume_perf = host->cfg_volume_perf; - service = malloc(sizeof(*service)); - service->query = 0; - service->handler = collect_volume_data; - cfg_volume_data = service->data = malloc(sizeof(*cfg_volume_data)); - cfg_volume_data->flags = CFG_VOLUME_USAGE_INIT; - service->next = host->services; - host->services = service; for (i = 0; i < ci->children_num; ++i) { oconfig_item_t *item = ci->children + i; /* if (!item || !item->key || !*item->key) continue; */ - if (!strcasecmp(item->key, "Multiplier")) { - cna_config_get_multiplier (item, service); - } else if (!strcasecmp(item->key, "GetDiskUtil")) { - had_df = 1; - cna_config_volume_usage_option(host, cfg_volume_data, item, CFG_VOLUME_USAGE_DF); - } else if (!strcasecmp(item->key, "GetSnapUtil")) { - had_df = 1; - cna_config_volume_usage_option(host, cfg_volume_data, item, CFG_VOLUME_USAGE_SNAP); - } + if (strcasecmp(item->key, "Interval") == 0) + cna_config_get_interval (item, &cfg_volume_perf->interval); + else if (!strcasecmp(item->key, "GetIO")) + cna_config_volume_perf_option (cfg_volume_perf, item); + else if (!strcasecmp(item->key, "GetOps")) + cna_config_volume_perf_option (cfg_volume_perf, item); + else if (!strcasecmp(item->key, "GetLatency")) + cna_config_volume_perf_option (cfg_volume_perf, item); + else if (!strcasecmp(item->key, "IgnoreSelectedIO")) + cna_config_volume_perf_default (cfg_volume_perf, item); + else if (!strcasecmp(item->key, "IgnoreSelectedOps")) + cna_config_volume_perf_default (cfg_volume_perf, item); + else if (!strcasecmp(item->key, "IgnoreSelectedLatency")) + cna_config_volume_perf_default (cfg_volume_perf, item); + else + WARNING ("netapp plugin: The option %s is not allowed within " + "`VolumePerf' blocks.", item->key); } - if (!had_df) { - cfg_volume_data->flags |= CFG_VOLUME_USAGE_DF; - host_set_all_cfg_volume_usage_flags(host, CFG_VOLUME_USAGE_DF, /* set = */ true); + + return (0); +} /* }}} int cna_config_volume_performance */ + +/* Handling of the "GetCapacity" and "GetSnapshot" options within a + * block. */ +static void cna_config_volume_usage_option (cfg_volume_usage_t *cvu, /* {{{ */ + const oconfig_item_t *ci) +{ + char *name; + ignorelist_t * il; + + if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING)) + { + WARNING ("netapp plugin: The %s option requires exactly one string argument.", + ci->key); + return; } - if (cfg_volume_data->flags & CFG_VOLUME_USAGE_SNAP) { - WARNING("netapp plugin: The \"GetSnapUtil\" option does not support the \"+\" wildcard."); + + name = ci->values[0].value.string; + + if (strcasecmp ("GetCapacity", ci->key) == 0) + il = cvu->il_capacity; + else if (strcasecmp ("GetSnapshot", ci->key) == 0) + il = cvu->il_snapshot; + else + return; + + ignorelist_add (il, name); +} /* }}} void cna_config_volume_usage_option */ + +/* Handling of the "IgnoreSelectedCapacity" and "IgnoreSelectedSnapshot" + * options within a block. */ +static void cna_config_volume_usage_default (cfg_volume_usage_t *cvu, /* {{{ */ + const oconfig_item_t *ci) +{ + ignorelist_t *il; + + if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_BOOLEAN)) + { + WARNING ("netapp plugin: The %s option requires exactly one string argument.", + ci->key); + return; } -} /* }}} void cna_config_volume_usage */ + + if (strcasecmp ("IgnoreSelectedCapacity", ci->key) == 0) + il = cvu->il_capacity; + else if (strcasecmp ("IgnoreSelectedSnapshot", ci->key) == 0) + il = cvu->il_snapshot; + else + return; + + if (ci->values[0].value.boolean) + ignorelist_set_invert (il, /* invert = */ 0); + else + ignorelist_set_invert (il, /* invert = */ 1); +} /* }}} void cna_config_volume_usage_default */ /* Corresponds to a block */ static int cna_config_disk(host_config_t *host, oconfig_item_t *ci) { /* {{{ */ @@ -1663,6 +2170,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 */ @@ -1718,9 +2233,87 @@ static int cna_config_wafl(host_config_t *host, oconfig_item_t *ci) /* {{{ */ return (0); } /* }}} int cna_config_wafl */ +/* + * + * GetCapacity "vol0" + * GetCapacity "vol1" + * GetCapacity "vol2" + * GetCapacity "vol3" + * GetCapacity "vol4" + * IgnoreSelectedCapacity false + * + * GetSnapshot "vol0" + * GetSnapshot "vol3" + * GetSnapshot "vol4" + * GetSnapshot "vol7" + * IgnoreSelectedSnapshot false + * + */ +/* Corresponds to a block */ +static int cna_config_volume_usage(host_config_t *host, /* {{{ */ + const oconfig_item_t *ci) +{ + cfg_volume_usage_t *cfg_volume_usage; + int i; + + if ((host == NULL) || (ci == NULL)) + return (EINVAL); + + if (host->cfg_volume_usage == NULL) + { + cfg_volume_usage = malloc (sizeof (*cfg_volume_usage)); + if (cfg_volume_usage == NULL) + return (ENOMEM); + memset (cfg_volume_usage, 0, sizeof (*cfg_volume_usage)); + + /* Set default flags */ + cfg_volume_usage->query = NULL; + cfg_volume_usage->volumes = NULL; + + cfg_volume_usage->il_capacity = ignorelist_create (/* invert = */ 1); + if (cfg_volume_usage->il_capacity == NULL) + { + sfree (cfg_volume_usage); + return (ENOMEM); + } + + cfg_volume_usage->il_snapshot = ignorelist_create (/* invert = */ 1); + if (cfg_volume_usage->il_snapshot == NULL) + { + ignorelist_free (cfg_volume_usage->il_capacity); + sfree (cfg_volume_usage); + return (ENOMEM); + } + + host->cfg_volume_usage = cfg_volume_usage; + } + cfg_volume_usage = host->cfg_volume_usage; + + for (i = 0; i < ci->children_num; ++i) { + oconfig_item_t *item = ci->children + i; + + /* 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, "GetCapacity")) + cna_config_volume_usage_option (cfg_volume_usage, item); + 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); + else if (!strcasecmp(item->key, "IgnoreSelectedSnapshot")) + cna_config_volume_usage_default (cfg_volume_usage, item); + else + WARNING ("netapp plugin: The option %s is not allowed within " + "`VolumeUsage' blocks.", item->key); + } + + return (0); +} /* }}} int cna_config_volume_usage */ + /* Corresponds to a block */ static int cna_config_system (host_config_t *host, /* {{{ */ - oconfig_item_t *ci, const cfg_service_t *default_service) + oconfig_item_t *ci) { cfg_system_t *cfg_system; int i; @@ -1762,16 +2355,22 @@ 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 */ /* Corresponds to a block. */ -static host_config_t *cna_config_host (const oconfig_item_t *ci, /* {{{ */ - const host_config_t *default_host, const cfg_service_t *def_def_service) +static host_config_t *cna_config_host (const oconfig_item_t *ci) /* {{{ */ { oconfig_item_t *item; host_config_t *host; - cfg_service_t default_service = *def_def_service; int status; int i; @@ -1781,7 +2380,18 @@ static host_config_t *cna_config_host (const oconfig_item_t *ci, /* {{{ */ } host = malloc(sizeof(*host)); - memcpy (host, default_host, sizeof (*host)); + memset (host, 0, sizeof (*host)); + host->name = NULL; + host->protocol = NA_SERVER_TRANSPORT_HTTPS; + host->host = NULL; + host->username = NULL; + host->password = NULL; + host->srv = NULL; + host->cfg_wafl = NULL; + host->cfg_disk = NULL; + host->cfg_volume_perf = NULL; + host->cfg_volume_usage = NULL; + host->cfg_system = NULL; status = cf_util_get_string (ci, &host->name); if (status != 0) @@ -1815,21 +2425,17 @@ static host_config_t *cna_config_host (const oconfig_item_t *ci, /* {{{ */ } else if (!strcasecmp(item->key, "Password")) { status = cf_util_get_string (item, &host->password); } else if (!strcasecmp(item->key, "Interval")) { - if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_NUMBER || item->values[0].value.number != (int) item->values[0].value.number || item->values[0].value.number < 2) { - WARNING("netapp plugin: \"Interval\" of host %s needs exactly one integer argument.", ci->values[0].value.string); - continue; - } - host->interval = item->values[0].value.number; - } else if (!strcasecmp(item->key, "GetVolumePerfData")) { - cna_config_volume_performance(host, item); - } else if (!strcasecmp(item->key, "System")) { - cna_config_system(host, item, &default_service); + status = cf_util_get_cdtime (item, &host->interval); } else if (!strcasecmp(item->key, "WAFL")) { cna_config_wafl(host, item); } else if (!strcasecmp(item->key, "Disks")) { cna_config_disk(host, item); - } else if (!strcasecmp(item->key, "GetVolumeData")) { + } else if (!strcasecmp(item->key, "VolumePerf")) { + cna_config_volume_performance(host, item); + } else if (!strcasecmp(item->key, "VolumeUsage")) { cna_config_volume_usage(host, item); + } else if (!strcasecmp(item->key, "System")) { + cna_config_system(host, item); } else { WARNING("netapp plugin: Ignoring unknown config option \"%s\" in host block \"%s\".", item->key, ci->values[0].value.string); @@ -1868,17 +2474,36 @@ static host_config_t *cna_config_host (const oconfig_item_t *ci, /* {{{ */ * * Pretty standard stuff here. */ -static int cna_init(void) { /* {{{ */ - char err[256]; - na_elem_t *e; - host_config_t *host; - cfg_service_t *service; - - if (!global_host_config) { - WARNING("netapp plugin: Plugin loaded but no hosts defined."); - return 1; +static int cna_init_host (host_config_t *host) /* {{{ */ +{ + if (host == NULL) + return (EINVAL); + + if (host->srv != NULL) + return (0); + + /* Request version 1.1 of the ONTAP API */ + host->srv = na_server_open(host->host, + /* major version = */ 1, /* minor version = */ 1); + if (host->srv == NULL) { + ERROR ("netapp plugin: na_server_open (%s) failed.", host->host); + return (-1); } + na_server_set_transport_type(host->srv, host->protocol, + /* transportarg = */ NULL); + na_server_set_port(host->srv, host->port); + na_server_style(host->srv, NA_STYLE_LOGIN_PASSWORD); + na_server_adminuser(host->srv, host->username, host->password); + na_server_set_timeout(host->srv, 5 /* seconds */); + + return 0; +} /* }}} int cna_init_host */ + +static int cna_init (void) /* {{{ */ +{ + char err[256]; + memset (err, 0, sizeof (err)); if (!na_startup(err, sizeof(err))) { err[sizeof (err) - 1] = 0; @@ -1886,127 +2511,83 @@ static int cna_init(void) { /* {{{ */ return 1; } - for (host = global_host_config; host; host = host->next) { - /* Request version 1.1 of the ONTAP API */ - host->srv = na_server_open(host->host, - /* major version = */ 1, /* minor version = */ 1); - if (host->srv == NULL) { - ERROR ("netapp plugin: na_server_open (%s) failed.", host->host); - continue; - } + return (0); +} /* }}} cna_init */ + +static int cna_read (user_data_t *ud) { /* {{{ */ + host_config_t *host; + int status; + + if ((ud == NULL) || (ud->data == NULL)) + return (-1); + + host = ud->data; + + status = cna_init_host (host); + if (status != 0) + return (status); + + cna_query_wafl (host); + cna_query_disk (host); + cna_query_volume_perf (host); + cna_query_volume_usage (host); + cna_query_system (host); - if (host->interval < interval_g) - host->interval = interval_g; - - na_server_set_transport_type(host->srv, host->protocol, - /* transportarg = */ NULL); - na_server_set_port(host->srv, host->port); - na_server_style(host->srv, NA_STYLE_LOGIN_PASSWORD); - na_server_adminuser(host->srv, host->username, host->password); - na_server_set_timeout(host->srv, 5 /* seconds */); - - for (service = host->services; service; service = service->next) { - service->interval = host->interval * service->multiplier; - - if (service->handler == query_volume_perf_data) { - service->query = na_elem_new("perf-object-get-instances"); - na_child_add_string(service->query, "objectname", "volume"); - e = na_elem_new("counters"); - /* "foo" means: This string has to be here but - the content doesn't matter. */ - na_child_add_string(e, "foo", "read_ops"); - na_child_add_string(e, "foo", "write_ops"); - na_child_add_string(e, "foo", "read_data"); - na_child_add_string(e, "foo", "write_data"); - na_child_add_string(e, "foo", "read_latency"); - na_child_add_string(e, "foo", "write_latency"); - na_child_add(service->query, e); - } else if (service->handler == collect_volume_data) { - service->query = na_elem_new("volume-list-info"); - /* na_child_add_string(service->query, "objectname", "volume"); */ - /* } else if (service->handler == collect_snapshot_data) { */ - /* service->query = na_elem_new("snapshot-list-info"); */ - } - } /* for (host->services) */ - } return 0; -} /* }}} int cna_init */ +} /* }}} int cna_read */ static int cna_config (oconfig_item_t *ci) { /* {{{ */ int i; oconfig_item_t *item; - host_config_t default_host = HOST_INIT; - cfg_service_t default_service = SERVICE_INIT; - + for (i = 0; i < ci->children_num; ++i) { item = ci->children + i; - if (!strcasecmp(item->key, "Host")) { + if (strcasecmp(item->key, "Host") == 0) + { host_config_t *host; - host_config_t *tmp; + char cb_name[256]; + struct timespec interval; + user_data_t ud; - host = cna_config_host(item, &default_host, &default_service); + host = cna_config_host (item); if (host == NULL) continue; - for (tmp = global_host_config; tmp != NULL; tmp = tmp->next) - { - if (strcasecmp (host->name, tmp->name) == 0) - WARNING ("netapp plugin: Duplicate definition of host `%s'. " - "This is probably a bad idea.", - host->name); + ssnprintf (cb_name, sizeof (cb_name), "netapp-%s", host->name); - if (tmp->next == NULL) - break; - } + CDTIME_T_TO_TIMESPEC (host->interval, &interval); - host->next = NULL; - if (tmp == NULL) - global_host_config = host; - else - tmp->next = host; - } else { + memset (&ud, 0, sizeof (ud)); + ud.data = host; + ud.free_func = (void (*) (void *)) free_host_config; + + plugin_register_complex_read (/* group = */ NULL, cb_name, + /* callback = */ cna_read, + /* interval = */ (host->interval > 0) ? &interval : NULL, + /* user data = */ &ud); + continue; + } + else /* if (item->key != "Host") */ + { WARNING("netapp plugin: Ignoring unknown config option \"%s\".", item->key); } } return 0; } /* }}} int cna_config */ -static int cna_read(void) { /* {{{ */ - na_elem_t *out; - host_config_t *host; - cfg_service_t *service; - - for (host = global_host_config; host; host = host->next) { - for (service = host->services; service; service = service->next) { - if (--service->skip_countdown > 0) continue; - service->skip_countdown = service->multiplier; - out = na_server_invoke_elem(host->srv, service->query); - if (na_results_status(out) != NA_OK) { - int netapp_errno = na_results_errno(out); - ERROR("netapp plugin: Error %d from host %s: %s", netapp_errno, host->name, na_results_reason(out)); - na_elem_free(out); - if (netapp_errno == EIO || netapp_errno == ETIMEDOUT) { - /* Network problems. Just give up on all other services on this host. */ - break; - } - continue; - } - service->handler(host, out, service->data); - na_elem_free(out); - } /* for (host->services) */ +static int cna_shutdown (void) /* {{{ */ +{ + /* Clean up system resources and stuff. */ + na_shutdown (); - cna_query_wafl (host); - cna_query_disk (host); - cna_query_system (host); - } - return 0; -} /* }}} int cna_read */ + return (0); +} /* }}} int cna_shutdown */ void module_register(void) { plugin_register_complex_config("netapp", cna_config); plugin_register_init("netapp", cna_init); - plugin_register_read("netapp", cna_read); + plugin_register_shutdown("netapp", cna_shutdown); } /* vim: set sw=2 ts=2 noet fdm=marker : */