X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Frouteros.c;h=ece865b67dc76cd6f310843ed20e383f25d70b72;hp=7f5e60833a0dca0721ca652cf98c3084c7e2f2e6;hb=48efd3deb4c9139fd060ff3d289896e9031bcc7c;hpb=f8ce6e1a9f5d02e43e2c97dc810c40f39e3b6e72 diff --git a/src/routeros.c b/src/routeros.c index 7f5e6083..ece865b6 100644 --- a/src/routeros.c +++ b/src/routeros.c @@ -26,8 +26,8 @@ #include "collectd.h" -#include "common.h" #include "plugin.h" +#include "utils/common/common.h" #include @@ -53,7 +53,8 @@ static void cr_submit_io(cr_data_t *rd, const char *type, /* {{{ */ const char *type_instance, derive_t rx, derive_t tx) { value_list_t vl = VALUE_LIST_INIT; value_t values[] = { - {.derive = rx}, {.derive = tx}, + {.derive = rx}, + {.derive = tx}, }; vl.values = values; @@ -141,9 +142,17 @@ static void submit_regtable(cr_data_t *rd, /* {{{ */ if (r == NULL) return; + const char *name = r->radio_name; +#if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 3) + if (name == NULL) + name = r->mac_address; +#endif + if (name == NULL) + name = "default"; + /*** RX ***/ - snprintf(type_instance, sizeof(type_instance), "%s-%s-rx", r->interface, - r->radio_name ? r->radio_name : "default"); + ssnprintf(type_instance, sizeof(type_instance), "%s-%s-rx", r->interface, + name); cr_submit_gauge(rd, "bitrate", type_instance, (gauge_t)(1000000.0 * r->rx_rate)); cr_submit_gauge(rd, "signal_power", type_instance, @@ -151,8 +160,8 @@ static void submit_regtable(cr_data_t *rd, /* {{{ */ cr_submit_gauge(rd, "signal_quality", type_instance, (gauge_t)r->rx_ccq); /*** TX ***/ - snprintf(type_instance, sizeof(type_instance), "%s-%s-tx", r->interface, - r->radio_name ? r->radio_name : "default"); + ssnprintf(type_instance, sizeof(type_instance), "%s-%s-tx", r->interface, + name); cr_submit_gauge(rd, "bitrate", type_instance, (gauge_t)(1000000.0 * r->tx_rate)); cr_submit_gauge(rd, "signal_power", type_instance, @@ -160,8 +169,7 @@ static void submit_regtable(cr_data_t *rd, /* {{{ */ cr_submit_gauge(rd, "signal_quality", type_instance, (gauge_t)r->tx_ccq); /*** RX / TX ***/ - snprintf(type_instance, sizeof(type_instance), "%s-%s", r->interface, - r->radio_name ? r->radio_name : "default"); + ssnprintf(type_instance, sizeof(type_instance), "%s-%s", r->interface, name); cr_submit_io(rd, "if_octets", type_instance, (derive_t)r->rx_bytes, (derive_t)r->tx_bytes); cr_submit_gauge(rd, "snr", type_instance, (gauge_t)r->signal_to_noise); @@ -206,7 +214,7 @@ static int handle_system_resource(__attribute__((unused)) } if (rd->collect_disk) { - cr_submit_counter(rd, "counter", "secors_written", + cr_submit_counter(rd, "counter", "sectors_written", (derive_t)r->write_sect_total); cr_submit_gauge(rd, "gauge", "bad_blocks", (gauge_t)r->bad_blocks); } @@ -214,22 +222,24 @@ static int handle_system_resource(__attribute__((unused)) return 0; } /* }}} int handle_system_resource */ +#if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 3) static int handle_system_health(__attribute__((unused)) ros_connection_t *c, /* {{{ */ const ros_system_health_t *r, __attribute__((unused)) void *user_data) { - cr_data_t *rd; if ((r == NULL) || (user_data == NULL)) - return (EINVAL); - rd = user_data; + return EINVAL; + + cr_data_t *rd = user_data; - cr_submit_gauge(rd, "gauge", "voltage", (gauge_t)r->voltage); - cr_submit_gauge(rd, "gauge", "temperature", (gauge_t)r->temperature); + cr_submit_gauge(rd, "voltage", "system", (gauge_t)r->voltage); + cr_submit_gauge(rd, "temperature", "system", (gauge_t)r->temperature); - return (0); + return 0; } /* }}} int handle_system_health */ #endif +#endif static int cr_read(user_data_t *user_data) /* {{{ */ { @@ -290,19 +300,19 @@ static int cr_read(user_data_t *user_data) /* {{{ */ } } +#if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 3) if (rd->collect_health) { status = ros_system_health(rd->connection, handle_system_health, /* user data = */ rd); if (status != 0) { - char errbuf[128]; - ERROR("routeros plugin: ros_system_health failed: %s", - sstrerror(status, errbuf, sizeof(errbuf))); + ERROR("routeros plugin: ros_system_health failed: %s", STRERROR(status)); ros_disconnect(rd->connection); rd->connection = NULL; - return (-1); + return -1; } } #endif +#endif return 0; } /* }}} int cr_read */ @@ -363,9 +373,11 @@ static int cr_config_router(oconfig_item_t *ci) /* {{{ */ cf_util_get_boolean(child, &router_data->collect_df); else if (strcasecmp("CollectDisk", child->key) == 0) cf_util_get_boolean(child, &router_data->collect_disk); +#if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 3) else if (strcasecmp("CollectHealth", child->key) == 0) cf_util_get_boolean(child, &router_data->collect_health); #endif +#endif else { WARNING("routeros plugin: Unknown config option `%s'.", child->key); } @@ -387,7 +399,27 @@ static int cr_config_router(oconfig_item_t *ci) /* {{{ */ status = -1; } - if (!router_data->collect_interface && !router_data->collect_regtable) { + int report = 0; + if (router_data->collect_interface) + report++; + if (router_data->collect_regtable) + report++; +#if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 0) + if (router_data->collect_cpu_load) + report++; + if (router_data->collect_memory) + report++; + if (router_data->collect_df) + report++; + if (router_data->collect_disk) + report++; +#if ROS_VERSION >= ROS_VERSION_ENCODE(1, 1, 3) + if (router_data->collect_health) + report++; +#endif +#endif + + if (!report) { ERROR("routeros plugin: No `Collect*' option within a `Router' block. " "What statistics should I collect?"); status = -1; @@ -407,11 +439,12 @@ static int cr_config_router(oconfig_item_t *ci) /* {{{ */ return status; } - snprintf(read_name, sizeof(read_name), "routeros/%s", router_data->node); + ssnprintf(read_name, sizeof(read_name), "routeros/%s", router_data->node); return plugin_register_complex_read( /* group = */ NULL, read_name, cr_read, /* interval = */ 0, &(user_data_t){ - .data = router_data, .free_func = (void *)cr_free_data, + .data = router_data, + .free_func = (void *)cr_free_data, }); } /* }}} int cr_config_router */