@cryptotaxi247 / netdata-1 / commits / 8160bdba8

kilobit is 1000 bits, not 1024 bits

Costa Tsaousis (ktsaou) committed Aug 1, 2017 at 01:10 UTC 8160bdba845c7b5cf83e9b8ca2439dd70840ba41
11 files changed +34 -34
src/common.h
+2
@@ -309,4 +309,6 @@ extern const char *program_version;
309 #endif
310 #endif
311
312 +#define BITS_IN_A_KILOBIT 1000
313 +
314 #endif /* NETDATA_COMMON_H */
src/freebsd_getifaddrs.c
+6 -8
@@ -233,8 +233,8 @@ int do_getifaddrs(int update_every, usec_t dt) {
233 RRDSET_TYPE_AREA
234 );
235
236 - rd_in = rrddim_add(st, "InOctets", "received", 8, KILO_FACTOR, RRD_ALGORITHM_INCREMENTAL);
237 - rd_out = rrddim_add(st, "OutOctets", "sent", -8, KILO_FACTOR, RRD_ALGORITHM_INCREMENTAL);
236 + rd_in = rrddim_add(st, "InOctets", "received", 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
237 + rd_out = rrddim_add(st, "OutOctets", "sent", -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
238 } else
239 rrdset_next(st);
240
@@ -270,8 +270,8 @@ int do_getifaddrs(int update_every, usec_t dt) {
270 RRDSET_TYPE_AREA
271 );
272
273 - rd_in = rrddim_add(st, "received", NULL, 8, KILO_FACTOR, RRD_ALGORITHM_INCREMENTAL);
274 - rd_out = rrddim_add(st, "sent", NULL, -8, KILO_FACTOR, RRD_ALGORITHM_INCREMENTAL);
273 + rd_in = rrddim_add(st, "received", NULL, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
274 + rd_out = rrddim_add(st, "sent", NULL, -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
275 } else
276 rrdset_next(st);
277
@@ -338,10 +338,8 @@ int do_getifaddrs(int update_every, usec_t dt) {
338 RRDSET_TYPE_AREA
339 );
340
341 - ifm->rd_bandwidth_in = rrddim_add(ifm->st_bandwidth, "received", NULL, 8, KILO_FACTOR,
342 - RRD_ALGORITHM_INCREMENTAL);
343 - ifm->rd_bandwidth_out = rrddim_add(ifm->st_bandwidth, "sent", NULL, -8, KILO_FACTOR,
344 - RRD_ALGORITHM_INCREMENTAL);
341 + ifm->rd_bandwidth_in = rrddim_add(ifm->st_bandwidth, "received", NULL, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
342 + ifm->rd_bandwidth_out = rrddim_add(ifm->st_bandwidth, "sent", NULL, -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
343 } else
344 rrdset_next(ifm->st_bandwidth);
345
src/global_statistics.c
+2 -2
@@ -199,8 +199,8 @@ void global_statistics_charts(void) {
199 stbytes = rrdset_create_localhost("netdata", "net", NULL, "netdata", NULL, "NetData Network Traffic"
200 , "kilobits/s", 130000, localhost->rrd_update_every, RRDSET_TYPE_AREA);
201
202 - rrddim_add(stbytes, "in", NULL, 8, 1024, RRD_ALGORITHM_INCREMENTAL);
203 - rrddim_add(stbytes, "out", NULL, -8, 1024, RRD_ALGORITHM_INCREMENTAL);
202 + rrddim_add(stbytes, "in", NULL, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
203 + rrddim_add(stbytes, "out", NULL, -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
204 } else rrdset_next(stbytes);
205
206 rrddim_set(stbytes, "in", (collected_number) gs.bytes_received);
src/macos_fw.c
+2 -2
@@ -420,8 +420,8 @@ int do_macos_iokit(int update_every, usec_t dt) {
420 st = rrdset_create_localhost("net", ifa->ifa_name, NULL, ifa->ifa_name, "net.net", "Bandwidth"
421 , "kilobits/s", 7000, update_every, RRDSET_TYPE_AREA);
422
423 - rrddim_add(st, "received", NULL, 8, 1024, RRD_ALGORITHM_INCREMENTAL);
424 - rrddim_add(st, "sent", NULL, -8, 1024, RRD_ALGORITHM_INCREMENTAL);
423 + rrddim_add(st, "received", NULL, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
424 + rrddim_add(st, "sent", NULL, -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
425 }
426 else rrdset_next(st);
427
src/macos_sysctl.c
+2 -2
@@ -299,8 +299,8 @@ int do_macos_sysctl(int update_every, usec_t dt) {
299 st = rrdset_create_localhost("system", "ipv4", NULL, "network", NULL, "IPv4 Bandwidth", "kilobits/s"
300 , 500, update_every, RRDSET_TYPE_AREA);
301
302 - rrddim_add(st, "InOctets", "received", 8, 1024, RRD_ALGORITHM_INCREMENTAL);
303 - rrddim_add(st, "OutOctets", "sent", -8, 1024, RRD_ALGORITHM_INCREMENTAL);
302 + rrddim_add(st, "InOctets", "received", 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
303 + rrddim_add(st, "OutOctets", "sent", -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
304 }
305 else rrdset_next(st);
306
src/plugin_tc.c
+1 -1
@@ -392,7 +392,7 @@ static inline void tc_device_commit(struct tc_device *d) {
392 if(unlikely(!c->render)) continue;
393
394 if(unlikely(!c->rd_bytes))
395 - c->rd_bytes = rrddim_add(d->st_bytes, c->id, c->name?c->name:c->id, 8, 1024, RRD_ALGORITHM_INCREMENTAL);
395 + c->rd_bytes = rrddim_add(d->st_bytes, c->id, c->name?c->name:c->id, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
396 else if(unlikely(c->name_updated))
397 rrddim_set_name(d->st_bytes, c->rd_bytes, c->name);
398
src/proc_net_dev.c
+2 -2
@@ -556,8 +556,8 @@ int do_proc_net_dev(int update_every, usec_t dt) {
556 , RRDSET_TYPE_AREA
557 );
558
559 - d->rd_rbytes = rrddim_add(d->st_bandwidth, "received", NULL, 8, 1024, RRD_ALGORITHM_INCREMENTAL);
560 - d->rd_tbytes = rrddim_add(d->st_bandwidth, "sent", NULL, -8, 1024, RRD_ALGORITHM_INCREMENTAL);
559 + d->rd_rbytes = rrddim_add(d->st_bandwidth, "received", NULL, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
560 + d->rd_tbytes = rrddim_add(d->st_bandwidth, "sent", NULL, -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
561
562 if(d->flipped) {
563 // flip receive/trasmit
src/proc_net_ip_vs_stats.c
+2 -2
@@ -80,8 +80,8 @@ int do_proc_net_ip_vs_stats(int update_every, usec_t dt) {
80 st = rrdset_create_localhost(RRD_TYPE_NET_IPVS, "net", NULL, RRD_TYPE_NET_IPVS, NULL, "IPVS Bandwidth"
81 , "kilobits/s", 3100, update_every, RRDSET_TYPE_AREA);
82
83 - rrddim_add(st, "received", NULL, 8, 1024, RRD_ALGORITHM_INCREMENTAL);
84 - rrddim_add(st, "sent", NULL, -8, 1024, RRD_ALGORITHM_INCREMENTAL);
83 + rrddim_add(st, "received", NULL, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
84 + rrddim_add(st, "sent", NULL, -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
85 }
86 else rrdset_next(st);
87
src/proc_net_netstat.c
+6 -6
@@ -243,8 +243,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
243 st = rrdset_create_localhost("system", "ipv4", NULL, "network", NULL, "IPv4 Bandwidth", "kilobits/s"
244 , 500, update_every, RRDSET_TYPE_AREA);
245
246 - rrddim_add(st, "InOctets", "received", 8, 1024, RRD_ALGORITHM_INCREMENTAL);
247 - rrddim_add(st, "OutOctets", "sent", -8, 1024, RRD_ALGORITHM_INCREMENTAL);
246 + rrddim_add(st, "InOctets", "received", 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
247 + rrddim_add(st, "OutOctets", "sent", -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
248 }
249 else rrdset_next(st);
250
@@ -285,8 +285,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
285 , "kilobits/s", 9000, update_every, RRDSET_TYPE_AREA);
286 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
287
288 - rrddim_add(st, "InMcastOctets", "received", 8, 1024, RRD_ALGORITHM_INCREMENTAL);
289 - rrddim_add(st, "OutMcastOctets", "sent", -8, 1024, RRD_ALGORITHM_INCREMENTAL);
288 + rrddim_add(st, "InMcastOctets", "received", 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
289 + rrddim_add(st, "OutMcastOctets", "sent", -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
290 }
291 else rrdset_next(st);
292
@@ -305,8 +305,8 @@ int do_proc_net_netstat(int update_every, usec_t dt) {
305 , "kilobits/s", 8000, update_every, RRDSET_TYPE_AREA);
306 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
307
308 - rrddim_add(st, "InBcastOctets", "received", 8, 1024, RRD_ALGORITHM_INCREMENTAL);
309 - rrddim_add(st, "OutBcastOctets", "sent", -8, 1024, RRD_ALGORITHM_INCREMENTAL);
308 + rrddim_add(st, "InBcastOctets", "received", 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
309 + rrddim_add(st, "OutBcastOctets", "sent", -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
310 }
311 else rrdset_next(st);
312
src/proc_net_snmp6.c
+6 -6
@@ -283,8 +283,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
283 st = rrdset_create_localhost("system", "ipv6", NULL, "network", NULL, "IPv6 Bandwidth", "kilobits/s", 500
284 , update_every, RRDSET_TYPE_AREA);
285
286 - rrddim_add(st, "received", NULL, 8, 1024, RRD_ALGORITHM_INCREMENTAL);
287 - rrddim_add(st, "sent", NULL, -8, 1024, RRD_ALGORITHM_INCREMENTAL);
286 + rrddim_add(st, "received", NULL, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
287 + rrddim_add(st, "sent", NULL, -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
288 }
289 else rrdset_next(st);
290
@@ -536,8 +536,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
536 , RRDSET_TYPE_AREA);
537 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
538
539 - rrddim_add(st, "received", NULL, 8, 1024, RRD_ALGORITHM_INCREMENTAL);
540 - rrddim_add(st, "sent", NULL, -8, 1024, RRD_ALGORITHM_INCREMENTAL);
539 + rrddim_add(st, "received", NULL, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
540 + rrddim_add(st, "sent", NULL, -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
541 }
542 else rrdset_next(st);
543
@@ -557,8 +557,8 @@ int do_proc_net_snmp6(int update_every, usec_t dt) {
557 , RRDSET_TYPE_AREA);
558 rrdset_flag_set(st, RRDSET_FLAG_DETAIL);
559
560 - rrddim_add(st, "received", NULL, 8, 1024, RRD_ALGORITHM_INCREMENTAL);
561 - rrddim_add(st, "sent", NULL, -8, 1024, RRD_ALGORITHM_INCREMENTAL);
560 + rrddim_add(st, "received", NULL, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
561 + rrddim_add(st, "sent", NULL, -8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
562 }
563 else rrdset_next(st);
564
src/statsd.c
+3 -3
@@ -1922,13 +1922,13 @@ void *statsd_main(void *ptr) {
1922 , "statsd"
1923 , NULL
1924 , "Bytes read by the netdata statsd server"
1925 - , "kbps"
1925 + , "kilobits/s"
1926 , 132003
1927 , statsd.update_every
1928 , RRDSET_TYPE_STACKED
1929 );
1930 - RRDDIM *rd_bytes_tcp = rrddim_add(st_bytes, "tcp", NULL, 8, 1024, RRD_ALGORITHM_INCREMENTAL);
1931 - RRDDIM *rd_bytes_udp = rrddim_add(st_bytes, "udp", NULL, 8, 1024, RRD_ALGORITHM_INCREMENTAL);
1930 + RRDDIM *rd_bytes_tcp = rrddim_add(st_bytes, "tcp", NULL, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
1931 + RRDDIM *rd_bytes_udp = rrddim_add(st_bytes, "udp", NULL, 8, BITS_IN_A_KILOBIT, RRD_ALGORITHM_INCREMENTAL);
1932
1933 RRDSET *st_packets = rrdset_create_localhost(
1934 "netdata"