X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fovs_stats.c;h=fe1953f29542232a92c5feba781831ade1ae54bf;hp=eca7329e8c8352b3a9ccdb1aed163b51b8d2b776;hb=6378ec288f34ff250b2971a1452338a2b34c240a;hpb=711f5b6c86f51061c21bedcaa46214a01de0125c diff --git a/src/ovs_stats.c b/src/ovs_stats.c index eca7329e..fe1953f2 100644 --- a/src/ovs_stats.c +++ b/src/ovs_stats.c @@ -28,9 +28,9 @@ * Taras Chornyi */ -#include "common.h" +#include "utils/common/common.h" -#include "utils_ovs.h" /* OvS helpers */ +#include "utils/ovs/ovs.h" /* OvS helpers */ /* Plugin name */ static const char plugin_name[] = "ovs_stats"; @@ -280,8 +280,11 @@ static void ovs_stats_submit_interfaces(port_list_t *port) { if (strlen(iface->ex_iface_id)) meta_data_add_string(meta, "iface-id", iface->ex_iface_id); } - snprintf(devname, sizeof(devname), "%s.%s.%s", bridge->name, port->name, - iface->name); + strjoin(devname, sizeof(devname), + (char *[]){ + bridge->name, port->name, iface->name, + }, + 3, "."); ovs_stats_submit_one(devname, "if_collisions", NULL, iface->stats[collisions], meta); ovs_stats_submit_two(devname, "if_dropped", NULL, iface->stats[rx_dropped],