lower memory requirements: do not add network interface charts for values not offered by kernel #38
Costa Tsaousis (ktsaou) committed
Dec 25, 2015 at 15:24 UTC
5ef136f289789776863e071d8b565838d6368536
1 file changed
+24
-10
src/proc_net_dev.c
+24
-10
@@ -70,10 +70,18 @@ int do_proc_net_dev(int update_every, unsigned long long dt) {
70
tcarrier = strtoull(procfile_lineword(ff, l, 15), NULL, 10);
71
tcompressed = strtoull(procfile_lineword(ff, l, 16), NULL, 10);
72
73
+ 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;
74
+
75
+ if(rerrors == 0 && terrors == 0) ddo_errors = 0;
76
+ if(rdrops == 0 && tdrops == 0) ddo_drops = 0;
77
+ if(rfifo == 0 && tfifo == 0) ddo_fifo = 0;
78
+ if(rcompressed == 0 && tcompressed == 0) ddo_compressed = 0;
79
+ if(rframe == 0 && tcollisions == 0 && tcarrier == 0) ddo_events = 0;
80
+
81
int default_enable = enable_new_interfaces;
82
83
// prevent unused interfaces from creating charts
76
- if(!rbytes && !tbytes)
84
+ if(!rbytes && !tbytes || strcmp(iface, "lo") == 0)
85
default_enable = 0;
86
else {
87
int len = strlen(iface);
@@ -84,15 +92,21 @@ int do_proc_net_dev(int update_every, unsigned long long dt) {
92
// check if the user wants it
93
{
94
char var_name[512 + 1];
87
- snprintf(var_name, 512, "interface %s", iface);
88
- if(!config_get_boolean("plugin:proc:/proc/net/dev", var_name, default_enable)) continue;
95
+ snprintf(var_name, 512, "plugin:proc:/proc/net/dev:%s", iface);
96
+ if(!config_get_boolean(var_name, "enabled", default_enable)) continue;
97
+
98
+ ddo_errors = config_get_boolean(var_name, "errors", ddo_errors);
99
+ ddo_drops = config_get_boolean(var_name, "drops", ddo_drops);
100
+ ddo_fifo = config_get_boolean(var_name, "fifo", ddo_fifo);
101
+ ddo_compressed = config_get_boolean(var_name, "compressed", ddo_compressed);
102
+ ddo_events = config_get_boolean(var_name, "events", ddo_events);
103
}
104
105
RRDSET *st;
106
107
// --------------------------------------------------------------------
108
95
- if(do_bandwidth) {
109
+ if(ddo_bandwidth) {
110
st = rrdset_find_bytype("net", iface);
111
if(!st) {
112
st = rrdset_create("net", iface, NULL, iface, "Bandwidth", "kilobits/s", 1000, update_every, RRDSET_TYPE_AREA);
@@ -109,7 +123,7 @@ int do_proc_net_dev(int update_every, unsigned long long dt) {
123
124
// --------------------------------------------------------------------
125
112
- if(do_packets) {
126
+ if(ddo_packets) {
127
st = rrdset_find_bytype("net_packets", iface);
128
if(!st) {
129
st = rrdset_create("net_packets", iface, NULL, iface, "Packets", "packets/s", 1001, update_every, RRDSET_TYPE_LINE);
@@ -129,7 +143,7 @@ int do_proc_net_dev(int update_every, unsigned long long dt) {
143
144
// --------------------------------------------------------------------
145
132
- if(do_errors) {
146
+ if(ddo_errors) {
147
st = rrdset_find_bytype("net_errors", iface);
148
if(!st) {
149
st = rrdset_create("net_errors", iface, NULL, iface, "Interface Errors", "errors/s", 1002, update_every, RRDSET_TYPE_LINE);
@@ -147,7 +161,7 @@ int do_proc_net_dev(int update_every, unsigned long long dt) {
161
162
// --------------------------------------------------------------------
163
150
- if(do_drops) {
164
+ if(ddo_drops) {
165
st = rrdset_find_bytype("net_drops", iface);
166
if(!st) {
167
st = rrdset_create("net_drops", iface, NULL, iface, "Interface Drops", "drops/s", 1003, update_every, RRDSET_TYPE_LINE);
@@ -165,7 +179,7 @@ int do_proc_net_dev(int update_every, unsigned long long dt) {
179
180
// --------------------------------------------------------------------
181
168
- if(do_fifo) {
182
+ if(ddo_fifo) {
183
st = rrdset_find_bytype("net_fifo", iface);
184
if(!st) {
185
st = rrdset_create("net_fifo", iface, NULL, iface, "Interface Queue", "packets", 1100, update_every, RRDSET_TYPE_LINE);
@@ -183,7 +197,7 @@ int do_proc_net_dev(int update_every, unsigned long long dt) {
197
198
// --------------------------------------------------------------------
199
186
- if(do_compressed) {
200
+ if(ddo_compressed) {
201
st = rrdset_find_bytype("net_compressed", iface);
202
if(!st) {
203
st = rrdset_create("net_compressed", iface, NULL, iface, "Compressed Packets", "packets/s", 1200, update_every, RRDSET_TYPE_LINE);
@@ -201,7 +215,7 @@ int do_proc_net_dev(int update_every, unsigned long long dt) {
215
216
// --------------------------------------------------------------------
217
204
- if(do_events) {
218
+ if(ddo_events) {
219
st = rrdset_find_bytype("net_events", iface);
220
if(!st) {
221
st = rrdset_create("net_events", iface, NULL, iface, "Network Interface Events", "events/s", 1200, update_every, RRDSET_TYPE_LINE);