X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnetapp.c;h=c2ebc9f96efbe202147edfcdcdb5f32299279ca8;hb=7658e9919a3ac9efafe4c7c2c76112ec67eeee3b;hp=13e2b99fb48e13b7c8e6fe223267772495b36f99;hpb=6dded6c5bc6582de8d75b3fb9932902c325641ff;p=collectd.git diff --git a/src/netapp.c b/src/netapp.c index 13e2b99f..c2ebc9f9 100644 --- a/src/netapp.c +++ b/src/netapp.c @@ -21,7 +21,7 @@ * DEALINGS IN THE SOFTWARE. * * Authors: - * Sven Trenkel + * Sven Trenkel **/ #include "collectd.h" @@ -29,89 +29,130 @@ #include +#define HAS_ALL_FLAGS(has,needs) (((has) & (needs)) == (needs)) + typedef struct host_config_s host_config_t; typedef void service_handler_t(host_config_t *host, na_elem_t *result, void *data); -#define PERF_SYSTEM_CPU 0x01 -#define PERF_SYSTEM_NET 0x02 -#define PERF_SYSTEM_OPS 0x04 -#define PERF_SYSTEM_DISK 0x08 -#define PERF_SYSTEM_ALL 0x0F +struct cna_interval_s +{ + time_t interval; + time_t last_read; +}; +typedef struct cna_interval_s cna_interval_t; /*! - * \brief Persistent data for system performence counters + * \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; -} perf_system_data_t; + cna_interval_t interval; + na_elem_t *query; +} cfg_system_t; /*! - * \brief Persistent data for WAFL performence counters. (a.k.a. cache performence) + * \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 + * counter. The "cfg_wafl_t" struct therefore contains old counter values along + * with flags, which are set if the counter is valid. + * + * The function "cna_handle_wafl_data" will fill a new structure of this kind + * with new values, then pass both, new and old data, to "submit_wafl_data". + * That function calculates the hit ratios, submits the calculated values and + * updates the old counter values for the next iteration. */ - -#define PERF_WAFL_NAME_CACHE 0x01 -#define PERF_WAFL_DIR_CACHE 0x02 -#define PERF_WAFL_BUF_CACHE 0x04 -#define PERF_WAFL_INODE_CACHE 0x08 -#define PERF_WAFL_ALL 0x0F - -typedef struct { - uint32_t flags; - uint64_t last_name_cache_hit; - uint64_t last_name_cache_miss; - uint64_t last_find_dir_hit; - uint64_t last_find_dir_miss; - uint64_t last_buf_hash_hit; - uint64_t last_buf_hash_miss; - uint64_t last_inode_cache_hit; - uint64_t last_inode_cache_miss; -} perf_wafl_data_t; - -#define PERF_VOLUME_INIT 0x01 -#define PERF_VOLUME_IO 0x02 -#define PERF_VOLUME_OPS 0x03 -#define PERF_VOLUME_LATENCY 0x08 -#define PERF_VOLUME_ALL 0x0F - +#define CFG_WAFL_NAME_CACHE 0x0001 +#define CFG_WAFL_DIR_CACHE 0x0002 +#define CFG_WAFL_BUF_CACHE 0x0004 +#define CFG_WAFL_INODE_CACHE 0x0008 +#define CFG_WAFL_ALL 0x000F +#define HAVE_WAFL_NAME_CACHE_HIT 0x0100 +#define HAVE_WAFL_NAME_CACHE_MISS 0x0200 +#define HAVE_WAFL_NAME_CACHE (HAVE_WAFL_NAME_CACHE_HIT | HAVE_WAFL_NAME_CACHE_MISS) +#define HAVE_WAFL_FIND_DIR_HIT 0x0400 +#define HAVE_WAFL_FIND_DIR_MISS 0x0800 +#define HAVE_WAFL_FIND_DIR (HAVE_WAFL_FIND_DIR_HIT | HAVE_WAFL_FIND_DIR_MISS) +#define HAVE_WAFL_BUF_HASH_HIT 0x1000 +#define HAVE_WAFL_BUF_HASH_MISS 0x2000 +#define HAVE_WAFL_BUF_HASH (HAVE_WAFL_BUF_HASH_HIT | HAVE_WAFL_BUF_HASH_MISS) +#define HAVE_WAFL_INODE_CACHE_HIT 0x4000 +#define HAVE_WAFL_INODE_CACHE_MISS 0x8000 +#define HAVE_WAFL_INODE_CACHE (HAVE_WAFL_INODE_CACHE_HIT | HAVE_WAFL_INODE_CACHE_MISS) +#define HAVE_WAFL_ALL 0xff00 typedef struct { uint32_t flags; -} perf_volume_data_t; - -typedef struct { - uint32_t flags; -} volume_data_t; + cna_interval_t interval; + na_elem_t *query; -#define PERF_DISK_BUSIEST 0x01 -#define PERF_DISK_ALL 0x01 + time_t timestamp; + uint64_t name_cache_hit; + uint64_t name_cache_miss; + uint64_t find_dir_hit; + uint64_t find_dir_miss; + uint64_t buf_hash_hit; + uint64_t buf_hash_miss; + uint64_t inode_cache_hit; + uint64_t inode_cache_miss; +} cfg_wafl_t; +/*! + * \brief Persistent data for volume performance data. + * + * The code below uses the difference of the operations and latency counters to + * calculate an average per-operation latency. For this, old counters need to + * be stored in the "data_volume_perf_t" structure. The byte-counters are just + * 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 + * function, the per-operation latency is calculated and dispatched, then the + * old counters are updated. + */ +#define CFG_VOLUME_PERF_INIT 0x0001 +#define CFG_VOLUME_PERF_IO 0x0002 +#define CFG_VOLUME_PERF_OPS 0x0003 +#define CFG_VOLUME_PERF_LATENCY 0x0008 +#define CFG_VOLUME_PERF_ALL 0x000F +#define HAVE_VOLUME_PERF_BYTES_READ 0x0010 +#define HAVE_VOLUME_PERF_BYTES_WRITE 0x0020 +#define HAVE_VOLUME_PERF_OPS_READ 0x0040 +#define HAVE_VOLUME_PERF_OPS_WRITE 0x0080 +#define HAVE_VOLUME_PERF_LATENCY_READ 0x0100 +#define HAVE_VOLUME_PERF_LATENCY_WRITE 0x0200 +#define HAVE_VOLUME_PERF_ALL 0x03F0 typedef struct { uint32_t flags; -} perf_disk_data_t; +} cfg_volume_perf_t; typedef struct { uint32_t flags; - time_t last_timestamp; - uint64_t last_read_latency; - uint64_t last_write_latency; - uint64_t last_read_ops; - uint64_t last_write_ops; -} per_volume_perf_data_t; - -#define VOLUME_INIT 0x01 -#define VOLUME_DF 0x02 -#define VOLUME_SNAP 0x04 + 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; +/*! + * \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 { uint32_t flags; -} per_volume_data_t; - -typedef struct { - time_t last_update; - double last_disk_busy_percent; - uint64_t last_disk_busy; - uint64_t last_base_for_disk_busy; -} per_disk_perf_data_t; + uint64_t snap_used; +} cfg_volume_usage_t; typedef struct service_config_s { na_elem_t *query; @@ -121,34 +162,55 @@ typedef struct service_config_s { int interval; void *data; struct service_config_s *next; -} service_config_t; - +} 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; - per_volume_perf_data_t perf_data; - per_volume_data_t volume_data; + 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. + * \brief A disk in the NetApp. * - * A disk doesn't have any more information than its name atm. + * 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; - per_disk_perf_data_t perf_data; + 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 DISK_INIT {0, {0, 0, 0, 0}, 0} +#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; struct host_config_s { - na_server_t *srv; char *name; na_server_transport_t protocol; char *host; @@ -156,33 +218,155 @@ struct host_config_s { char *username; char *password; int interval; - service_config_t *services; - disk_t *disks; + + na_server_t *srv; + cfg_service_t *services; + cfg_disk_t *cfg_disk; + cfg_wafl_t *cfg_wafl; + 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; + + next = disk->next; + + sfree (disk->name); + sfree (disk); + + free_disk (next); +} /* }}} void free_disk */ + +static void free_cfg_wafl (cfg_wafl_t *cw) /* {{{ */ +{ + if (cw == NULL) + return; + + if (cw->query != NULL) + na_elem_free (cw->query); + + sfree (cw); +} /* }}} void free_cfg_wafl */ + +static void free_cfg_disk (cfg_disk_t *cfg_disk) /* {{{ */ +{ + if (cfg_disk == NULL) + return; -#define HOST_INIT {0, 0, NA_SERVER_TRANSPORT_HTTPS, 0, 0, 0, 0, 10, 0, 0, 0} + free_disk (cfg_disk->disks); + sfree (cfg_disk); +} /* }}} void free_cfg_disk */ -static host_config_t *host_config; +static void free_cfg_service (cfg_service_t *service) /* {{{ */ +{ + cfg_service_t *next; + + if (service == NULL) + return; + + next = service->next; + + /* FIXME: Free service->data? */ + na_elem_free(service->query); + + sfree (service); + + free_cfg_service (next); +} /* }}} void free_cfg_service */ + +static void free_host_config (host_config_t *hc) /* {{{ */ +{ + host_config_t *next; + + if (hc == NULL) + return; + + next = hc->next; + + sfree (hc->name); + sfree (hc->host); + sfree (hc->username); + sfree (hc->password); -static volume_t *get_volume (host_config_t *host, const char *name) /* {{{ */ + free_cfg_service (hc->services); + free_cfg_disk (hc->cfg_disk); + free_cfg_wafl (hc->cfg_wafl); + free_volume (hc->volumes); + + sfree (hc); + + free_host_config (next); +} /* }}} void free_host_config */ + +/* + * Auxiliary functions + * + * 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) - return v; + 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); @@ -195,34 +379,67 @@ static volume_t *get_volume (host_config_t *host, const char *name) /* {{{ */ return v; } /* }}} volume_t *get_volume */ -static disk_t *get_disk(host_config_t *host, const char *name) /* {{{ */ +static disk_t *get_disk(cfg_disk_t *cd, const char *name) /* {{{ */ { - disk_t *v, init = DISK_INIT; + disk_t *d; - if (name == NULL) + if ((cd == NULL) || (name == NULL)) return (NULL); - - for (v = host->disks; v; v = v->next) { - if (strcmp(v->name, name) == 0) - return v; + + for (d = cd->disks; d != NULL; d = d->next) { + if (strcmp(d->name, name) == 0) + return d; } - v = malloc(sizeof(*v)); - if (v == NULL) + + d = malloc(sizeof(*d)); + if (d == NULL) return (NULL); + memset (d, 0, sizeof (*d)); + d->next = NULL; - *v = init; - v->name = strdup(name); - if (v->name == NULL) { - sfree (v); + d->name = strdup(name); + if (d->name == NULL) { + sfree (d); return (NULL); } - v->next = host->disks; - host->disks = v; + d->next = cd->disks; + cd->disks = d; - return v; + return d; } /* }}} disk_t *get_disk */ +static void host_set_all_perf_data_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->perf_data.flags |= flag; + else /* if (!set) */ + v->perf_data.flags &= ~flag; + } +} /* }}} 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; + } +} /* }}} void host_set_all_cfg_volume_usage_flags */ + +/* + * Various submit functions. + * + * They all eventually call "submit_values" which creates a value_list_t and + * dispatches it to the daemon. + */ static int submit_values (const char *host, /* {{{ */ const char *plugin_inst, const char *type, const char *type_inst, @@ -275,6 +492,19 @@ static int submit_counter (const char *host, const char *plugin_inst, /* {{{ */ &v, 1, timestamp)); } /* }}} 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) +{ + value_t values[2]; + + values[0].gauge = val0; + values[1].gauge = val1; + + return (submit_values (host, plugin_inst, type, type_inst, + values, 2, timestamp)); +} /* }}} 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) { @@ -286,262 +516,619 @@ static int submit_double (const char *host, const char *plugin_inst, /* {{{ */ &v, 1, timestamp)); } /* }}} int submit_uint64 */ +/* Calculate hit ratio from old and new counters and submit the resulting + * percentage. Used by "submit_wafl_data". */ static int submit_cache_ratio (const char *host, /* {{{ */ const char *plugin_inst, const char *type_inst, uint64_t new_hits, uint64_t new_misses, - uint64_t *old_hits, - uint64_t *old_misses, + uint64_t old_hits, + uint64_t old_misses, time_t timestamp) { value_t v; - if ((new_hits >= (*old_hits)) && (new_misses >= (*old_misses))) { + if ((new_hits >= old_hits) && (new_misses >= old_misses)) { uint64_t hits; uint64_t misses; - hits = new_hits - (*old_hits); - misses = new_misses - (*old_misses); + hits = new_hits - old_hits; + misses = new_misses - old_misses; v.gauge = 100.0 * ((gauge_t) hits) / ((gauge_t) (hits + misses)); } else { v.gauge = NAN; } - *old_hits = new_hits; - *old_misses = new_misses; - return (submit_values (host, plugin_inst, "cache_ratio", type_inst, &v, 1, timestamp)); } /* }}} int submit_cache_ratio */ -static void collect_perf_wafl_data(host_config_t *host, na_elem_t *out, void *data) { /* {{{ */ - perf_wafl_data_t *wafl = data; - uint64_t name_cache_hit = 0, name_cache_miss = 0; - uint64_t find_dir_hit = 0, find_dir_miss = 0; - uint64_t buf_hash_hit = 0, buf_hash_miss = 0; - uint64_t inode_cache_hit = 0, inode_cache_miss = 0; - const char *plugin_inst; - time_t timestamp; - na_elem_t *counter; - - timestamp = (time_t) na_child_get_uint64(out, "timestamp", 0); - out = na_elem_child(na_elem_child(out, "instances"), "instance-data"); - plugin_inst = na_child_get_string(out, "name"); +/* 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) +{ + /* Submit requested counters */ + if (HAS_ALL_FLAGS (old_data->flags, CFG_WAFL_NAME_CACHE | HAVE_WAFL_NAME_CACHE) + && HAS_ALL_FLAGS (new_data->flags, HAVE_WAFL_NAME_CACHE)) + 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); + + 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); + + 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); + + 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); + + /* Clear old HAVE_* flags */ + old_data->flags &= ~HAVE_WAFL_ALL; + + /* Copy all counters */ + old_data->timestamp = new_data->timestamp; + old_data->name_cache_hit = new_data->name_cache_hit; + old_data->name_cache_miss = new_data->name_cache_miss; + old_data->find_dir_hit = new_data->find_dir_hit; + old_data->find_dir_miss = new_data->find_dir_miss; + old_data->buf_hash_hit = new_data->buf_hash_hit; + old_data->buf_hash_miss = new_data->buf_hash_miss; + old_data->inode_cache_hit = new_data->inode_cache_hit; + old_data->inode_cache_miss = new_data->inode_cache_miss; + + /* Copy HAVE_* flags */ + old_data->flags |= (new_data->flags & HAVE_WAFL_ALL); - /* Iterate over all counters */ - na_elem_iter_t iter = na_child_iterator(na_elem_child(out, "counters")); - for (counter = na_iterator_next(&iter); counter; counter = na_iterator_next(&iter)) { - const char *name; + return (0); +} /* }}} int submit_wafl_data */ - name = na_child_get_string(counter, "name"); - if (!strcmp(name, "name_cache_hit")) - name_cache_hit = na_child_get_uint64(counter, "value", UINT64_MAX); - else if (!strcmp(name, "name_cache_miss")) - name_cache_miss = na_child_get_uint64(counter, "value", UINT64_MAX); - else if (!strcmp(name, "find_dir_hit")) - find_dir_hit = na_child_get_uint64(counter, "value", UINT64_MAX); - else if (!strcmp(name, "find_dir_miss")) - find_dir_miss = na_child_get_uint64(counter, "value", UINT64_MAX); - else if (!strcmp(name, "buf_hash_hit")) - buf_hash_hit = na_child_get_uint64(counter, "value", UINT64_MAX); - else if (!strcmp(name, "buf_hash_miss")) - buf_hash_miss = na_child_get_uint64(counter, "value", UINT64_MAX); - else if (!strcmp(name, "inode_cache_hit")) - inode_cache_hit = na_child_get_uint64(counter, "value", UINT64_MAX); - else if (!strcmp(name, "inode_cache_miss")) - inode_cache_miss = na_child_get_uint64(counter, "value", UINT64_MAX); - else - DEBUG("netapp plugin: Found unexpected child: %s", name); +/* 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) +{ + /* Check for and submit disk-octet values */ + if (HAS_ALL_FLAGS (volume->perf_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 requested counters */ - if ((wafl->flags & PERF_WAFL_NAME_CACHE) - && (name_cache_hit != UINT64_MAX) && (name_cache_miss != UINT64_MAX)) - submit_cache_ratio (host->name, plugin_inst, "name_cache_hit", - name_cache_hit, name_cache_miss, - &wafl->last_name_cache_hit, &wafl->last_name_cache_miss, - timestamp); - - if ((wafl->flags & PERF_WAFL_DIR_CACHE) - && (find_dir_hit != UINT64_MAX) && (find_dir_miss != UINT64_MAX)) - submit_cache_ratio (host->name, plugin_inst, "find_dir_hit", - find_dir_hit, find_dir_miss, - &wafl->last_find_dir_hit, &wafl->last_find_dir_miss, - timestamp); - - if ((wafl->flags & PERF_WAFL_BUF_CACHE) - && (buf_hash_hit != UINT64_MAX) && (buf_hash_miss != UINT64_MAX)) - submit_cache_ratio (host->name, plugin_inst, "buf_hash_hit", - buf_hash_hit, buf_hash_miss, - &wafl->last_buf_hash_hit, &wafl->last_buf_hash_miss, - timestamp); - - if ((wafl->flags & PERF_WAFL_INODE_CACHE) - && (inode_cache_hit != UINT64_MAX) && (inode_cache_miss != UINT64_MAX)) - submit_cache_ratio (host->name, plugin_inst, "inode_cache_hit", - inode_cache_hit, inode_cache_miss, - &wafl->last_inode_cache_hit, &wafl->last_inode_cache_miss, - timestamp); -} /* }}} void collect_perf_wafl_data */ - -static void collect_perf_disk_data(host_config_t *host, na_elem_t *out, void *data) { /* {{{ */ - perf_disk_data_t *perf = data; - const char *name; - time_t timestamp; - na_elem_t *counter, *inst; - disk_t *disk, *worst_disk = 0; - - timestamp = (time_t) na_child_get_uint64(out, "timestamp", 0); - out = na_elem_child(out, "instances"); + /* Check for and submit disk-operations values */ + if (HAS_ALL_FLAGS (volume->perf_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); + } - /* Iterate over all children */ - 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 disk_busy = 0; - uint64_t base_for_disk_busy = 0; + /* Check for, calculate and submit disk-latency values */ + if (HAS_ALL_FLAGS (volume->perf_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 + | HAVE_VOLUME_PERF_LATENCY_READ | HAVE_VOLUME_PERF_LATENCY_WRITE)) + { + gauge_t latency_per_op_read; + gauge_t latency_per_op_write; - disk = get_disk(host, na_child_get_string(inst, "name")); - if (disk == NULL) - continue; + latency_per_op_read = NAN; + latency_per_op_write = NAN; - /* Look for the "disk_busy" and "base_for_disk_busy" counters */ - 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)) { - name = na_child_get_string(counter, "name"); - if (name == NULL) - continue; + /* 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)) + { + uint64_t diff_ops_read; + uint64_t diff_latency_read; - if (strcmp(name, "disk_busy") == 0) - disk_busy = na_child_get_uint64(counter, "value", UINT64_MAX); - else if (strcmp(name, "base_for_disk_busy") == 0) - base_for_disk_busy = na_child_get_uint64(counter, "value", UINT64_MAX); - } + diff_ops_read = new_data->read_ops - volume->perf_data.read_ops; + diff_latency_read = new_data->read_latency - volume->perf_data.read_latency; - if ((disk_busy == UINT64_MAX) || (base_for_disk_busy == UINT64_MAX)) - { - disk->perf_data.last_disk_busy = 0; - disk->perf_data.last_base_for_disk_busy = 0; - continue; + if (diff_ops_read > 0) + latency_per_op_read = ((gauge_t) diff_latency_read) / ((gauge_t) diff_ops_read); } - disk->perf_data.last_update = timestamp; - if ((disk_busy >= disk->perf_data.last_disk_busy) - && (base_for_disk_busy >= disk->perf_data.last_base_for_disk_busy)) + if ((new_data->write_ops > volume->perf_data.write_ops) + && (new_data->write_latency > volume->perf_data.write_latency)) { - uint64_t disk_busy_diff; - uint64_t base_diff; + uint64_t diff_ops_write; + uint64_t diff_latency_write; - disk_busy_diff = disk_busy - disk->perf_data.last_disk_busy; - base_diff = base_for_disk_busy - disk->perf_data.last_base_for_disk_busy; + diff_ops_write = new_data->write_ops - volume->perf_data.write_ops; + diff_latency_write = new_data->write_latency - volume->perf_data.write_latency; - if (base_diff == 0) - disk->perf_data.last_disk_busy_percent = NAN; - else - disk->perf_data.last_disk_busy_percent = 100.0 - * ((gauge_t) disk_busy_diff) / ((gauge_t) base_diff); - } - else - { - disk->perf_data.last_disk_busy_percent = NAN; + if (diff_ops_write > 0) + latency_per_op_write = ((gauge_t) diff_latency_write) / ((gauge_t) diff_ops_write); } - disk->perf_data.last_disk_busy = disk_busy; - disk->perf_data.last_base_for_disk_busy = base_for_disk_busy; - - if ((worst_disk == NULL) - || (worst_disk->perf_data.last_disk_busy_percent < disk->perf_data.last_disk_busy_percent)) - worst_disk = disk; + submit_two_gauge (host->name, volume->name, "disk_latency", /* type instance = */ NULL, + latency_per_op_read, latency_per_op_write, new_data->timestamp); } - if ((perf->flags & PERF_DISK_BUSIEST) && (worst_disk != NULL)) - submit_double (host->name, "system", "percent", "disk_busy", - worst_disk->perf_data.last_disk_busy_percent, timestamp); -} /* }}} void collect_perf_disk_data */ - -static void collect_volume_data(host_config_t *host, na_elem_t *out, void *data) { /* {{{ */ - na_elem_t *inst; - volume_t *volume; - volume_data_t *volume_data = data; + /* Clear all HAVE_* flags. */ + volume->perf_data.flags &= ~HAVE_VOLUME_PERF_ALL; - 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; + /* 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; - na_elem_t *sis; - const char *sis_state; - uint64_t sis_saved_reported; - uint64_t sis_saved; + /* Copy the HAVE_* flags */ + volume->perf_data.flags |= (new_data->flags & HAVE_VOLUME_PERF_ALL); - volume = get_volume(host, na_child_get_string(inst, "name")); - if (volume == NULL) - continue; + return (0); +} /* }}} int submit_volume_perf_data */ - if (!(volume->volume_data.flags & VOLUME_INIT)) - volume->volume_data.flags = volume_data->flags; +/* + * Query functions + * + * These functions are called with appropriate data returned by the libnetapp + * interface which is parsed and submitted with the above functions. + */ +/* Data corresponding to */ +static int cna_handle_wafl_data (const char *hostname, cfg_wafl_t *cfg_wafl, /* {{{ */ + na_elem_t *data) +{ + cfg_wafl_t perf_data; + const char *plugin_inst; - if (!(volume->volume_data.flags & VOLUME_DF)) - continue; + na_elem_t *instances; + na_elem_t *counter; + na_elem_iter_t counter_iter; - /* 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", "used", - (double) size_used, /* time = */ 0); + memset (&perf_data, 0, sizeof (perf_data)); + + perf_data.timestamp = (time_t) na_child_get_uint64 (data, "timestamp", 0); - size_used = na_child_get_uint64(inst, "size-used", UINT64_MAX); - if (size_free != UINT64_MAX) - submit_double (host->name, volume->name, "df_complex", "free", - (double) size_free, /* time = */ 0); + 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."); + return (-1); + } - snap_reserved = na_child_get_uint64(inst, "snapshot-blocks-reserved", UINT64_MAX); - if (snap_reserved != UINT64_MAX) - /* 1 block == 1024 bytes as per API docs */ - submit_double (host->name, volume->name, "df_complex", "snap_reserved", - (double) (1024 * snap_reserved), /* time = */ 0); + plugin_inst = na_child_get_string(instances, "name"); + if (plugin_inst == NULL) + { + ERROR ("netapp plugin: cna_handle_wafl_data: " + "na_child_get_string (\"name\") failed."); + return (-1); + } - sis = na_elem_child(inst, "sis"); - if (sis == NULL) - continue; + /* Iterate over all counters */ + counter_iter = na_child_iterator (na_elem_child (instances, "counters")); + for (counter = na_iterator_next (&counter_iter); + counter != NULL; + counter = na_iterator_next (&counter_iter)) + { + const char *name; + uint64_t value; - sis_state = na_child_get_string(sis, "state"); - if ((sis_state == NULL) - || (strcmp ("enabled", sis_state) != 0)) + name = na_child_get_string(counter, "name"); + if (name == NULL) continue; - sis_saved_reported = na_child_get_uint64(sis, "size-saved", UINT64_MAX); - if (sis_saved_reported == UINT64_MAX) + value = na_child_get_uint64(counter, "value", UINT64_MAX); + if (value == 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. */ - sis_saved = sis_saved_reported; + if (!strcmp(name, "name_cache_hit")) { + perf_data.name_cache_hit = value; + perf_data.flags |= HAVE_WAFL_NAME_CACHE_HIT; + } else if (!strcmp(name, "name_cache_miss")) { + perf_data.name_cache_miss = value; + perf_data.flags |= HAVE_WAFL_NAME_CACHE_MISS; + } else if (!strcmp(name, "find_dir_hit")) { + perf_data.find_dir_hit = value; + perf_data.flags |= HAVE_WAFL_FIND_DIR_HIT; + } else if (!strcmp(name, "find_dir_miss")) { + perf_data.find_dir_miss = value; + perf_data.flags |= HAVE_WAFL_FIND_DIR_MISS; + } else if (!strcmp(name, "buf_hash_hit")) { + perf_data.buf_hash_hit = value; + perf_data.flags |= HAVE_WAFL_BUF_HASH_HIT; + } else if (!strcmp(name, "buf_hash_miss")) { + perf_data.buf_hash_miss = value; + perf_data.flags |= HAVE_WAFL_BUF_HASH_MISS; + } else if (!strcmp(name, "inode_cache_hit")) { + perf_data.inode_cache_hit = value; + perf_data.flags |= HAVE_WAFL_INODE_CACHE_HIT; + } else if (!strcmp(name, "inode_cache_miss")) { + perf_data.inode_cache_miss = value; + perf_data.flags |= HAVE_WAFL_INODE_CACHE_MISS; } else { - uint64_t sis_saved_percent; - uint64_t sis_saved_guess; - uint64_t overflow_guess; - uint64_t guess1, guess2, guess3; + DEBUG("netapp plugin: cna_handle_wafl_data: " + "Found unexpected child: %s", name); + } + } - sis_saved_percent = na_child_get_uint64(sis, "percentage-saved", UINT64_MAX); - if (sis_saved_percent > 100) - continue; + return (submit_wafl_data (hostname, plugin_inst, cfg_wafl, &perf_data)); +} /* }}} void cna_handle_wafl_data */ - /* 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; +static int cna_setup_wafl (cfg_wafl_t *cw) /* {{{ */ +{ + na_elem_t *e; - overflow_guess = sis_saved_guess >> 32; + if (cw == NULL) + return (EINVAL); + + if (cw->query != NULL) + return (0); + + cw->query = na_elem_new("perf-object-get-instances"); + if (cw->query == NULL) + { + ERROR ("netapp plugin: na_elem_new failed."); + return (-1); + } + na_child_add_string (cw->query, "objectname", "wafl"); + + e = na_elem_new("counters"); + if (e == NULL) + { + na_elem_free (cw->query); + cw->query = NULL; + 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(cw->query, e); + + return (0); +} /* }}} int cna_setup_wafl */ + +static int cna_query_wafl (host_config_t *host) /* {{{ */ +{ + na_elem_t *data; + int status; + time_t now; + + if (host == NULL) + return (EINVAL); + + /* If WAFL was not configured, return without doing anything. */ + if (host->cfg_wafl == NULL) + return (0); + + now = time (NULL); + if ((host->cfg_wafl->interval.interval + host->cfg_wafl->interval.last_read) > now) + return (0); + + status = cna_setup_wafl (host->cfg_wafl); + if (status != 0) + return (status); + assert (host->cfg_wafl->query != NULL); + + 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)); + na_elem_free (data); + return (-1); + } + + status = cna_handle_wafl_data (host->name, host->cfg_wafl, data); + + if (status == 0) + host->cfg_wafl->interval.last_read = now; + + na_elem_free (data); + return (status); +} /* }}} int cna_query_wafl */ + +/* Data corresponding to */ +static int cna_handle_disk_data (const char *hostname, /* {{{ */ + cfg_disk_t *cfg_disk, na_elem_t *data) +{ + time_t timestamp; + na_elem_t *instances; + na_elem_t *instance; + na_elem_iter_t instance_iter; + disk_t *worst_disk = NULL; + + if ((cfg_disk == NULL) || (data == NULL)) + return (EINVAL); + + timestamp = (time_t) na_child_get_uint64(data, "timestamp", 0); + + instances = na_elem_child (data, "instances"); + if (instances == NULL) + { + ERROR ("netapp plugin: cna_handle_disk_data: " + "na_elem_child (\"instances\") failed."); + return (-1); + } + + /* Iterate over all children */ + instance_iter = na_child_iterator (instances); + for (instance = na_iterator_next (&instance_iter); + instance != NULL; + instance = na_iterator_next(&instance_iter)) + { + disk_t *old_data; + disk_t new_data; + + na_elem_iter_t counter_iterator; + na_elem_t *counter; + + memset (&new_data, 0, sizeof (new_data)); + new_data.timestamp = timestamp; + new_data.disk_busy_percent = NAN; + + old_data = get_disk(cfg_disk, na_child_get_string (instance, "name")); + if (old_data == NULL) + continue; + + /* Look for the "disk_busy" and "base_for_disk_busy" counters */ + counter_iterator = na_child_iterator(na_elem_child(instance, "counters")); + for (counter = na_iterator_next(&counter_iterator); + counter != NULL; + counter = na_iterator_next(&counter_iterator)) + { + 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); + if (value == UINT64_MAX) + continue; + + if (strcmp(name, "disk_busy") == 0) + { + new_data.disk_busy = value; + new_data.flags |= HAVE_DISK_BUSY; + } + else if (strcmp(name, "base_for_disk_busy") == 0) + { + new_data.base_for_disk_busy = value; + new_data.flags |= HAVE_DISK_BASE; + } + else + { + DEBUG ("netapp plugin: cna_handle_disk_data: " + "Counter not handled: %s = %"PRIu64, + name, value); + } + } + + /* If all required counters are available and did not just wrap around, + * calculate the busy percentage. Otherwise, the value is initialized to + * NAN at the top of the for-loop. */ + if (HAS_ALL_FLAGS (old_data->flags, HAVE_DISK_BUSY | HAVE_DISK_BASE) + && HAS_ALL_FLAGS (new_data.flags, HAVE_DISK_BUSY | HAVE_DISK_BASE) + && (new_data.disk_busy >= old_data->disk_busy) + && (new_data.base_for_disk_busy > old_data->base_for_disk_busy)) + { + uint64_t busy_diff; + uint64_t base_diff; + + busy_diff = new_data.disk_busy - old_data->disk_busy; + base_diff = new_data.base_for_disk_busy - old_data->base_for_disk_busy; + + new_data.disk_busy_percent = 100.0 + * ((gauge_t) busy_diff) / ((gauge_t) base_diff); + } + + /* Clear HAVE_* flags */ + old_data->flags &= ~HAVE_DISK_ALL; + + /* Copy data */ + old_data->timestamp = new_data.timestamp; + old_data->disk_busy = new_data.disk_busy; + old_data->base_for_disk_busy = new_data.base_for_disk_busy; + old_data->disk_busy_percent = new_data.disk_busy_percent; + + /* Copy flags */ + old_data->flags |= (new_data.flags & HAVE_DISK_ALL); + + if ((worst_disk == NULL) + || (worst_disk->disk_busy_percent < old_data->disk_busy_percent)) + worst_disk = old_data; + } /* for (all disks) */ + + if ((cfg_disk->flags & CFG_DISK_BUSIEST) && (worst_disk != NULL)) + submit_double (hostname, "system", "percent", "disk_busy", + worst_disk->disk_busy_percent, timestamp); + + return (0); +} /* }}} int cna_handle_disk_data */ + +static int cna_setup_disk (cfg_disk_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", "disk"); + + 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, "foo", "disk_busy"); + na_child_add_string(e, "foo", "base_for_disk_busy"); + na_child_add(cd->query, e); + + return (0); +} /* }}} int cna_setup_disk */ + +static int cna_query_disk (host_config_t *host) /* {{{ */ +{ + na_elem_t *data; + int status; + time_t now; + + if (host == NULL) + return (EINVAL); + + /* If the user did not configure disk statistics, return without doing + * anything. */ + if (host->cfg_disk == NULL) + return (0); + + now = time (NULL); + if ((host->cfg_disk->interval.interval + host->cfg_disk->interval.last_read) > now) + return (0); + + status = cna_setup_disk (host->cfg_disk); + if (status != 0) + return (status); + assert (host->cfg_disk->query != NULL); + + 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)); + na_elem_free (data); + return (-1); + } + + status = cna_handle_disk_data (host->name, host->cfg_disk, data); + + if (status == 0) + host->cfg_disk->interval.last_read = now; + + na_elem_free (data); + 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; + + na_elem_t *sis; + const char *sis_state; + uint64_t sis_saved_reported; + uint64_t sis_saved; + + volume = get_volume(host, na_child_get_string(inst, "name"), + cfg_volume_data->flags, /* perf_flags = */ 0); + if (volume == NULL) + continue; + + if (!(volume->cfg_volume_usage.flags & CFG_VOLUME_USAGE_DF)) + continue; + + /* 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); + } + + 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); + + sis = na_elem_child(inst, "sis"); + if (sis == NULL) + continue; + + sis_state = na_child_get_string(sis, "state"); + if ((sis_state == NULL) + || (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. */ + 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; + + 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 = 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; @@ -564,128 +1151,105 @@ static void collect_volume_data(host_config_t *host, na_elem_t *out, void *data) } } /* }}} void collect_volume_data */ -static void collect_perf_volume_data(host_config_t *host, na_elem_t *out, void *data) { - perf_volume_data_t *perf = data; - const char *name; +/* 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; - volume_t *volume; - value_t values[2]; - value_list_t vl = VALUE_LIST_INIT; 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)) { - uint64_t read_data = 0, write_data = 0, read_ops = 0, write_ops = 0, read_latency = 0, write_latency = 0; + 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; - volume = get_volume(host, na_child_get_string(inst, "name")); - if (!volume->perf_data.flags) { - volume->perf_data.flags = perf->flags; - volume->perf_data.last_read_latency = volume->perf_data.last_read_ops = 0; - volume->perf_data.last_write_latency = volume->perf_data.last_write_ops = 0; - } 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 (!strcmp(name, "read_ops")) { - read_ops = na_child_get_uint64(counter, "value", 0); - } else if (!strcmp(name, "write_ops")) { - write_ops = na_child_get_uint64(counter, "value", 0); - } else if (!strcmp(name, "read_data")) { - read_data = na_child_get_uint64(counter, "value", 0); + if (name == NULL) + continue; + + value = na_child_get_uint64(counter, "value", UINT64_MAX); + if (value == UINT64_MAX) + continue; + + if (!strcmp(name, "read_data")) { + perf_data.read_bytes = value; + perf_data.flags |= HAVE_VOLUME_PERF_BYTES_READ; } else if (!strcmp(name, "write_data")) { - write_data = na_child_get_uint64(counter, "value", 0); + perf_data.write_bytes = value; + perf_data.flags |= HAVE_VOLUME_PERF_BYTES_WRITE; + } else if (!strcmp(name, "read_ops")) { + perf_data.read_ops = value; + perf_data.flags |= HAVE_VOLUME_PERF_OPS_READ; + } else if (!strcmp(name, "write_ops")) { + perf_data.write_ops = value; + perf_data.flags |= HAVE_VOLUME_PERF_OPS_WRITE; } else if (!strcmp(name, "read_latency")) { - read_latency = na_child_get_uint64(counter, "value", 0); + perf_data.read_latency = value; + perf_data.flags |= HAVE_VOLUME_PERF_LATENCY_READ; } else if (!strcmp(name, "write_latency")) { - write_latency = na_child_get_uint64(counter, "value", 0); + perf_data.write_latency = value; + perf_data.flags |= HAVE_VOLUME_PERF_LATENCY_WRITE; } } - if (read_ops && write_ops) { - values[0].counter = read_ops; - values[1].counter = write_ops; - vl.values = values; - vl.values_len = 2; - vl.time = timestamp; - vl.interval = interval_g; - sstrncpy(vl.plugin, "netapp", sizeof(vl.plugin)); - sstrncpy(vl.host, host->name, sizeof(vl.host)); - sstrncpy(vl.plugin_instance, volume->name, sizeof(vl.plugin_instance)); - sstrncpy(vl.type, "disk_ops", sizeof(vl.type)); - vl.type_instance[0] = 0; - if (volume->perf_data.flags & PERF_VOLUME_OPS) { - /* We might need the data even if it wasn't configured to calculate - the latency. Therefore we just skip the dispatch. */ - DEBUG("%s/netapp-%s/disk_ops: %"PRIu64" %"PRIu64, host->name, volume->name, read_ops, write_ops); - plugin_dispatch_values(&vl); - } - if ((volume->perf_data.flags & PERF_VOLUME_LATENCY) && read_latency && write_latency) { - values[0].gauge = 0; - if (read_ops - volume->perf_data.last_read_ops) values[0].gauge = (read_latency - volume->perf_data.last_read_latency) * (timestamp - volume->perf_data.last_timestamp) / (read_ops - volume->perf_data.last_read_ops); - values[1].gauge = 0; - if (write_ops - volume->perf_data.last_write_ops) values[1].gauge = (write_latency - volume->perf_data.last_write_latency) * (timestamp - volume->perf_data.last_timestamp) / (write_ops - volume->perf_data.last_write_ops); - vl.values = values; - vl.values_len = 2; - vl.time = timestamp; - vl.interval = interval_g; - sstrncpy(vl.plugin, "netapp", sizeof(vl.plugin)); - sstrncpy(vl.host, host->name, sizeof(vl.host)); - sstrncpy(vl.plugin_instance, volume->name, sizeof(vl.plugin_instance)); - sstrncpy(vl.type, "disk_latency", sizeof(vl.type)); - vl.type_instance[0] = 0; - if (volume->perf_data.last_read_ops && volume->perf_data.last_write_ops) { - DEBUG("%s/netapp-%s/disk_latency: ro: %"PRIu64" lro: %"PRIu64" " - "rl: %"PRIu64" lrl: %"PRIu64" " - "%llu %llu", - host->name, volume->name, - read_ops, volume->perf_data.last_read_ops, - read_latency, volume->perf_data.last_read_latency, - values[0].counter, values[1].counter); - plugin_dispatch_values(&vl); - } - volume->perf_data.last_timestamp = timestamp; - volume->perf_data.last_read_latency = read_latency; - volume->perf_data.last_read_ops = read_ops; - volume->perf_data.last_write_latency = write_latency; - volume->perf_data.last_write_ops = write_ops; - } - } - if ((volume->perf_data.flags & PERF_VOLUME_IO) && read_data && write_data) { - values[0].counter = read_data; - values[1].counter = write_data; - vl.values = values; - vl.values_len = 2; - vl.time = timestamp; - vl.interval = interval_g; - sstrncpy(vl.plugin, "netapp", sizeof(vl.plugin)); - sstrncpy(vl.host, host->name, sizeof(vl.host)); - sstrncpy(vl.plugin_instance, volume->name, sizeof(vl.plugin_instance)); - sstrncpy(vl.type, "disk_octets", sizeof(vl.type)); - vl.type_instance[0] = 0; - DEBUG("%s/netapp-%s/disk_octets: %"PRIu64" %"PRIu64, host->name, volume->name, read_data, write_data); - plugin_dispatch_values (&vl); - } - } -} -static void collect_perf_system_data(host_config_t *host, na_elem_t *out, void *data) { /* {{{ */ + submit_volume_perf_data (host, volume, &perf_data); + } /* for (volume) */ +} /* }}} void query_volume_perf_data */ + +/* Data corresponding to */ +static int cna_handle_system_data (const char *hostname, /* {{{ */ + cfg_system_t *cfg_system, na_elem_t *data) +{ + na_elem_t *instances; + na_elem_t *counter; + na_elem_iter_t counter_iter; + counter_t disk_read = 0, disk_written = 0; counter_t net_recv = 0, net_sent = 0; counter_t cpu_busy = 0, cpu_total = 0; - unsigned int counter_flags = 0; + uint32_t counter_flags = 0; - perf_system_data_t *perf = data; const char *instance; time_t timestamp; - na_elem_t *counter; - timestamp = (time_t) na_child_get_uint64(out, "timestamp", 0); - out = na_elem_child(na_elem_child(out, "instances"), "instance-data"); - instance = na_child_get_string(out, "name"); + timestamp = (time_t) na_child_get_uint64 (data, "timestamp", 0); - na_elem_iter_t iter = na_child_iterator(na_elem_child(out, "counters")); - for (counter = na_iterator_next(&iter); counter; counter = na_iterator_next(&iter)) { + 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."); + return (-1); + } + + instance = na_child_get_string (instances, "name"); + if (instance == NULL) + { + ERROR ("netapp plugin: cna_handle_system_data: " + "na_child_get_string (\"name\") failed."); + return (-1); + } + + counter_iter = na_child_iterator (na_elem_child (instances, "counters")); + for (counter = na_iterator_next (&counter_iter); + counter != NULL; + counter = na_iterator_next (&counter_iter)) + { const char *name; uint64_t value; @@ -715,112 +1279,101 @@ static void collect_perf_system_data(host_config_t *host, na_elem_t *out, void * } else if (!strcmp(name, "cpu_elapsed_time")) { cpu_total = (counter_t) value; counter_flags |= 0x20; - } else if ((perf->flags & PERF_SYSTEM_OPS) - && (strlen(name) > 4) + } else if ((cfg_system->flags & CFG_SYSTEM_OPS) + && (value > 0) && (strlen(name) > 4) && (!strcmp(name + strlen(name) - 4, "_ops"))) { - submit_counter (host->name, instance, "disk_ops_complex", name, + submit_counter (hostname, instance, "disk_ops_complex", name, (counter_t) value, timestamp); } } /* for (counter) */ - if ((perf->flags & PERF_SYSTEM_DISK) - && ((counter_flags & 0x03) == 0x03)) - submit_two_counters (host->name, instance, "disk_octets", NULL, + 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); - if ((perf->flags & PERF_SYSTEM_NET) - && ((counter_flags & 0x0c) == 0x0c)) - submit_two_counters (host->name, instance, "if_octets", NULL, + 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); - if ((perf->flags & PERF_SYSTEM_CPU) - && ((counter_flags & 0x30) == 0x30)) { - submit_counter (host->name, instance, "cpu", "system", + if ((cfg_system->flags & CFG_SYSTEM_CPU) + && (HAS_ALL_FLAGS (counter_flags, 0x10 | 0x20))) + { + submit_counter (hostname, instance, "cpu", "system", cpu_busy, timestamp); - submit_counter (host->name, instance, "cpu", "idle", + submit_counter (hostname, instance, "cpu", "idle", cpu_total - cpu_busy, timestamp); } -} /* }}} void collect_perf_system_data */ -static int config_init(void) { /* {{{ */ - char err[256]; - na_elem_t *e; - host_config_t *host; - service_config_t *service; - - if (!host_config) { - WARNING("netapp plugin: Plugin loaded but no hosts defined."); - return 1; - } + return (0); +} /* }}} int cna_handle_system_data */ - if (!na_startup(err, sizeof(err))) { - ERROR("netapp plugin: Error initializing netapp API: %s", err); - return 1; +static int cna_setup_system (cfg_system_t *cs) /* {{{ */ +{ + if (cs == NULL) + return (EINVAL); + + if (cs->query != NULL) + return (0); + + cs->query = na_elem_new ("perf-object-get-instances"); + if (cs->query == NULL) + { + ERROR ("netapp plugin: na_elem_new failed."); + return (-1); } + na_child_add_string (cs->query, "objectname", "system"); - for (host = host_config; host; host = host->next) { - host->srv = na_server_open(host->host, 1, 1); - na_server_set_transport_type(host->srv, host->protocol, 0); - 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); - for (service = host->services; service; service = service->next) { - service->interval = host->interval * service->multiplier; - if (service->handler == collect_perf_system_data) { - service->query = na_elem_new("perf-object-get-instances"); - na_child_add_string(service->query, "objectname", "system"); - } else if (service->handler == collect_perf_volume_data) { - service->query = na_elem_new("perf-object-get-instances"); - na_child_add_string(service->query, "objectname", "volume"); -/* e = na_elem_new("instances"); - na_child_add_string(e, "foo", "system"); - na_child_add(root, e);*/ - e = na_elem_new("counters"); - 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_perf_wafl_data) { - service->query = na_elem_new("perf-object-get-instances"); - na_child_add_string(service->query, "objectname", "wafl"); -/* e = na_elem_new("instances"); - na_child_add_string(e, "foo", "system"); - na_child_add(root, e);*/ - e = na_elem_new("counters"); - 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, "foo", "inode_eject_time"); */ - /* na_child_add_string(e, "foo", "buf_eject_time"); */ - na_child_add(service->query, e); - } else if (service->handler == collect_perf_disk_data) { - service->query = na_elem_new("perf-object-get-instances"); - na_child_add_string(service->query, "objectname", "disk"); - e = na_elem_new("counters"); - na_child_add_string(e, "foo", "disk_busy"); - na_child_add_string(e, "foo", "base_for_disk_busy"); - 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"); */ - } - } + return (0); +} /* }}} int cna_setup_system */ + +static int cna_query_system (host_config_t *host) /* {{{ */ +{ + na_elem_t *data; + int status; + time_t now; + + if (host == NULL) + return (EINVAL); + + /* If system statistics were not configured, return without doing anything. */ + if (host->cfg_system == NULL) + return (0); + + now = time (NULL); + if ((host->cfg_system->interval.interval + host->cfg_system->interval.last_read) > now) + return (0); + + status = cna_setup_system (host->cfg_system); + if (status != 0) + return (status); + assert (host->cfg_system->query != NULL); + + 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)); + na_elem_free (data); + return (-1); } - return 0; -} /* }}} int config_init */ -static int config_bool_to_flag (const oconfig_item_t *ci, /* {{{ */ + status = cna_handle_system_data (host->name, host->cfg_system, data); + + if (status == 0) + host->cfg_system->interval.last_read = now; + + na_elem_free (data); + return (status); +} /* }}} int cna_query_system */ + +/* + * Configuration handling + */ +/* Sets a given flag if the boolean argument is true and unsets the flag if it + * is false. On error, the flag-field is not changed. */ +static int cna_config_bool_to_flag (const oconfig_item_t *ci, /* {{{ */ uint32_t *flags, uint32_t flag) { if ((ci == NULL) || (flags == NULL)) @@ -839,35 +1392,68 @@ static int config_bool_to_flag (const oconfig_item_t *ci, /* {{{ */ *flags &= ~flag; return (0); -} /* }}} int config_bool_to_flag */ +} /* }}} int cna_config_bool_to_flag */ -static void set_global_perf_vol_flag(const host_config_t *host, /* {{{ */ - uint32_t flag, _Bool set) +/* 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) { - 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; + 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); } -} /* }}} void set_global_perf_vol_flag */ -static void set_global_vol_flag(const host_config_t *host, /* {{{ */ - uint32_t flag, _Bool set) { - volume_t *v; - - for (v = host->volumes; v; v = v->next) { - if (set) - v->volume_data.flags |= flag; - else /* if (!set) */ - v->volume_data.flags &= ~flag; + 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); } -} /* }}} void set_global_vol_flag */ -static void process_perf_volume_flag (host_config_t *host, /* {{{ */ - perf_volume_data_t *perf_volume, const oconfig_item_t *item, + 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); + } + + out_interval->interval = tmp; + out_interval->last_read = 0; + + return (0); +} /* }}} 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) { int i; @@ -879,7 +1465,7 @@ static void process_perf_volume_flag (host_config_t *host, /* {{{ */ if (item->values[i].type != OCONFIG_TYPE_STRING) { WARNING("netapp plugin: Ignoring non-string argument in " - "\"GetVolPerfData\" block for host %s", host->name); + "\"GetVolumePerfData\" block for host %s", host->name); continue; } @@ -898,66 +1484,32 @@ static void process_perf_volume_flag (host_config_t *host, /* {{{ */ else /* if (!set) */ perf_volume->flags &= ~flag; - set_global_perf_vol_flag(host, flag, set); + host_set_all_perf_data_flags(host, flag, set); continue; } - v = get_volume (host, name); + v = get_volume (host, name, /* data_flags = */ 0, perf_volume->flags); if (v == NULL) continue; - if (!v->perf_data.flags) { - v->perf_data.flags = perf_volume->flags; - } - if (set) v->perf_data.flags |= flag; else /* if (!set) */ v->perf_data.flags &= ~flag; } /* for (i = 0 .. item->values_num) */ -} /* }}} void process_perf_volume_flag */ - -static void process_volume_flag(host_config_t *host, volume_data_t *volume_data, const oconfig_item_t *item, uint32_t flag) { - int n; - - for (n = 0; n < item->values_num; ++n) { - int minus = 0; - const char *name = item->values[n].value.string; - volume_t *v; - if (item->values[n].type != OCONFIG_TYPE_STRING) { - WARNING("netapp plugin: Ignoring non-string argument in \"GetVolData\" block for host %s", host->name); - continue; - } - if (name[0] == '+') { - ++name; - } else if (name[0] == '-') { - minus = 1; - ++name; - } - if (!name[0]) { - volume_data->flags &= ~flag; - if (!minus) volume_data->flags |= flag; - set_global_vol_flag(host, flag, - /* set = */ (minus ? false : true)); - continue; - } - v = get_volume(host, name); - if (!v->volume_data.flags) v->volume_data.flags = volume_data->flags; - v->volume_data.flags &= ~flag; - if (!minus) v->volume_data.flags |= flag; - } -} +} /* }}} void cna_config_volume_performance_option */ -static void build_perf_vol_config(host_config_t *host, const oconfig_item_t *ci) { +/* 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; - service_config_t *service; - perf_volume_data_t *perf_volume; + cfg_service_t *service; + cfg_volume_perf_t *perf_volume; service = malloc(sizeof(*service)); service->query = 0; - service->handler = collect_perf_volume_data; + service->handler = query_volume_perf_data; perf_volume = service->data = malloc(sizeof(*perf_volume)); - perf_volume->flags = PERF_VOLUME_INIT; + perf_volume->flags = CFG_VOLUME_PERF_INIT; service->next = host->services; host->services = service; for (i = 0; i < ci->children_num; ++i) { @@ -965,46 +1517,93 @@ static void build_perf_vol_config(host_config_t *host, const oconfig_item_t *ci) /* if (!item || !item->key || !*item->key) continue; */ if (!strcasecmp(item->key, "Multiplier")) { - 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 < 1) { - WARNING("netapp plugin: \"Multiplier\" of host %s service GetVolPerfData needs exactly one positive integer argument.", host->name); - continue; - } - service->skip_countdown = service->multiplier = item->values[0].value.number; + cna_config_get_multiplier (item, service); } else if (!strcasecmp(item->key, "GetIO")) { had_io = 1; - process_perf_volume_flag(host, perf_volume, item, PERF_VOLUME_IO); + cna_config_volume_performance_option(host, perf_volume, item, CFG_VOLUME_PERF_IO); } else if (!strcasecmp(item->key, "GetOps")) { had_ops = 1; - process_perf_volume_flag(host, perf_volume, item, PERF_VOLUME_OPS); + cna_config_volume_performance_option(host, perf_volume, item, CFG_VOLUME_PERF_OPS); } else if (!strcasecmp(item->key, "GetLatency")) { had_latency = 1; - process_perf_volume_flag(host, perf_volume, item, PERF_VOLUME_LATENCY); + cna_config_volume_performance_option(host, perf_volume, item, CFG_VOLUME_PERF_LATENCY); } } if (!had_io) { - perf_volume->flags |= PERF_VOLUME_IO; - set_global_perf_vol_flag(host, PERF_VOLUME_IO, /* set = */ true); + 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 |= PERF_VOLUME_OPS; - set_global_perf_vol_flag(host, PERF_VOLUME_OPS, /* set = */ true); + 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 |= PERF_VOLUME_LATENCY; - set_global_perf_vol_flag(host, PERF_VOLUME_LATENCY, /* set = */ true); + perf_volume->flags |= CFG_VOLUME_PERF_LATENCY; + host_set_all_perf_data_flags(host, CFG_VOLUME_PERF_LATENCY, /* set = */ true); } -} +} /* }}} 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) +{ + 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; + } + + name = item->values[i].value.string; + if (name[0] == '+') { + set = true; + ++name; + } else if (name[0] == '-') { + set = false; + ++name; + } + + if (!name[0]) { + if (set) + cfg_volume_data->flags |= flag; + else /* if (!set) */ + cfg_volume_data->flags &= ~flag; + + host_set_all_cfg_volume_usage_flags(host, flag, set); + continue; + } + + v = get_volume(host, name, cfg_volume_data->flags, /* perf_flags = */ 0); + if (v == NULL) + continue; + + if (!v->cfg_volume_usage.flags) + v->cfg_volume_usage.flags = cfg_volume_data->flags; + + if (set) + v->cfg_volume_usage.flags |= flag; + else /* if (!set) */ + v->cfg_volume_usage.flags &= ~flag; + } +} /* }}} void cna_config_volume_usage_option */ -static void build_volume_config(host_config_t *host, oconfig_item_t *ci) { +/* Corresponds to a block */ +static void cna_config_volume_usage(host_config_t *host, oconfig_item_t *ci) { /* {{{ */ int i, had_df = 0; - service_config_t *service; - volume_data_t *volume_data; + cfg_service_t *service; + cfg_volume_usage_t *cfg_volume_data; service = malloc(sizeof(*service)); service->query = 0; service->handler = collect_volume_data; - volume_data = service->data = malloc(sizeof(*volume_data)); - volume_data->flags = VOLUME_INIT; + 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) { @@ -1012,267 +1611,373 @@ static void build_volume_config(host_config_t *host, oconfig_item_t *ci) { /* if (!item || !item->key || !*item->key) continue; */ if (!strcasecmp(item->key, "Multiplier")) { - 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 < 1) { - WARNING("netapp plugin: \"Multiplier\" of host %s service GetVolPerfData needs exactly one positive integer argument.", host->name); - continue; - } - service->skip_countdown = service->multiplier = item->values[0].value.number; + cna_config_get_multiplier (item, service); } else if (!strcasecmp(item->key, "GetDiskUtil")) { had_df = 1; - process_volume_flag(host, volume_data, item, VOLUME_DF); + 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 (!had_df) { - volume_data->flags |= VOLUME_DF; - set_global_vol_flag(host, VOLUME_DF, /* set = */ true); + cfg_volume_data->flags |= CFG_VOLUME_USAGE_DF; + host_set_all_cfg_volume_usage_flags(host, CFG_VOLUME_USAGE_DF, /* set = */ true); } -/* service = malloc(sizeof(*service)); - service->query = 0; - service->handler = collect_snapshot_data; - service->data = volume_data; - service->next = temp->services; - temp->services = service;*/ -} + if (cfg_volume_data->flags & CFG_VOLUME_USAGE_SNAP) { + WARNING("netapp plugin: The \"GetSnapUtil\" option does not support the \"+\" wildcard."); + } +} /* }}} void cna_config_volume_usage */ -static void build_perf_disk_config(host_config_t *temp, oconfig_item_t *ci) { +/* Corresponds to a block */ +static int cna_config_disk(host_config_t *host, oconfig_item_t *ci) { /* {{{ */ + cfg_disk_t *cfg_disk; int i; - service_config_t *service; - perf_disk_data_t *perf_disk; + + if ((host == NULL) || (ci == NULL)) + return (EINVAL); + + if (host->cfg_disk == NULL) + { + cfg_disk = malloc (sizeof (*cfg_disk)); + if (cfg_disk == NULL) + return (ENOMEM); + memset (cfg_disk, 0, sizeof (*cfg_disk)); + + /* Set default flags */ + cfg_disk->flags = CFG_DISK_ALL; + cfg_disk->query = NULL; + cfg_disk->disks = NULL; + + host->cfg_disk = cfg_disk; + } + cfg_disk = host->cfg_disk; - service = malloc(sizeof(*service)); - service->query = 0; - service->handler = collect_perf_disk_data; - perf_disk = service->data = malloc(sizeof(*perf_disk)); - perf_disk->flags = PERF_DISK_ALL; - service->next = temp->services; - temp->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")) { - 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 < 1) { - WARNING("netapp plugin: \"Multiplier\" of host %s service GetWaflPerfData needs exactly one positive integer argument.", ci->values[0].value.string); - continue; - } - service->skip_countdown = service->multiplier = item->values[0].value.number; - } else if (!strcasecmp(item->key, "GetBusy")) { - config_bool_to_flag (item, &perf_disk->flags, PERF_SYSTEM_CPU); - } + if (strcasecmp(item->key, "Interval") == 0) + cna_config_get_interval (item, &cfg_disk->interval); + else if (strcasecmp(item->key, "GetBusy") == 0) + cna_config_bool_to_flag (item, &cfg_disk->flags, CFG_DISK_BUSIEST); } -} -static void build_perf_wafl_config(host_config_t *temp, oconfig_item_t *ci) { + return (0); +} /* }}} int cna_config_disk */ + +/* Corresponds to a block */ +static int cna_config_wafl(host_config_t *host, oconfig_item_t *ci) /* {{{ */ +{ + cfg_wafl_t *cfg_wafl; int i; - service_config_t *service; - perf_wafl_data_t *perf_wafl; - - service = malloc(sizeof(*service)); - service->query = 0; - service->handler = collect_perf_wafl_data; - perf_wafl = service->data = malloc(sizeof(*perf_wafl)); - perf_wafl->flags = PERF_WAFL_ALL; - perf_wafl->last_name_cache_hit = 0; - perf_wafl->last_name_cache_miss = 0; - perf_wafl->last_find_dir_hit = 0; - perf_wafl->last_find_dir_miss = 0; - perf_wafl->last_buf_hash_hit = 0; - perf_wafl->last_buf_hash_miss = 0; - perf_wafl->last_inode_cache_hit = 0; - perf_wafl->last_inode_cache_miss = 0; - service->next = temp->services; - temp->services = service; + + if ((host == NULL) || (ci == NULL)) + return (EINVAL); + + if (host->cfg_wafl == NULL) + { + cfg_wafl = malloc (sizeof (*cfg_wafl)); + if (cfg_wafl == NULL) + return (ENOMEM); + memset (cfg_wafl, 0, sizeof (*cfg_wafl)); + + /* Set default flags */ + cfg_wafl->flags = CFG_WAFL_ALL; + + host->cfg_wafl = cfg_wafl; + } + cfg_wafl = host->cfg_wafl; + 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")) { - 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 < 1) { - WARNING("netapp plugin: \"Multiplier\" of host %s service GetWaflPerfData needs exactly one positive integer argument.", ci->values[0].value.string); - continue; - } - service->skip_countdown = service->multiplier = item->values[0].value.number; - } else if (!strcasecmp(item->key, "GetNameCache")) { - config_bool_to_flag (item, &perf_wafl->flags, PERF_WAFL_NAME_CACHE); - } else if (!strcasecmp(item->key, "GetDirCache")) { - config_bool_to_flag (item, &perf_wafl->flags, PERF_WAFL_DIR_CACHE); - } else if (!strcasecmp(item->key, "GetBufCache")) { - config_bool_to_flag (item, &perf_wafl->flags, PERF_WAFL_BUF_CACHE); - } else if (!strcasecmp(item->key, "GetInodeCache")) { - config_bool_to_flag (item, &perf_wafl->flags, PERF_WAFL_INODE_CACHE); - } else { + if (strcasecmp(item->key, "Interval") == 0) + cna_config_get_interval (item, &cfg_wafl->interval); + else if (!strcasecmp(item->key, "GetNameCache")) + cna_config_bool_to_flag (item, &cfg_wafl->flags, CFG_WAFL_NAME_CACHE); + else if (!strcasecmp(item->key, "GetDirCache")) + cna_config_bool_to_flag (item, &cfg_wafl->flags, CFG_WAFL_DIR_CACHE); + else if (!strcasecmp(item->key, "GetBufferCache")) + cna_config_bool_to_flag (item, &cfg_wafl->flags, CFG_WAFL_BUF_CACHE); + else if (!strcasecmp(item->key, "GetInodeCache")) + cna_config_bool_to_flag (item, &cfg_wafl->flags, CFG_WAFL_INODE_CACHE); + else WARNING ("netapp plugin: The %s config option is not allowed within " - "`GetWaflPerfData' blocks.", item->key); - } + "`WAFL' blocks.", item->key); + } + + if ((cfg_wafl->flags & CFG_WAFL_ALL) == 0) + { + NOTICE ("netapp plugin: All WAFL related values have been disabled. " + "Collection of WAFL data will be disabled entirely."); + free_cfg_wafl (host->cfg_wafl); + host->cfg_wafl = NULL; } -} -static int build_perf_sys_config (host_config_t *host, /* {{{ */ - oconfig_item_t *ci, const service_config_t *default_service) + return (0); +} /* }}} int cna_config_wafl */ + +/* Corresponds to a block */ +static int cna_config_system (host_config_t *host, /* {{{ */ + oconfig_item_t *ci, const cfg_service_t *default_service) { + cfg_system_t *cfg_system; int i; - service_config_t *service; - perf_system_data_t *perf_system; - service = malloc(sizeof(*service)); - if (service == NULL) - return (-1); - memset (service, 0, sizeof (*service)); - *service = *default_service; - service->handler = collect_perf_system_data; + if ((host == NULL) || (ci == NULL)) + return (EINVAL); - perf_system = malloc(sizeof(*perf_system)); - if (perf_system == NULL) { - sfree (service); - return (-1); + if (host->cfg_system == NULL) + { + cfg_system = malloc (sizeof (*cfg_system)); + if (cfg_system == NULL) + return (ENOMEM); + memset (cfg_system, 0, sizeof (*cfg_system)); + + /* Set default flags */ + cfg_system->flags = CFG_SYSTEM_ALL; + cfg_system->query = NULL; + + host->cfg_system = cfg_system; } - memset (perf_system, 0, sizeof (*perf_system)); - perf_system->flags = PERF_SYSTEM_ALL; - service->data = perf_system; + cfg_system = host->cfg_system; for (i = 0; i < ci->children_num; ++i) { oconfig_item_t *item = ci->children + i; - if (!strcasecmp(item->key, "Multiplier")) { - 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 < 1) { - WARNING("netapp plugin: \"Multiplier\" of host %s service GetSystemPerfData needs exactly one positive integer argument.", ci->values[0].value.string); - continue; - } - service->skip_countdown = service->multiplier = item->values[0].value.number; + if (strcasecmp(item->key, "Interval") == 0) { + cna_config_get_interval (item, &cfg_system->interval); } else if (!strcasecmp(item->key, "GetCPULoad")) { - config_bool_to_flag (item, &perf_system->flags, PERF_SYSTEM_CPU); + cna_config_bool_to_flag (item, &cfg_system->flags, CFG_SYSTEM_CPU); } else if (!strcasecmp(item->key, "GetInterfaces")) { - config_bool_to_flag (item, &perf_system->flags, PERF_SYSTEM_NET); + cna_config_bool_to_flag (item, &cfg_system->flags, CFG_SYSTEM_NET); } else if (!strcasecmp(item->key, "GetDiskOps")) { - config_bool_to_flag (item, &perf_system->flags, PERF_SYSTEM_OPS); + cna_config_bool_to_flag (item, &cfg_system->flags, CFG_SYSTEM_OPS); } else if (!strcasecmp(item->key, "GetDiskIO")) { - config_bool_to_flag (item, &perf_system->flags, PERF_SYSTEM_DISK); + cna_config_bool_to_flag (item, &cfg_system->flags, CFG_SYSTEM_DISK); } else { WARNING ("netapp plugin: The %s config option is not allowed within " - "`GetSystemPerfData' blocks.", item->key); + "`System' blocks.", item->key); } } - service->next = host->services; - host->services = service; - return (0); -} /* }}} int build_perf_sys_config */ +} /* }}} int cna_config_system */ -static host_config_t *build_host_config(const oconfig_item_t *ci, const host_config_t *default_host, const service_config_t *def_def_service) { - int i; +/* 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) +{ oconfig_item_t *item; - host_config_t *host, *hc, temp = *default_host; - service_config_t default_service = *def_def_service; + host_config_t *host; + cfg_service_t default_service = *def_def_service; + int status; + int i; if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING)) { WARNING("netapp plugin: \"Host\" needs exactly one string argument. Ignoring host block."); return 0; } - temp.name = ci->values[0].value.string; + host = malloc(sizeof(*host)); + memcpy (host, default_host, sizeof (*host)); + + status = cf_util_get_string (ci, &host->name); + if (status != 0) + { + sfree (host); + return (NULL); + } + for (i = 0; i < ci->children_num; ++i) { item = ci->children + i; - /* if (!item || !item->key || !*item->key) continue; */ + status = 0; + if (!strcasecmp(item->key, "Address")) { - if ((item->values_num != 1) || (item->values[0].type != OCONFIG_TYPE_STRING)) { - WARNING("netapp plugin: \"Name\" needs exactly one string argument. Ignoring host block \"%s\".", ci->values[0].value.string); - return 0; - } - temp.host = item->values[0].value.string; + status = cf_util_get_string (item, &host->host); } else if (!strcasecmp(item->key, "Port")) { - 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 < 1) || (item->values[0].value.number > 65535)) { - WARNING("netapp plugin: \"Port\" needs exactly one integer argument in the range of 1-65535. Ignoring host block \"%s\".", ci->values[0].value.string); - return 0; - } - temp.port = item->values[0].value.number; + int tmp; + + tmp = cf_util_get_port_number (item); + if (tmp > 0) + host->port = tmp; } else if (!strcasecmp(item->key, "Protocol")) { if ((item->values_num != 1) || (item->values[0].type != OCONFIG_TYPE_STRING) || (strcasecmp(item->values[0].value.string, "http") && strcasecmp(item->values[0].value.string, "https"))) { WARNING("netapp plugin: \"Protocol\" needs to be either \"http\" or \"https\". Ignoring host block \"%s\".", ci->values[0].value.string); return 0; } - if (!strcasecmp(item->values[0].value.string, "http")) temp.protocol = NA_SERVER_TRANSPORT_HTTP; - else temp.protocol = NA_SERVER_TRANSPORT_HTTPS; - } else if (!strcasecmp(item->key, "Login")) { - if ((item->values_num != 2) || (item->values[0].type != OCONFIG_TYPE_STRING) || (item->values[1].type != OCONFIG_TYPE_STRING)) { - WARNING("netapp plugin: \"Login\" needs exactly two string arguments, username and password. Ignoring host block \"%s\".", ci->values[0].value.string); - return 0; - } - temp.username = item->values[0].value.string; - temp.password = item->values[1].value.string; + if (!strcasecmp(item->values[0].value.string, "http")) host->protocol = NA_SERVER_TRANSPORT_HTTP; + else host->protocol = NA_SERVER_TRANSPORT_HTTPS; + } else if (!strcasecmp(item->key, "User")) { + status = cf_util_get_string (item, &host->username); + } 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; } - temp.interval = item->values[0].value.number; + host->interval = item->values[0].value.number; } else if (!strcasecmp(item->key, "GetVolumePerfData")) { - build_perf_vol_config(&temp, item); - } else if (!strcasecmp(item->key, "GetSystemPerfData")) { - build_perf_sys_config(&temp, item, &default_service); -/* if ((item->values_num != 1) || (item->values[0].type != OCONFIG_TYPE_STRING)) { - WARNING("netapp plugin: \"Collect\" needs exactly one string argument. Ignoring collect block for \"%s\".", ci->values[0].value.string); - continue; - } - build_collect_config(&temp, item);*/ - } else if (!strcasecmp(item->key, "GetWaflPerfData")) { - build_perf_wafl_config(&temp, item); - } else if (!strcasecmp(item->key, "GetDiskPerfData")) { - build_perf_disk_config(&temp, item); + cna_config_volume_performance(host, item); + } else if (!strcasecmp(item->key, "System")) { + cna_config_system(host, item, &default_service); + } 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")) { - build_volume_config(&temp, item); + cna_config_volume_usage(host, item); } else { - WARNING("netapp plugin: Ignoring unknown config option \"%s\" in host block \"%s\".", item->key, ci->values[0].value.string); + WARNING("netapp plugin: Ignoring unknown config option \"%s\" in host block \"%s\".", + item->key, ci->values[0].value.string); } + + if (status != 0) + break; } - - if (!temp.host) temp.host = temp.name; - if (!temp.port) temp.port = temp.protocol == NA_SERVER_TRANSPORT_HTTP ? 80 : 443; - if (!temp.username) { - WARNING("netapp plugin: Please supply login information for host \"%s\". Ignoring host block.", temp.name); - return 0; + + if (host->host == NULL) + host->host = strdup (host->name); + + if (host->host == NULL) + status = -1; + + if (host->port <= 0) + host->port = (host->protocol == NA_SERVER_TRANSPORT_HTTP) ? 80 : 443; + + if ((host->username == NULL) || (host->password == NULL)) { + WARNING("netapp plugin: Please supply login information for host \"%s\". " + "Ignoring host block.", host->name); + status = -1; } - for (hc = host_config; hc; hc = hc->next) { - if (!strcasecmp(hc->name, temp.name)) WARNING("netapp plugin: Duplicate definition of host \"%s\". This is probably a bad idea.", hc->name); + + if (status != 0) + { + free_host_config (host); + return (NULL); } - host = malloc(sizeof(*host)); - *host = temp; - host->name = strdup(temp.name); - host->protocol = temp.protocol; - host->host = strdup(temp.host); - host->username = strdup(temp.username); - host->password = strdup(temp.password); - host->next = host_config; - host_config = host; + return host; -} +} /* }}} host_config_t *cna_config_host */ + +/* + * Callbacks registered with the daemon + * + * 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; + } + + memset (err, 0, sizeof (err)); + if (!na_startup(err, sizeof(err))) { + err[sizeof (err) - 1] = 0; + ERROR("netapp plugin: Error initializing netapp API: %s", err); + 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; + } + + 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; -static int build_config (oconfig_item_t *ci) { + 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 */ + +static int cna_config (oconfig_item_t *ci) { /* {{{ */ int i; oconfig_item_t *item; host_config_t default_host = HOST_INIT; - service_config_t default_service = SERVICE_INIT; + cfg_service_t default_service = SERVICE_INIT; for (i = 0; i < ci->children_num; ++i) { item = ci->children + i; - /* if (!item || !item->key || !*item->key) continue; */ if (!strcasecmp(item->key, "Host")) { - build_host_config(item, &default_host, &default_service); + host_config_t *host; + host_config_t *tmp; + + host = cna_config_host(item, &default_host, &default_service); + 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); + + if (tmp->next == NULL) + break; + } + + host->next = NULL; + if (tmp == NULL) + global_host_config = host; + else + tmp->next = host; } else { WARNING("netapp plugin: Ignoring unknown config option \"%s\".", item->key); } } return 0; -} +} /* }}} int cna_config */ -static int netapp_read() { +static int cna_read(void) { /* {{{ */ na_elem_t *out; host_config_t *host; - service_config_t *service; + cfg_service_t *service; - for (host = host_config; host; host = host->next) { + 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; @@ -1289,15 +1994,19 @@ static int netapp_read() { } service->handler(host, out, service->data); na_elem_free(out); - } + } /* for (host->services) */ + + cna_query_wafl (host); + cna_query_disk (host); + cna_query_system (host); } return 0; -} +} /* }}} int cna_read */ -void module_register() { - plugin_register_complex_config("netapp", build_config); - plugin_register_init("netapp", config_init); - plugin_register_read("netapp", netapp_read); +void module_register(void) { + plugin_register_complex_config("netapp", cna_config); + plugin_register_init("netapp", cna_init); + plugin_register_read("netapp", cna_read); } /* vim: set sw=2 ts=2 noet fdm=marker : */