summaryrefslogtreecommitdiffstats
path: root/src/collectors/freebsd.plugin/freebsd_sysctl.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/collectors/freebsd.plugin/freebsd_sysctl.c')
-rw-r--r--src/collectors/freebsd.plugin/freebsd_sysctl.c128
1 files changed, 16 insertions, 112 deletions
diff --git a/src/collectors/freebsd.plugin/freebsd_sysctl.c b/src/collectors/freebsd.plugin/freebsd_sysctl.c
index 8a6df509d3..93ec98dc8e 100644
--- a/src/collectors/freebsd.plugin/freebsd_sysctl.c
+++ b/src/collectors/freebsd.plugin/freebsd_sysctl.c
@@ -1847,13 +1847,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
rrdset_done(st);
}
- if (do_tcpext_connaborts == CONFIG_BOOLEAN_YES || (do_tcpext_connaborts == CONFIG_BOOLEAN_AUTO &&
- (tcpstat.tcps_rcvpackafterwin ||
- tcpstat.tcps_rcvafterclose ||
- tcpstat.tcps_rcvmemdrop ||
- tcpstat.tcps_persistdrop ||
- tcpstat.tcps_finwait2_drops ||
- netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
+ if (do_tcpext_connaborts == CONFIG_BOOLEAN_YES || do_tcpext_connaborts == CONFIG_BOOLEAN_AUTO) {
do_tcpext_connaborts = CONFIG_BOOLEAN_YES;
static RRDSET *st = NULL;
@@ -1891,9 +1885,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
rrdset_done(st);
}
- if (do_tcpext_ofo == CONFIG_BOOLEAN_YES || (do_tcpext_ofo == CONFIG_BOOLEAN_AUTO &&
- (tcpstat.tcps_rcvoopack ||
- netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
+ if (do_tcpext_ofo == CONFIG_BOOLEAN_YES || do_tcpext_ofo == CONFIG_BOOLEAN_AUTO) {
do_tcpext_ofo = CONFIG_BOOLEAN_YES;
static RRDSET *st = NULL;
@@ -1922,11 +1914,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
rrdset_done(st);
}
- if (do_tcpext_syncookies == CONFIG_BOOLEAN_YES || (do_tcpext_syncookies == CONFIG_BOOLEAN_AUTO &&
- (tcpstat.tcps_sc_sendcookie ||
- tcpstat.tcps_sc_recvcookie ||
- tcpstat.tcps_sc_zonefail ||
- netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
+ if (do_tcpext_syncookies == CONFIG_BOOLEAN_YES || do_tcpext_syncookies == CONFIG_BOOLEAN_AUTO) {
do_tcpext_syncookies = CONFIG_BOOLEAN_YES;
static RRDSET *st = NULL;
@@ -1959,9 +1947,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
rrdset_done(st);
}
- if(do_tcpext_listen == CONFIG_BOOLEAN_YES || (do_tcpext_listen == CONFIG_BOOLEAN_AUTO &&
- (tcpstat.tcps_listendrop ||
- netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
+ if (do_tcpext_listen == CONFIG_BOOLEAN_YES || do_tcpext_listen == CONFIG_BOOLEAN_AUTO) {
do_tcpext_listen = CONFIG_BOOLEAN_YES;
static RRDSET *st_listen = NULL;
@@ -1991,21 +1977,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
rrdset_done(st_listen);
}
- if (do_ecn == CONFIG_BOOLEAN_YES || ( do_ecn == CONFIG_BOOLEAN_AUTO &&
- ( netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES ||
-#if __FreeBSD_version < 1400074
-// See https://github.com/freebsd/freebsd-src/commit/1a70101a870015304d5b2446b480d8677d8aad36
- tcpstat.tcps_ecn_ce ||
- tcpstat.tcps_ecn_ect0 ||
- tcpstat.tcps_ecn_ect1
-#else
- tcpstat.tcps_ecn_rcvce ||
- tcpstat.tcps_ecn_rcvect0 ||
- tcpstat.tcps_ecn_rcvect1 ||
- tcpstat.tcps_ecn_sndect0 ||
- tcpstat.tcps_ecn_sndect1
-#endif
- ))) {
+ if (do_ecn == CONFIG_BOOLEAN_YES || do_ecn == CONFIG_BOOLEAN_AUTO) {
do_ecn = CONFIG_BOOLEAN_YES;
static RRDSET *st = NULL;
@@ -2527,12 +2499,7 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
collector_error("DISABLED: net.inet6.ip6.stats module");
return 1;
} else {
- if (do_ip6_packets == CONFIG_BOOLEAN_YES || (do_ip6_packets == CONFIG_BOOLEAN_AUTO &&
- (ip6stat.ip6s_localout ||
- ip6stat.ip6s_total ||
- ip6stat.ip6s_forward ||
- ip6stat.ip6s_delivered ||
- netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
+ if (do_ip6_packets == CONFIG_BOOLEAN_YES || do_ip6_packets == CONFIG_BOOLEAN_AUTO) {
do_ip6_packets = CONFIG_BOOLEAN_YES;
static RRDSET *st = NULL;
@@ -2567,11 +2534,7 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
rrdset_done(st);
}
- if (do_ip6_fragsout == CONFIG_BOOLEAN_YES || (do_ip6_fragsout == CONFIG_BOOLEAN_AUTO &&
- (ip6stat.ip6s_fragmented ||
- ip6stat.ip6s_cantfrag ||
- ip6stat.ip6s_ofragments ||
- netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
+ if (do_ip6_fragsout == CONFIG_BOOLEAN_YES || do_ip6_fragsout == CONFIG_BOOLEAN_AUTO) {
do_ip6_fragsout = CONFIG_BOOLEAN_YES;
static RRDSET *st = NULL;
@@ -2606,12 +2569,7 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
rrdset_done(st);
}
- if (do_ip6_fragsin == CONFIG_BOOLEAN_YES || (do_ip6_fragsin == CONFIG_BOOLEAN_AUTO &&
- (ip6stat.ip6s_reassembled ||
- ip6stat.ip6s_fragdropped ||
- ip6stat.ip6s_fragtimeout ||
- ip6stat.ip6s_fragments ||
- netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
+ if (do_ip6_fragsin == CONFIG_BOOLEAN_YES || do_ip6_fragsin == CONFIG_BOOLEAN_AUTO) {
do_ip6_fragsin = CONFIG_BOOLEAN_YES;
static RRDSET *st = NULL;
@@ -2648,17 +2606,7 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
rrdset_done(st);
}
- if (do_ip6_errors == CONFIG_BOOLEAN_YES || (do_ip6_errors == CONFIG_BOOLEAN_AUTO &&
- (ip6stat.ip6s_toosmall ||
- ip6stat.ip6s_odropped ||
- ip6stat.ip6s_badoptions ||
- ip6stat.ip6s_badvers ||
- ip6stat.ip6s_exthdrtoolong ||
- ip6stat.ip6s_sources_none ||
- ip6stat.ip6s_tooshort ||
- ip6stat.ip6s_cantforward ||
- ip6stat.ip6s_noroute ||
- netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
+ if (do_ip6_errors == CONFIG_BOOLEAN_YES || do_ip6_errors == CONFIG_BOOLEAN_AUTO) {
do_ip6_errors = CONFIG_BOOLEAN_YES;
static RRDSET *st = NULL;
@@ -2772,10 +2720,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
// --------------------------------------------------------------------
- if (do_icmp6 == CONFIG_BOOLEAN_YES || (do_icmp6 == CONFIG_BOOLEAN_AUTO &&
- (icmp6_total.msgs_in ||
- icmp6_total.msgs_out ||
- netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
+ if (do_icmp6 == CONFIG_BOOLEAN_YES || do_icmp6 == CONFIG_BOOLEAN_AUTO) {
do_icmp6 = CONFIG_BOOLEAN_YES;
static RRDSET *st = NULL;
@@ -2806,10 +2751,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
rrdset_done(st);
}
- if (do_icmp6_redir == CONFIG_BOOLEAN_YES || (do_icmp6_redir == CONFIG_BOOLEAN_AUTO &&
- (icmp6stat.icp6s_inhist[ND_REDIRECT] ||
- icmp6stat.icp6s_outhist[ND_REDIRECT] ||
- netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
+ if (do_icmp6_redir == CONFIG_BOOLEAN_YES || do_icmp6_redir == CONFIG_BOOLEAN_AUTO) {
do_icmp6_redir = CONFIG_BOOLEAN_YES;
static RRDSET *st = NULL;
@@ -2840,19 +2782,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
rrdset_done(st);
}
- if (do_icmp6_errors == CONFIG_BOOLEAN_YES || (do_icmp6_errors == CONFIG_BOOLEAN_AUTO &&
- (icmp6stat.icp6s_badcode ||
- icmp6stat.icp6s_badlen ||
- icmp6stat.icp6s_checksum ||
- icmp6stat.icp6s_tooshort ||
- icmp6stat.icp6s_error ||
- icmp6stat.icp6s_inhist[ICMP6_DST_UNREACH] ||
- icmp6stat.icp6s_inhist[ICMP6_TIME_EXCEEDED] ||
- icmp6stat.icp6s_inhist[ICMP6_PARAM_PROB] ||
- icmp6stat.icp6s_outhist[ICMP6_DST_UNREACH] ||
- icmp6stat.icp6s_outhist[ICMP6_TIME_EXCEEDED] ||
- icmp6stat.icp6s_outhist[ICMP6_PARAM_PROB] ||
- netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
+ if (do_icmp6_errors == CONFIG_BOOLEAN_YES || do_icmp6_errors == CONFIG_BOOLEAN_AUTO) {
do_icmp6_errors = CONFIG_BOOLEAN_YES;
static RRDSET *st = NULL;
@@ -2902,12 +2832,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
rrdset_done(st);
}
- if (do_icmp6_echos == CONFIG_BOOLEAN_YES || (do_icmp6_echos == CONFIG_BOOLEAN_AUTO &&
- (icmp6stat.icp6s_inhist[ICMP6_ECHO_REQUEST] ||
- icmp6stat.icp6s_outhist[ICMP6_ECHO_REQUEST] ||
- icmp6stat.icp6s_inhist[ICMP6_ECHO_REPLY] ||
- icmp6stat.icp6s_outhist[ICMP6_ECHO_REPLY] ||
- netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
+ if (do_icmp6_echos == CONFIG_BOOLEAN_YES || do_icmp6_echos == CONFIG_BOOLEAN_AUTO) {
do_icmp6_echos = CONFIG_BOOLEAN_YES;
static RRDSET *st = NULL;
@@ -2942,12 +2867,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
rrdset_done(st);
}
- if (do_icmp6_router == CONFIG_BOOLEAN_YES || (do_icmp6_router == CONFIG_BOOLEAN_AUTO &&
- (icmp6stat.icp6s_inhist[ND_ROUTER_SOLICIT] ||
- icmp6stat.icp6s_outhist[ND_ROUTER_SOLICIT] ||
- icmp6stat.icp6s_inhist[ND_ROUTER_ADVERT] ||
- icmp6stat.icp6s_outhist[ND_ROUTER_ADVERT] ||
- netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
+ if (do_icmp6_router == CONFIG_BOOLEAN_YES || do_icmp6_router == CONFIG_BOOLEAN_AUTO) {
do_icmp6_router = CONFIG_BOOLEAN_YES;
static RRDSET *st = NULL;
@@ -2983,12 +2903,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
rrdset_done(st);
}
- if (do_icmp6_neighbor == CONFIG_BOOLEAN_YES || (do_icmp6_neighbor == CONFIG_BOOLEAN_AUTO &&
- (icmp6stat.icp6s_inhist[ND_NEIGHBOR_SOLICIT] ||
- icmp6stat.icp6s_outhist[ND_NEIGHBOR_SOLICIT] ||
- icmp6stat.icp6s_inhist[ND_NEIGHBOR_ADVERT] ||
- icmp6stat.icp6s_outhist[ND_NEIGHBOR_ADVERT] ||
- netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
+ if (do_icmp6_neighbor == CONFIG_BOOLEAN_YES || do_icmp6_neighbor == CONFIG_BOOLEAN_AUTO) {
do_icmp6_neighbor = CONFIG_BOOLEAN_YES;
static RRDSET *st = NULL;
@@ -3024,18 +2939,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
rrdset_done(st);
}
- if (do_icmp6_types == CONFIG_BOOLEAN_YES || (do_icmp6_types == CONFIG_BOOLEAN_AUTO &&
- (icmp6stat.icp6s_inhist[1] ||
- icmp6stat.icp6s_inhist[128] ||
- icmp6stat.icp6s_inhist[129] ||
- icmp6stat.icp6s_inhist[136] ||
- icmp6stat.icp6s_outhist[1] ||
- icmp6stat.icp6s_outhist[128] ||
- icmp6stat.icp6s_outhist[129] ||
- icmp6stat.icp6s_outhist[133] ||
- icmp6stat.icp6s_outhist[135] ||
- icmp6stat.icp6s_outhist[136] ||
- netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
+ if (do_icmp6_types == CONFIG_BOOLEAN_YES || do_icmp6_types == CONFIG_BOOLEAN_AUTO) {
do_icmp6_types = CONFIG_BOOLEAN_YES;
static RRDSET *st = NULL;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 02:52:46 +0000