typedef struct {
uint32_t flags;
- uint64_t last_cpu_busy;
- uint64_t last_cpu_total;
} perf_system_data_t;
/*!
values, 2, timestamp));
} /* }}} int submit_two_counters */
+static int submit_counter (const char *host, const char *plugin_inst, /* {{{ */
+ const char *type, const char *type_inst, counter_t counter, time_t timestamp)
+{
+ value_t v;
+
+ v.counter = counter;
+
+ return (submit_values (host, plugin_inst, type, type_inst,
+ &v, 1, timestamp));
+} /* }}} int submit_counter */
+
static int submit_double (const char *host, const char *plugin_inst, /* {{{ */
const char *type, const char *type_inst, double d, time_t timestamp)
{
}
}
-static void collect_perf_system_data(host_config_t *host, na_elem_t *out, void *data) {
- uint64_t disk_read = 0, disk_written = 0, net_recv = 0, net_sent = 0, cpu_busy = 0, cpu_total = 0;
+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;
+ counter_t cpu_busy = 0, cpu_total = 0;
+ unsigned int counter_flags = 0;
+
perf_system_data_t *perf = data;
- const char *instance, *name;
+ const char *instance;
time_t timestamp;
na_elem_t *counter;
- 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(na_elem_child(out, "instances"), "instance-data");
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;
+ 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_data_read")) {
- disk_read = na_child_get_uint64(counter, "value", 0) * 1024;
+ disk_read = (counter_t) (value * 1024);
+ counter_flags |= 0x01;
} else if (!strcmp(name, "disk_data_written")) {
- disk_written = na_child_get_uint64(counter, "value", 0) * 1024;
+ disk_written = (counter_t) (value * 1024);
+ counter_flags |= 0x02;
} else if (!strcmp(name, "net_data_recv")) {
- net_recv = na_child_get_uint64(counter, "value", 0) * 1024;
+ net_recv = (counter_t) (value * 1024);
+ counter_flags |= 0x04;
} else if (!strcmp(name, "net_data_sent")) {
- net_sent = na_child_get_uint64(counter, "value", 0) * 1024;
+ net_sent = (counter_t) (value * 1024);
+ counter_flags |= 0x08;
} else if (!strcmp(name, "cpu_busy")) {
- cpu_busy = na_child_get_uint64(counter, "value", 0);
+ cpu_busy = (counter_t) value;
+ counter_flags |= 0x10;
} else if (!strcmp(name, "cpu_elapsed_time")) {
- cpu_total = na_child_get_uint64(counter, "value", 0);
- } else if ((perf->flags & PERF_SYSTEM_OPS) && strlen(name) > 4 && !strcmp(name + strlen(name) - 4, "_ops")) {
- values[0].counter = na_child_get_uint64(counter, "value", 0);
- if (!values[0].counter) continue;
- vl.values = values;
- vl.values_len = 1;
- 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, instance, sizeof(vl.plugin_instance));
- sstrncpy(vl.type, "disk_ops_complex", sizeof(vl.type));
- sstrncpy(vl.type_instance, name, sizeof(vl.plugin_instance));
- DEBUG("%s/netapp-%s/disk_ops_complex-%s: %llu",
- host->name, instance, name, values[0].counter);
- plugin_dispatch_values (&vl);
+ cpu_total = (counter_t) value;
+ counter_flags |= 0x20;
+ } else if ((perf->flags & PERF_SYSTEM_OPS)
+ && (strlen(name) > 4)
+ && (!strcmp(name + strlen(name) - 4, "_ops"))) {
+ submit_counter (host->name, 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,
+ disk_read, disk_written, timestamp);
+
+ if ((perf->flags & PERF_SYSTEM_NET)
+ && ((counter_flags & 0x0c) == 0x0c))
+ submit_two_counters (host->name, 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",
+ cpu_busy, timestamp);
+ submit_counter (host->name, instance, "cpu", "idle",
+ cpu_total - cpu_busy, timestamp);
}
- if ((perf->flags & PERF_SYSTEM_DISK) && disk_read && disk_written) {
- values[0].counter = disk_read;
- values[1].counter = disk_written;
- 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, instance, 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, instance, disk_read, disk_written);
- plugin_dispatch_values (&vl);
- }
- if ((perf->flags & PERF_SYSTEM_NET) && net_recv && net_sent) {
- values[0].counter = net_recv;
- values[1].counter = net_sent;
- 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, instance, sizeof(vl.plugin_instance));
- sstrncpy(vl.type, "if_octets", sizeof(vl.type));
- vl.type_instance[0] = 0;
- DEBUG("%s/netapp-%s/if_octects: %"PRIu64" %"PRIu64, host->name, instance, net_recv, net_sent);
- plugin_dispatch_values (&vl);
- }
- if ((perf->flags & PERF_SYSTEM_CPU) && cpu_busy && cpu_total) {
- /* values[0].gauge = (double) (cpu_busy - perf->last_cpu_busy) / (cpu_total - perf->last_cpu_total) * 100; */
- values[0].counter = cpu_busy / 10000;
- vl.values = values;
- vl.values_len = 1;
- 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, instance, sizeof(vl.plugin_instance));
- sstrncpy(vl.type, "cpu", sizeof(vl.type));
- sstrncpy(vl.type_instance, "system", sizeof(vl.plugin_instance));
- /* if (perf->last_cpu_busy && perf->last_cpu_total) printf("CPU: busy: %lf - idle: %lf\n", values[0].gauge, 100.0 - values[0].gauge); */
- /* if (perf->last_cpu_busy && perf->last_cpu_total) plugin_dispatch_values ("cpu", &vl); */
- DEBUG("%s/netapp-%s/cpu: busy: %"PRIu64" - idle: %"PRIu64, host->name, instance, cpu_busy / 10000, cpu_total / 10000);
- plugin_dispatch_values (&vl);
-
- /* values[0].gauge = 100.0 - (double) (cpu_busy - perf->last_cpu_busy) / (cpu_total - perf->last_cpu_total) * 100; */
- values[0].counter = (cpu_total - cpu_busy) / 10000;
- vl.values = values;
- vl.values_len = 1;
- 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, instance, sizeof(vl.plugin_instance));
- sstrncpy(vl.type, "cpu", sizeof(vl.type));
- sstrncpy(vl.type_instance, "idle", sizeof(vl.plugin_instance));
- /* if (perf->last_cpu_busy && perf->last_cpu_total) plugin_dispatch_values ("cpu", &vl); */
- plugin_dispatch_values (&vl);
-
- perf->last_cpu_busy = cpu_busy;
- perf->last_cpu_total = cpu_total;
- }
-}
+} /* }}} void collect_perf_system_data */
-int config_init() {
+static int config_init(void) { /* {{{ */
char err[256];
na_elem_t *e;
host_config_t *host;
}
}
return 0;
-}
+} /* }}} int config_init */
+
+static int config_bool_to_flag (const oconfig_item_t *ci, /* {{{ */
+ uint32_t *flags, uint32_t flag)
+{
+ if ((ci == NULL) || (flags == NULL))
+ return (EINVAL);
+
+ if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_BOOLEAN))
+ {
+ WARNING ("netapp plugin: The %s option needs exactly one boolean argument.",
+ ci->key);
+ return (-1);
+ }
+
+ if (ci->values[0].value.boolean)
+ *flags |= flag;
+ else
+ *flags &= ~flag;
+
+ return (0);
+} /* }}} int config_bool_to_flag */
static void set_global_perf_vol_flag(const host_config_t *host, uint32_t flag, int value) {
volume_t *v;
}
service->skip_countdown = service->multiplier = item->values[0].value.number;
} else if (!strcasecmp(item->key, "GetBusy")) {
- if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN) {
- WARNING("netapp plugin: \"GetBusy\" of host %s service GetDiskPerfData needs exactly one bool argument.", ci->values[0].value.string);
- continue;
- }
- perf_disk->flags = (perf_disk->flags & ~PERF_SYSTEM_CPU) | (item->values[0].value.boolean ? PERF_DISK_BUSIEST : 0);
+ config_bool_to_flag (item, &perf_disk->flags, PERF_SYSTEM_CPU);
}
}
}
}
service->skip_countdown = service->multiplier = item->values[0].value.number;
} else if (!strcasecmp(item->key, "GetNameCache")) {
- if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN) {
- WARNING("netapp plugin: \"GetNameCache\" of host %s service GetWaflPerfData needs exactly one bool argument.", ci->values[0].value.string);
- continue;
- }
- perf_wafl->flags = (perf_wafl->flags & ~PERF_WAFL_NAME_CACHE) | (item->values[0].value.boolean ? PERF_WAFL_NAME_CACHE : 0);
+ config_bool_to_flag (item, &perf_wafl->flags, PERF_WAFL_NAME_CACHE);
} else if (!strcasecmp(item->key, "GetDirCache")) {
- if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN) {
- WARNING("netapp plugin: \"GetDirChache\" of host %s service GetWaflPerfData needs exactly one bool argument.", ci->values[0].value.string);
- continue;
- }
- perf_wafl->flags = (perf_wafl->flags & ~PERF_WAFL_DIR_CACHE) | (item->values[0].value.boolean ? PERF_WAFL_DIR_CACHE : 0);
+ config_bool_to_flag (item, &perf_wafl->flags, PERF_WAFL_DIR_CACHE);
} else if (!strcasecmp(item->key, "GetBufCache")) {
- if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN) {
- WARNING("netapp plugin: \"GetBufCache\" of host %s service GetWaflPerfData needs exactly one bool argument.", ci->values[0].value.string);
- continue;
- }
- perf_wafl->flags = (perf_wafl->flags & ~PERF_WAFL_BUF_CACHE) | (item->values[0].value.boolean ? PERF_WAFL_BUF_CACHE : 0);
+ config_bool_to_flag (item, &perf_wafl->flags, PERF_WAFL_BUF_CACHE);
} else if (!strcasecmp(item->key, "GetInodeCache")) {
- if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN) {
- WARNING("netapp plugin: \"GetInodeCache\" of host %s service GetWaflPerfData needs exactly one bool argument.", ci->values[0].value.string);
- continue;
- }
- perf_wafl->flags = (perf_wafl->flags & ~PERF_WAFL_INODE_CACHE) | (item->values[0].value.boolean ? PERF_WAFL_INODE_CACHE : 0);
+ config_bool_to_flag (item, &perf_wafl->flags, PERF_WAFL_INODE_CACHE);
+ } else {
+ WARNING ("netapp plugin: The %s config option is not allowed within "
+ "`GetWaflPerfData' blocks.", item->key);
}
}
}
-static void build_perf_sys_config(host_config_t *temp, oconfig_item_t *ci, const service_config_t *default_service) {
+static int build_perf_sys_config (host_config_t *host, /* {{{ */
+ oconfig_item_t *ci, const service_config_t *default_service)
+{
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;
- perf_system = service->data = malloc(sizeof(*perf_system));
+
+ perf_system = malloc(sizeof(*perf_system));
+ if (perf_system == NULL) {
+ sfree (service);
+ return (-1);
+ }
+ memset (perf_system, 0, sizeof (*perf_system));
perf_system->flags = PERF_SYSTEM_ALL;
- perf_system->last_cpu_busy = 0;
- perf_system->last_cpu_total = 0;
- service->next = temp->services;
- temp->services = service;
+ service->data = perf_system;
+
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 GetSystemPerfData needs exactly one positive integer argument.", ci->values[0].value.string);
}
service->skip_countdown = service->multiplier = item->values[0].value.number;
} else if (!strcasecmp(item->key, "GetCPULoad")) {
- if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN) {
- WARNING("netapp plugin: \"GetCPULoad\" of host %s service GetSystemPerfData needs exactly one bool argument.", ci->values[0].value.string);
- continue;
- }
- perf_system->flags = (perf_system->flags & ~PERF_SYSTEM_CPU) | (item->values[0].value.boolean ? PERF_SYSTEM_CPU : 0);
+ config_bool_to_flag (item, &perf_system->flags, PERF_SYSTEM_CPU);
} else if (!strcasecmp(item->key, "GetInterfaces")) {
- if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN) {
- WARNING("netapp plugin: \"GetInterfaces\" of host %s service GetSystemPerfData needs exactly one bool argument.", ci->values[0].value.string);
- continue;
- }
- perf_system->flags = (perf_system->flags & ~PERF_SYSTEM_NET) | (item->values[0].value.boolean ? PERF_SYSTEM_NET : 0);
+ config_bool_to_flag (item, &perf_system->flags, PERF_SYSTEM_NET);
} else if (!strcasecmp(item->key, "GetDiskOps")) {
- if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN) {
- WARNING("netapp plugin: \"GetDiskOps\" of host %s service GetSystemPerfData needs exactly one bool argument.", ci->values[0].value.string);
- continue;
- }
- perf_system->flags = (perf_system->flags & ~PERF_SYSTEM_OPS) | (item->values[0].value.boolean ? PERF_SYSTEM_OPS : 0);
+ config_bool_to_flag (item, &perf_system->flags, PERF_SYSTEM_OPS);
} else if (!strcasecmp(item->key, "GetDiskIO")) {
- if (item->values_num != 1 || item->values[0].type != OCONFIG_TYPE_BOOLEAN) {
- WARNING("netapp plugin: \"GetDiskIO\" of host %s service GetSystemPerfData needs exactly one bool argument.", ci->values[0].value.string);
- continue;
- }
- perf_system->flags = (perf_system->flags & ~PERF_SYSTEM_DISK) | (item->values[0].value.boolean ? PERF_SYSTEM_DISK : 0);
+ config_bool_to_flag (item, &perf_system->flags, PERF_SYSTEM_DISK);
+ } else {
+ WARNING ("netapp plugin: The %s config option is not allowed within "
+ "`GetSystemPerfData' blocks.", item->key);
}
}
-}
+
+ service->next = host->services;
+ host->services = service;
+
+ return (0);
+} /* }}} int build_perf_sys_config */
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;
projects / collectd.git / blobdiff