|
@@ -1941,7 +1941,13 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
|
|
|
|
|
|
// --------------------------------------------------------------------
|
|
|
|
|
|
- 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))) {
|
|
|
+ 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))) {
|
|
|
do_tcpext_connaborts = CONFIG_BOOLEAN_YES;
|
|
|
|
|
|
static RRDSET *st = NULL;
|
|
@@ -1982,7 +1988,9 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
|
|
|
|
|
|
// --------------------------------------------------------------------
|
|
|
|
|
|
- if (do_tcpext_ofo == CONFIG_BOOLEAN_YES || (do_tcpext_ofo == CONFIG_BOOLEAN_AUTO && tcpstat.tcps_rcvoopack)) {
|
|
|
+ if (do_tcpext_ofo == CONFIG_BOOLEAN_YES || (do_tcpext_ofo == CONFIG_BOOLEAN_AUTO &&
|
|
|
+ (tcpstat.tcps_rcvoopack ||
|
|
|
+ netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
|
|
|
do_tcpext_ofo = CONFIG_BOOLEAN_YES;
|
|
|
|
|
|
static RRDSET *st = NULL;
|
|
@@ -2014,7 +2022,11 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
|
|
|
|
|
|
// --------------------------------------------------------------------
|
|
|
|
|
|
- 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))) {
|
|
|
+ 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))) {
|
|
|
do_tcpext_syncookies = CONFIG_BOOLEAN_YES;
|
|
|
|
|
|
static RRDSET *st = NULL;
|
|
@@ -2050,7 +2062,9 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
|
|
|
|
|
|
// --------------------------------------------------------------------
|
|
|
|
|
|
- if(do_tcpext_listen == CONFIG_BOOLEAN_YES || (do_tcpext_listen == CONFIG_BOOLEAN_AUTO && tcpstat.tcps_listendrop)) {
|
|
|
+ if(do_tcpext_listen == CONFIG_BOOLEAN_YES || (do_tcpext_listen == CONFIG_BOOLEAN_AUTO &&
|
|
|
+ (tcpstat.tcps_listendrop ||
|
|
|
+ netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
|
|
|
do_tcpext_listen = CONFIG_BOOLEAN_YES;
|
|
|
|
|
|
static RRDSET *st_listen = NULL;
|
|
@@ -2085,7 +2099,11 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
|
|
|
|
|
|
// --------------------------------------------------------------------
|
|
|
|
|
|
- if (do_ecn == CONFIG_BOOLEAN_YES || (do_ecn == CONFIG_BOOLEAN_AUTO && (tcpstat.tcps_ecn_ce || tcpstat.tcps_ecn_ect0 || tcpstat.tcps_ecn_ect1))) {
|
|
|
+ if (do_ecn == CONFIG_BOOLEAN_YES || (do_ecn == CONFIG_BOOLEAN_AUTO &&
|
|
|
+ (tcpstat.tcps_ecn_ce ||
|
|
|
+ tcpstat.tcps_ecn_ect0 ||
|
|
|
+ tcpstat.tcps_ecn_ect1 ||
|
|
|
+ netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
|
|
|
do_ecn = CONFIG_BOOLEAN_YES;
|
|
|
|
|
|
static RRDSET *st = NULL;
|
|
@@ -2626,8 +2644,11 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
|
|
|
// --------------------------------------------------------------------
|
|
|
|
|
|
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))) {
|
|
|
+ (ip6stat.ip6s_localout ||
|
|
|
+ ip6stat.ip6s_total ||
|
|
|
+ ip6stat.ip6s_forward ||
|
|
|
+ ip6stat.ip6s_delivered ||
|
|
|
+ netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
|
|
|
do_ip6_packets = CONFIG_BOOLEAN_YES;
|
|
|
|
|
|
static RRDSET *st = NULL;
|
|
@@ -2666,8 +2687,10 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
|
|
|
// --------------------------------------------------------------------
|
|
|
|
|
|
if (do_ip6_fragsout == CONFIG_BOOLEAN_YES || (do_ip6_fragsout == CONFIG_BOOLEAN_AUTO &&
|
|
|
- (ip6stat.ip6s_fragmented || ip6stat.ip6s_cantfrag ||
|
|
|
- ip6stat.ip6s_ofragments))) {
|
|
|
+ (ip6stat.ip6s_fragmented ||
|
|
|
+ ip6stat.ip6s_cantfrag ||
|
|
|
+ ip6stat.ip6s_ofragments ||
|
|
|
+ netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
|
|
|
do_ip6_fragsout = CONFIG_BOOLEAN_YES;
|
|
|
|
|
|
static RRDSET *st = NULL;
|
|
@@ -2706,8 +2729,11 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
|
|
|
// --------------------------------------------------------------------
|
|
|
|
|
|
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))) {
|
|
|
+ (ip6stat.ip6s_reassembled ||
|
|
|
+ ip6stat.ip6s_fragdropped ||
|
|
|
+ ip6stat.ip6s_fragtimeout ||
|
|
|
+ ip6stat.ip6s_fragments ||
|
|
|
+ netdata_zero_metrics_enabled == CONFIG_BOOLEAN_YES))) {
|
|
|
do_ip6_fragsin = CONFIG_BOOLEAN_YES;
|
|
|
|
|
|
static RRDSET *st = NULL;
|
|
@@ -2747,16 +2773,17 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
|
|
|
|
|
|
// --------------------------------------------------------------------
|
|
|
|
|
|
- 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))) {
|
|
|
+ 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))) {
|
|
|
do_ip6_errors = CONFIG_BOOLEAN_YES;
|
|
|
|
|
|
static RRDSET *st = NULL;
|
|
@@ -2872,7 +2899,10 @@ 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))) {
|
|
|
+ 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))) {
|
|
|
do_icmp6 = CONFIG_BOOLEAN_YES;
|
|
|
|
|
|
static RRDSET *st = NULL;
|
|
@@ -2907,7 +2937,10 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
|
|
|
|
|
|
// --------------------------------------------------------------------
|
|
|
|
|
|
- if (do_icmp6_redir == CONFIG_BOOLEAN_YES || (do_icmp6_redir == CONFIG_BOOLEAN_AUTO && (icmp6stat.icp6s_inhist[ND_REDIRECT] || icmp6stat.icp6s_outhist[ND_REDIRECT]))) {
|
|
|
+ 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))) {
|
|
|
do_icmp6_redir = CONFIG_BOOLEAN_YES;
|
|
|
|
|
|
static RRDSET *st = NULL;
|
|
@@ -2941,18 +2974,19 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
|
|
|
|
|
|
// --------------------------------------------------------------------
|
|
|
|
|
|
- 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]))) {
|
|
|
+ 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))) {
|
|
|
do_icmp6_errors = CONFIG_BOOLEAN_YES;
|
|
|
|
|
|
static RRDSET *st = NULL;
|
|
@@ -3005,11 +3039,12 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
|
|
|
|
|
|
// --------------------------------------------------------------------
|
|
|
|
|
|
- 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]))) {
|
|
|
+ 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))) {
|
|
|
do_icmp6_echos = CONFIG_BOOLEAN_YES;
|
|
|
|
|
|
static RRDSET *st = NULL;
|
|
@@ -3047,11 +3082,12 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
|
|
|
|
|
|
// --------------------------------------------------------------------
|
|
|
|
|
|
- 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]))) {
|
|
|
+ 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))) {
|
|
|
do_icmp6_router = CONFIG_BOOLEAN_YES;
|
|
|
|
|
|
static RRDSET *st = NULL;
|
|
@@ -3090,11 +3126,12 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
|
|
|
|
|
|
// --------------------------------------------------------------------
|
|
|
|
|
|
- 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]))) {
|
|
|
+ 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))) {
|
|
|
do_icmp6_neighbor = CONFIG_BOOLEAN_YES;
|
|
|
|
|
|
static RRDSET *st = NULL;
|
|
@@ -3133,17 +3170,18 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
|
|
|
|
|
|
// --------------------------------------------------------------------
|
|
|
|
|
|
- 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]))) {
|
|
|
+ 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))) {
|
|
|
do_icmp6_types = CONFIG_BOOLEAN_YES;
|
|
|
|
|
|
static RRDSET *st = NULL;
|