#include "collectd.h"
-#include "common.h"
#include "plugin.h"
+#include "utils/common/common.h"
#include <routeros_api.h>
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;
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,
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,
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);
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, "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
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
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 */