X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnetapp.c;h=6e5709ca9ba30a973506845b3dc394e283f40cc3;hb=4a7a253f8048b50b733663d1238e1ac7327b4664;hp=d04be5ca8aadc9b6bc2401ec75211f9a85cb3dcd;hpb=08c46c90bbea6949ee9e5d4e38fa4395d865878c;p=collectd.git
diff --git a/src/netapp.c b/src/netapp.c
index d04be5ca..6e5709ca 100644
--- a/src/netapp.c
+++ b/src/netapp.c
@@ -209,8 +209,77 @@ struct host_config_s {
};
#define HOST_INIT {NULL, NULL, NA_SERVER_TRANSPORT_HTTPS, NULL, 0, NULL, NULL, 10, NULL, NULL, NULL, NULL}
-static host_config_t *host_config;
+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_service (cfg_service_t *service) /* {{{ */
+{
+ cfg_service_t *next;
+
+ next = service->next;
+
+ /* FIXME: Free service->data? */
+ 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);
+
+ free_cfg_service (hc->services);
+ free_disk (hc->disks);
+ 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)
{
@@ -290,6 +359,37 @@ static disk_t *get_disk(host_config_t *host, const char *name) /* {{{ */
return v;
} /* }}} 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,
@@ -366,6 +466,8 @@ 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,
@@ -393,6 +495,7 @@ static int submit_cache_ratio (const char *host, /* {{{ */
&v, 1, timestamp));
} /* }}} int submit_cache_ratio */
+/* Submits all the caches used by WAFL. Uses "submit_cache_ratio". */
static int submit_wafl_data (const host_config_t *host, const char *instance, /* {{{ */
data_wafl_t *old_data, const data_wafl_t *new_data)
{
@@ -445,6 +548,8 @@ static int submit_wafl_data (const host_config_t *host, const char *instance, /*
return (0);
} /* }}} int submit_wafl_data */
+/* 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)
@@ -527,6 +632,13 @@ static int submit_volume_perf_data (const host_config_t *host, /* {{{ */
return (0);
} /* }}} int submit_volume_perf_data */
+/*
+ * 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 void query_wafl_data(host_config_t *host, na_elem_t *out, void *data) { /* {{{ */
data_wafl_t *wafl = data;
data_wafl_t perf_data;
@@ -592,6 +704,7 @@ static void query_wafl_data(host_config_t *host, na_elem_t *out, void *data) { /
submit_wafl_data (host, plugin_inst, wafl, &perf_data);
} /* }}} void query_wafl_data */
+/* Data corresponding to */
static void query_submit_disk_data(host_config_t *host, na_elem_t *out, void *data) { /* {{{ */
cfg_disk_t *cfg_disk = data;
time_t timestamp;
@@ -681,6 +794,7 @@ static void query_submit_disk_data(host_config_t *host, na_elem_t *out, void *da
worst_disk->disk_busy_percent, timestamp);
} /* }}} void query_submit_disk_data */
+/* 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;
@@ -783,6 +897,7 @@ static void collect_volume_data(host_config_t *host, na_elem_t *out, void *data)
}
} /* }}} 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;
@@ -842,6 +957,7 @@ static void query_volume_perf_data(host_config_t *host, na_elem_t *out, void *da
} /* for (volume) */
} /* }}} void query_volume_perf_data */
+/* Data corresponding to */
static void collect_perf_system_data(host_config_t *host, na_elem_t *out, void *data) { /* {{{ */
counter_t disk_read = 0, disk_written = 0;
counter_t net_recv = 0, net_sent = 0;
@@ -915,85 +1031,12 @@ static void collect_perf_system_data(host_config_t *host, na_elem_t *out, void *
}
} /* }}} void collect_perf_system_data */
-static int cna_init(void) { /* {{{ */
- char err[256];
- na_elem_t *e;
- host_config_t *host;
- cfg_service_t *service;
-
- if (!host_config) {
- WARNING("netapp plugin: Plugin loaded but no hosts defined.");
- return 1;
- }
-
- if (!na_startup(err, sizeof(err))) {
- ERROR("netapp plugin: Error initializing netapp API: %s", err);
- return 1;
- }
-
- 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 == 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("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 == query_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 == query_submit_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_init */
-
-static int config_bool_to_flag (const oconfig_item_t *ci, /* {{{ */
+/*
+ * 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))
@@ -1012,9 +1055,10 @@ 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 int config_get_multiplier (const oconfig_item_t *ci, /* {{{ */
+/* 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;
@@ -1039,34 +1083,11 @@ static int config_get_multiplier (const oconfig_item_t *ci, /* {{{ */
service->skip_countdown = tmp;
return (0);
-} /* }}} int config_get_multiplier */
+} /* }}} int cna_config_get_multiplier */
-static void set_global_perf_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->perf_data.flags |= flag;
- else /* if (!set) */
- v->perf_data.flags &= ~flag;
- }
-} /* }}} 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->cfg_volume_usage.flags |= flag;
- else /* if (!set) */
- v->cfg_volume_usage.flags &= ~flag;
- }
-} /* }}} void set_global_vol_flag */
-
-static void process_perf_volume_flag (host_config_t *host, /* {{{ */
+/* 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)
{
@@ -1098,7 +1119,7 @@ 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;
}
@@ -1111,9 +1132,54 @@ static void process_perf_volume_flag (host_config_t *host, /* {{{ */
else /* if (!set) */
v->perf_data.flags &= ~flag;
} /* for (i = 0 .. item->values_num) */
-} /* }}} void process_perf_volume_flag */
+} /* }}} void cna_config_volume_performance_option */
-static void process_volume_flag (host_config_t *host, /* {{{ */
+/* 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);
+ }
+} /* }}} 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;
@@ -1144,7 +1210,7 @@ static void process_volume_flag (host_config_t *host, /* {{{ */
else /* if (!set) */
cfg_volume_data->flags &= ~flag;
- set_global_vol_flag(host, flag, set);
+ host_set_all_cfg_volume_usage_flags(host, flag, set);
continue;
}
@@ -1160,52 +1226,10 @@ static void process_volume_flag (host_config_t *host, /* {{{ */
else /* if (!set) */
v->cfg_volume_usage.flags &= ~flag;
}
-} /* }}} void process_volume_flag */
+} /* }}} void cna_config_volume_usage_option */
-static void build_perf_vol_config(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")) {
- config_get_multiplier (item, service);
- } else if (!strcasecmp(item->key, "GetIO")) {
- had_io = 1;
- process_perf_volume_flag(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, CFG_VOLUME_PERF_OPS);
- } else if (!strcasecmp(item->key, "GetLatency")) {
- had_latency = 1;
- process_perf_volume_flag(host, perf_volume, item, CFG_VOLUME_PERF_LATENCY);
- }
- }
- if (!had_io) {
- perf_volume->flags |= CFG_VOLUME_PERF_IO;
- set_global_perf_vol_flag(host, CFG_VOLUME_PERF_IO, /* set = */ true);
- }
- if (!had_ops) {
- perf_volume->flags |= CFG_VOLUME_PERF_OPS;
- set_global_perf_vol_flag(host, CFG_VOLUME_PERF_OPS, /* set = */ true);
- }
- if (!had_latency) {
- perf_volume->flags |= CFG_VOLUME_PERF_LATENCY;
- set_global_perf_vol_flag(host, CFG_VOLUME_PERF_LATENCY, /* set = */ true);
- }
-}
-
-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;
cfg_service_t *service;
cfg_volume_usage_t *cfg_volume_data;
@@ -1222,19 +1246,20 @@ 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")) {
- config_get_multiplier (item, service);
+ cna_config_get_multiplier (item, service);
} else if (!strcasecmp(item->key, "GetDiskUtil")) {
had_df = 1;
- process_volume_flag(host, cfg_volume_data, item, VOLUME_DF);
+ cna_config_volume_usage_option(host, cfg_volume_data, item, VOLUME_DF);
}
}
if (!had_df) {
cfg_volume_data->flags |= VOLUME_DF;
- set_global_vol_flag(host, VOLUME_DF, /* set = */ true);
+ host_set_all_cfg_volume_usage_flags(host, VOLUME_DF, /* set = */ true);
}
-}
+} /* }}} void cna_config_volume_usage */
-static void build_perf_disk_config(host_config_t *temp, oconfig_item_t *ci) {
+/* Corresponds to a block */
+static void cna_config_disk(host_config_t *temp, oconfig_item_t *ci) { /* {{{ */
int i;
cfg_service_t *service;
cfg_disk_t *cfg_disk;
@@ -1251,14 +1276,15 @@ static void build_perf_disk_config(host_config_t *temp, oconfig_item_t *ci) {
/* if (!item || !item->key || !*item->key) continue; */
if (!strcasecmp(item->key, "Multiplier")) {
- config_get_multiplier (item, service);
+ cna_config_get_multiplier (item, service);
} else if (!strcasecmp(item->key, "GetBusy")) {
- config_bool_to_flag (item, &cfg_disk->flags, CFG_SYSTEM_CPU);
+ cna_config_bool_to_flag (item, &cfg_disk->flags, CFG_DISK_BUSIEST);
}
}
-}
+} /* }}} void cna_config_disk */
-static void build_perf_wafl_config(host_config_t *host, oconfig_item_t *ci) { /* {{{ */
+/* Corresponds to a block */
+static void cna_config_wafl(host_config_t *host, oconfig_item_t *ci) { /* {{{ */
int i;
cfg_service_t *service;
data_wafl_t *perf_wafl;
@@ -1277,15 +1303,15 @@ static void build_perf_wafl_config(host_config_t *host, oconfig_item_t *ci) { /*
oconfig_item_t *item = ci->children + i;
if (!strcasecmp(item->key, "Multiplier")) {
- config_get_multiplier (item, service);
+ cna_config_get_multiplier (item, service);
} else if (!strcasecmp(item->key, "GetNameCache")) {
- config_bool_to_flag (item, &perf_wafl->flags, CFG_WAFL_NAME_CACHE);
+ cna_config_bool_to_flag (item, &perf_wafl->flags, CFG_WAFL_NAME_CACHE);
} else if (!strcasecmp(item->key, "GetDirCache")) {
- config_bool_to_flag (item, &perf_wafl->flags, CFG_WAFL_DIR_CACHE);
+ cna_config_bool_to_flag (item, &perf_wafl->flags, CFG_WAFL_DIR_CACHE);
} else if (!strcasecmp(item->key, "GetBufCache")) {
- config_bool_to_flag (item, &perf_wafl->flags, CFG_WAFL_BUF_CACHE);
+ cna_config_bool_to_flag (item, &perf_wafl->flags, CFG_WAFL_BUF_CACHE);
} else if (!strcasecmp(item->key, "GetInodeCache")) {
- config_bool_to_flag (item, &perf_wafl->flags, CFG_WAFL_INODE_CACHE);
+ cna_config_bool_to_flag (item, &perf_wafl->flags, CFG_WAFL_INODE_CACHE);
} else {
WARNING ("netapp plugin: The %s config option is not allowed within "
"`GetWaflPerfData' blocks.", item->key);
@@ -1294,9 +1320,10 @@ static void build_perf_wafl_config(host_config_t *host, oconfig_item_t *ci) { /*
service->next = host->services;
host->services = service;
-} /* }}} void build_perf_wafl_config */
+} /* }}} void cna_config_wafl */
-static int build_perf_sys_config (host_config_t *host, /* {{{ */
+/* Corresponds to a block */
+static int cna_config_system (host_config_t *host, /* {{{ */
oconfig_item_t *ci, const cfg_service_t *default_service)
{
int i;
@@ -1323,15 +1350,15 @@ static int build_perf_sys_config (host_config_t *host, /* {{{ */
oconfig_item_t *item = ci->children + i;
if (!strcasecmp(item->key, "Multiplier")) {
- config_get_multiplier (item, service);
+ cna_config_get_multiplier (item, service);
} else if (!strcasecmp(item->key, "GetCPULoad")) {
- config_bool_to_flag (item, &cfg_system->flags, CFG_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, &cfg_system->flags, CFG_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, &cfg_system->flags, CFG_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, &cfg_system->flags, CFG_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);
@@ -1342,94 +1369,202 @@ static int build_perf_sys_config (host_config_t *host, /* {{{ */
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 cfg_service_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;
+ host_config_t *host, *hc;
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);
+ cna_config_volume_performance(host, item);
} else if (!strcasecmp(item->key, "GetSystemPerfData")) {
- build_perf_sys_config(&temp, item, &default_service);
+ cna_config_system(host, item, &default_service);
} else if (!strcasecmp(item->key, "GetWaflPerfData")) {
- build_perf_wafl_config(&temp, item);
+ cna_config_wafl(host, item);
} else if (!strcasecmp(item->key, "GetDiskPerfData")) {
- build_perf_disk_config(&temp, item);
+ 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);
}
+
+ 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;
+ }
+
+ if (status != 0)
+ {
+ free_host_config (host);
+ return (NULL);
}
- 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);
+
+ for (hc = global_host_config; hc; hc = hc->next) {
+ if (!strcasecmp(hc->name, host->name)) WARNING("netapp plugin: Duplicate definition of host \"%s\". This is probably a bad idea.", hc->name);
}
- 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 */
-static int cna_config (oconfig_item_t *ci) {
+/*
+ * 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;
+
+ 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 == 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");
+ 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 == query_wafl_data) {
+ service->query = na_elem_new("perf-object-get-instances");
+ na_child_add_string(service->query, "objectname", "wafl");
+ 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 == query_submit_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_init */
+
+static int cna_config (oconfig_item_t *ci) { /* {{{ */
int i;
oconfig_item_t *item;
host_config_t default_host = HOST_INIT;
@@ -1440,20 +1575,42 @@ static int cna_config (oconfig_item_t *ci) {
/* 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 cna_read(void) {
+static int cna_read(void) { /* {{{ */
na_elem_t *out;
host_config_t *host;
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;
@@ -1473,7 +1630,7 @@ static int cna_read(void) {
}
}
return 0;
-}
+} /* }}} int cna_read */
void module_register(void) {
plugin_register_complex_config("netapp", cna_config);