X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=src%2Fproc_net_dev.c;h=ec1cabbdb6395f32d4e9e4fc597fb8b13635fdfa;hb=a2588ccbb1aec299407e390ce5bc5244504cc9c7;hp=2416c752205cfce35b8ad2d9d909568774721688;hpb=71b72e4f59b129ced0a1d15e5ce3b21370edfbbd;p=netdata.git diff --git a/src/proc_net_dev.c b/src/proc_net_dev.c index 2416c752..ec1cabbd 100755 --- a/src/proc_net_dev.c +++ b/src/proc_net_dev.c @@ -1,35 +1,43 @@ -#include +#ifdef HAVE_CONFIG_H +#include +#endif #include #include +#include #include "common.h" -#include "config.h" +#include "appconfig.h" #include "procfile.h" #include "rrd.h" #include "plugin_proc.h" int do_proc_net_dev(int update_every, unsigned long long dt) { static procfile *ff = NULL; - static int enable_new_interfaces = -1; + static int enable_new_interfaces = -1, enable_ifb_interfaces = -1; static int do_bandwidth = -1, do_packets = -1, do_errors = -1, do_drops = -1, do_fifo = -1, do_compressed = -1, do_events = -1; if(dt) {}; - if(!ff) ff = procfile_open("/proc/net/dev", " \t,:|", PROCFILE_FLAG_DEFAULT); + if(!ff) { + char filename[FILENAME_MAX + 1]; + snprintf(filename, FILENAME_MAX, "%s%s", global_host_prefix, "/proc/net/dev"); + ff = procfile_open(config_get("plugin:proc:/proc/net/dev", "filename to monitor", filename), " \t,:|", PROCFILE_FLAG_DEFAULT); + } if(!ff) return 1; ff = procfile_readall(ff); if(!ff) return 0; // we return 0, so that we will retry to open it next time - if(enable_new_interfaces == -1) enable_new_interfaces = config_get_boolean("plugin:proc:/proc/net/dev", "enable new interfaces detected at runtime", 1); + if(enable_new_interfaces == -1) enable_new_interfaces = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "enable new interfaces detected at runtime", CONFIG_ONDEMAND_ONDEMAND); + if(enable_ifb_interfaces == -1) enable_ifb_interfaces = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "enable ifb interfaces", CONFIG_ONDEMAND_NO); - if(do_bandwidth == -1) do_bandwidth = config_get_boolean("plugin:proc:/proc/net/dev", "bandwidth for all interfaces", 1); - if(do_packets == -1) do_packets = config_get_boolean("plugin:proc:/proc/net/dev", "packets for all interfaces", 1); - if(do_errors == -1) do_errors = config_get_boolean("plugin:proc:/proc/net/dev", "errors for all interfaces", 1); - if(do_drops == -1) do_drops = config_get_boolean("plugin:proc:/proc/net/dev", "drops for all interfaces", 1); - if(do_fifo == -1) do_fifo = config_get_boolean("plugin:proc:/proc/net/dev", "fifo for all interfaces", 1); - if(do_compressed == -1) do_compressed = config_get_boolean("plugin:proc:/proc/net/dev", "compressed packets for all interfaces", 1); - if(do_events == -1) do_events = config_get_boolean("plugin:proc:/proc/net/dev", "frames, collisions, carrier coutners for all interfaces", 1); + if(do_bandwidth == -1) do_bandwidth = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "bandwidth for all interfaces", CONFIG_ONDEMAND_ONDEMAND); + if(do_packets == -1) do_packets = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "packets for all interfaces", CONFIG_ONDEMAND_ONDEMAND); + if(do_errors == -1) do_errors = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "errors for all interfaces", CONFIG_ONDEMAND_ONDEMAND); + if(do_drops == -1) do_drops = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "drops for all interfaces", CONFIG_ONDEMAND_ONDEMAND); + if(do_fifo == -1) do_fifo = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "fifo for all interfaces", CONFIG_ONDEMAND_ONDEMAND); + if(do_compressed == -1) do_compressed = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "compressed packets for all interfaces", CONFIG_ONDEMAND_ONDEMAND); + if(do_events == -1) do_events = config_get_boolean_ondemand("plugin:proc:/proc/net/dev", "frames, collisions, carrier counters for all interfaces", CONFIG_ONDEMAND_ONDEMAND); uint32_t lines = procfile_lines(ff), l; uint32_t words; @@ -62,23 +70,58 @@ int do_proc_net_dev(int update_every, unsigned long long dt) { tcarrier = strtoull(procfile_lineword(ff, l, 15), NULL, 10); tcompressed = strtoull(procfile_lineword(ff, l, 16), NULL, 10); + int ddo_bandwidth = do_bandwidth, ddo_packets = do_packets, ddo_errors = do_errors, ddo_drops = do_drops, ddo_fifo = do_fifo, ddo_compressed = do_compressed, ddo_events = do_events; + + int default_enable = enable_new_interfaces; + + // prevent unused interfaces from creating charts + if(strcmp(iface, "lo") == 0) + default_enable = 0; + else { + int len = strlen(iface); + if(len >= 4 && strcmp(&iface[len-4], "-ifb") == 0) + default_enable = enable_ifb_interfaces; + } + + // check if the user wants it { - char var_name[4096 + 1]; - snprintf(var_name, 4096, "interface %s", iface); - if(!config_get_boolean("plugin:proc:/proc/net/dev", var_name, enable_new_interfaces)) continue; + char var_name[512 + 1]; + snprintf(var_name, 512, "plugin:proc:/proc/net/dev:%s", iface); + default_enable = config_get_boolean_ondemand(var_name, "enabled", default_enable); + if(default_enable == CONFIG_ONDEMAND_NO) continue; + if(default_enable == CONFIG_ONDEMAND_ONDEMAND && !rbytes && !tbytes) continue; + + ddo_bandwidth = config_get_boolean_ondemand(var_name, "bandwidth", ddo_bandwidth); + ddo_packets = config_get_boolean_ondemand(var_name, "packets", ddo_packets); + ddo_errors = config_get_boolean_ondemand(var_name, "errors", ddo_errors); + ddo_drops = config_get_boolean_ondemand(var_name, "drops", ddo_drops); + ddo_fifo = config_get_boolean_ondemand(var_name, "fifo", ddo_fifo); + ddo_compressed = config_get_boolean_ondemand(var_name, "compressed", ddo_compressed); + ddo_events = config_get_boolean_ondemand(var_name, "events", ddo_events); + + if(ddo_bandwidth == CONFIG_ONDEMAND_ONDEMAND && rbytes == 0 && tbytes == 0) ddo_bandwidth = 0; + if(ddo_errors == CONFIG_ONDEMAND_ONDEMAND && rerrors == 0 && terrors == 0) ddo_errors = 0; + if(ddo_drops == CONFIG_ONDEMAND_ONDEMAND && rdrops == 0 && tdrops == 0) ddo_drops = 0; + if(ddo_fifo == CONFIG_ONDEMAND_ONDEMAND && rfifo == 0 && tfifo == 0) ddo_fifo = 0; + if(ddo_compressed == CONFIG_ONDEMAND_ONDEMAND && rcompressed == 0 && tcompressed == 0) ddo_compressed = 0; + if(ddo_events == CONFIG_ONDEMAND_ONDEMAND && rframe == 0 && tcollisions == 0 && tcarrier == 0) ddo_events = 0; + + // for absolute values, we need to switch the setting to 'yes' + // to allow it refresh from now on + if(ddo_fifo == CONFIG_ONDEMAND_ONDEMAND) config_set(var_name, "fifo", "yes"); } RRDSET *st; // -------------------------------------------------------------------- - if(do_bandwidth) { + if(ddo_bandwidth) { st = rrdset_find_bytype("net", iface); if(!st) { st = rrdset_create("net", iface, NULL, iface, "Bandwidth", "kilobits/s", 1000, update_every, RRDSET_TYPE_AREA); - rrddim_add(st, "received", NULL, 8, 1024 * update_every, RRDDIM_INCREMENTAL); - rrddim_add(st, "sent", NULL, -8, 1024 * update_every, RRDDIM_INCREMENTAL); + rrddim_add(st, "received", NULL, 8, 1024, RRDDIM_INCREMENTAL); + rrddim_add(st, "sent", NULL, -8, 1024, RRDDIM_INCREMENTAL); } else rrdset_next(st); @@ -89,15 +132,15 @@ int do_proc_net_dev(int update_every, unsigned long long dt) { // -------------------------------------------------------------------- - if(do_packets) { + if(ddo_packets) { st = rrdset_find_bytype("net_packets", iface); if(!st) { st = rrdset_create("net_packets", iface, NULL, iface, "Packets", "packets/s", 1001, update_every, RRDSET_TYPE_LINE); st->isdetail = 1; - rrddim_add(st, "received", NULL, 1, 1 * update_every, RRDDIM_INCREMENTAL); - rrddim_add(st, "sent", NULL, -1, 1 * update_every, RRDDIM_INCREMENTAL); - rrddim_add(st, "multicast", NULL, 1, 1 * update_every, RRDDIM_INCREMENTAL); + rrddim_add(st, "received", NULL, 1, 1, RRDDIM_INCREMENTAL); + rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_INCREMENTAL); + rrddim_add(st, "multicast", NULL, 1, 1, RRDDIM_INCREMENTAL); } else rrdset_next(st); @@ -109,14 +152,14 @@ int do_proc_net_dev(int update_every, unsigned long long dt) { // -------------------------------------------------------------------- - if(do_errors) { + if(ddo_errors) { st = rrdset_find_bytype("net_errors", iface); if(!st) { st = rrdset_create("net_errors", iface, NULL, iface, "Interface Errors", "errors/s", 1002, update_every, RRDSET_TYPE_LINE); st->isdetail = 1; - rrddim_add(st, "inbound", NULL, 1, 1 * update_every, RRDDIM_INCREMENTAL); - rrddim_add(st, "outbound", NULL, -1, 1 * update_every, RRDDIM_INCREMENTAL); + rrddim_add(st, "inbound", NULL, 1, 1, RRDDIM_INCREMENTAL); + rrddim_add(st, "outbound", NULL, -1, 1, RRDDIM_INCREMENTAL); } else rrdset_next(st); @@ -127,14 +170,14 @@ int do_proc_net_dev(int update_every, unsigned long long dt) { // -------------------------------------------------------------------- - if(do_drops) { + if(ddo_drops) { st = rrdset_find_bytype("net_drops", iface); if(!st) { st = rrdset_create("net_drops", iface, NULL, iface, "Interface Drops", "drops/s", 1003, update_every, RRDSET_TYPE_LINE); st->isdetail = 1; - rrddim_add(st, "inbound", NULL, 1, 1 * update_every, RRDDIM_INCREMENTAL); - rrddim_add(st, "outbound", NULL, -1, 1 * update_every, RRDDIM_INCREMENTAL); + rrddim_add(st, "inbound", NULL, 1, 1, RRDDIM_INCREMENTAL); + rrddim_add(st, "outbound", NULL, -1, 1, RRDDIM_INCREMENTAL); } else rrdset_next(st); @@ -145,7 +188,7 @@ int do_proc_net_dev(int update_every, unsigned long long dt) { // -------------------------------------------------------------------- - if(do_fifo) { + if(ddo_fifo) { st = rrdset_find_bytype("net_fifo", iface); if(!st) { st = rrdset_create("net_fifo", iface, NULL, iface, "Interface Queue", "packets", 1100, update_every, RRDSET_TYPE_LINE); @@ -163,14 +206,14 @@ int do_proc_net_dev(int update_every, unsigned long long dt) { // -------------------------------------------------------------------- - if(do_compressed) { + if(ddo_compressed) { st = rrdset_find_bytype("net_compressed", iface); if(!st) { st = rrdset_create("net_compressed", iface, NULL, iface, "Compressed Packets", "packets/s", 1200, update_every, RRDSET_TYPE_LINE); st->isdetail = 1; - rrddim_add(st, "received", NULL, 1, 1 * update_every, RRDDIM_INCREMENTAL); - rrddim_add(st, "sent", NULL, -1, 1 * update_every, RRDDIM_INCREMENTAL); + rrddim_add(st, "received", NULL, 1, 1, RRDDIM_INCREMENTAL); + rrddim_add(st, "sent", NULL, -1, 1, RRDDIM_INCREMENTAL); } else rrdset_next(st); @@ -181,15 +224,15 @@ int do_proc_net_dev(int update_every, unsigned long long dt) { // -------------------------------------------------------------------- - if(do_events) { + if(ddo_events) { st = rrdset_find_bytype("net_events", iface); if(!st) { st = rrdset_create("net_events", iface, NULL, iface, "Network Interface Events", "events/s", 1200, update_every, RRDSET_TYPE_LINE); st->isdetail = 1; - rrddim_add(st, "frames", NULL, 1, 1 * update_every, RRDDIM_INCREMENTAL); - rrddim_add(st, "collisions", NULL, -1, 1 * update_every, RRDDIM_INCREMENTAL); - rrddim_add(st, "carrier", NULL, -1, 1 * update_every, RRDDIM_INCREMENTAL); + rrddim_add(st, "frames", NULL, 1, 1, RRDDIM_INCREMENTAL); + rrddim_add(st, "collisions", NULL, -1, 1, RRDDIM_INCREMENTAL); + rrddim_add(st, "carrier", NULL, -1, 1, RRDDIM_INCREMENTAL); } else rrdset_next(st);