proc/net_dev: remove "ignore zero metrics" (#17789)
Ilya Mashchenko committed
May 31, 2024 at 09:37 UTC
5054b322cf55476d5fa34a7d52f92a49085936fc
1 file changed
+8
-38
src/collectors/proc.plugin/proc_net_dev.c
+8
-38
@@ -1197,11 +1197,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1197
// , d->rframe, d->tcollisions, d->tcarrier
1198
// );
1199
1200
- if(unlikely(d->do_bandwidth == CONFIG_BOOLEAN_AUTO &&
1201
- (d->rbytes || d->tbytes || netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES)))
1202
- d->do_bandwidth = CONFIG_BOOLEAN_YES;
1203
-
1204
- if(d->do_bandwidth == CONFIG_BOOLEAN_YES) {
1200
+ if (d->do_bandwidth == CONFIG_BOOLEAN_YES || d->do_bandwidth == CONFIG_BOOLEAN_AUTO) {
1201
if(unlikely(!d->st_bandwidth)) {
1202
1203
d->st_bandwidth = rrdset_create_localhost(
@@ -1443,11 +1439,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1439
rrdset_done(d->st_mtu);
1440
}
1441
1446
- if(unlikely(d->do_packets == CONFIG_BOOLEAN_AUTO &&
1447
- (d->rpackets || d->tpackets || d->rmulticast || netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES)))
1448
- d->do_packets = CONFIG_BOOLEAN_YES;
1449
-
1450
- if(d->do_packets == CONFIG_BOOLEAN_YES) {
1442
+ if (d->do_packets == CONFIG_BOOLEAN_YES || d->do_packets == CONFIG_BOOLEAN_AUTO) {
1443
if(unlikely(!d->st_packets)) {
1444
1445
d->st_packets = rrdset_create_localhost(
@@ -1488,11 +1480,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1480
rrdset_done(d->st_packets);
1481
}
1482
1491
- if(unlikely(d->do_errors == CONFIG_BOOLEAN_AUTO &&
1492
- (d->rerrors || d->terrors || netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES)))
1493
- d->do_errors = CONFIG_BOOLEAN_YES;
1494
-
1495
- if(d->do_errors == CONFIG_BOOLEAN_YES) {
1483
+ if (d->do_errors == CONFIG_BOOLEAN_YES || d->do_errors == CONFIG_BOOLEAN_AUTO) {
1484
if(unlikely(!d->st_errors)) {
1485
1486
d->st_errors = rrdset_create_localhost(
@@ -1531,11 +1519,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1519
rrdset_done(d->st_errors);
1520
}
1521
1534
- if(unlikely(d->do_drops == CONFIG_BOOLEAN_AUTO &&
1535
- (d->rdrops || d->tdrops || netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES)))
1536
- d->do_drops = CONFIG_BOOLEAN_YES;
1537
-
1538
- if(d->do_drops == CONFIG_BOOLEAN_YES) {
1522
+ if (d->do_drops == CONFIG_BOOLEAN_YES || d->do_drops == CONFIG_BOOLEAN_AUTO) {
1523
if(unlikely(!d->st_drops)) {
1524
1525
d->st_drops = rrdset_create_localhost(
@@ -1574,11 +1558,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1558
rrdset_done(d->st_drops);
1559
}
1560
1577
- if(unlikely(d->do_fifo == CONFIG_BOOLEAN_AUTO &&
1578
- (d->rfifo || d->tfifo || netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES)))
1579
- d->do_fifo = CONFIG_BOOLEAN_YES;
1580
-
1581
- if(d->do_fifo == CONFIG_BOOLEAN_YES) {
1561
+ if (d->do_fifo == CONFIG_BOOLEAN_YES || d->do_fifo == CONFIG_BOOLEAN_AUTO) {
1562
if(unlikely(!d->st_fifo)) {
1563
1564
d->st_fifo = rrdset_create_localhost(
@@ -1617,11 +1597,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1597
rrdset_done(d->st_fifo);
1598
}
1599
1620
- if(unlikely(d->do_compressed == CONFIG_BOOLEAN_AUTO &&
1621
- (d->rcompressed || d->tcompressed || netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES)))
1622
- d->do_compressed = CONFIG_BOOLEAN_YES;
1623
-
1624
- if(d->do_compressed == CONFIG_BOOLEAN_YES) {
1600
+ if (d->do_compressed == CONFIG_BOOLEAN_YES || d->do_compressed == CONFIG_BOOLEAN_AUTO) {
1601
if(unlikely(!d->st_compressed)) {
1602
1603
d->st_compressed = rrdset_create_localhost(
@@ -1660,11 +1636,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1636
rrdset_done(d->st_compressed);
1637
}
1638
1663
- if(unlikely(d->do_events == CONFIG_BOOLEAN_AUTO &&
1664
- (d->rframe || d->tcollisions || d->tcarrier || netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES)))
1665
- d->do_events = CONFIG_BOOLEAN_YES;
1666
-
1667
- if(d->do_events == CONFIG_BOOLEAN_YES) {
1639
+ if (d->do_events == CONFIG_BOOLEAN_YES || d->do_events == CONFIG_BOOLEAN_AUTO) {
1640
if(unlikely(!d->st_events)) {
1641
1642
d->st_events = rrdset_create_localhost(
@@ -1700,9 +1672,7 @@ int do_proc_net_dev(int update_every, usec_t dt) {
1672
d->function_ready = true;
1673
}
1674
1703
- if(do_bandwidth == CONFIG_BOOLEAN_YES || (do_bandwidth == CONFIG_BOOLEAN_AUTO &&
1704
- (system_rbytes || system_tbytes ||
1705
- netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
1675
+ if (do_bandwidth == CONFIG_BOOLEAN_YES || do_bandwidth == CONFIG_BOOLEAN_AUTO) {
1676
do_bandwidth = CONFIG_BOOLEAN_YES;
1677
static RRDSET *st_system_net = NULL;
1678
static RRDDIM *rd_in = NULL, *rd_out = NULL;