IPv4 and IPv6 charts are now by default created on demand, i.e. only when they have something to show
Costa Tsaousis (ktsaou) committed
Apr 3, 2016 at 13:47 UTC
292277aa30cf8b940e64e647fa2087dae5488887
2 files changed
+173
-56
src/proc_net_netstat.c
+18
-12
@@ -16,12 +16,12 @@ int do_proc_net_netstat(int update_every, unsigned long long dt) {
16
static int do_bandwidth = -1, do_inerrors = -1, do_mcast = -1, do_bcast = -1, do_mcast_p = -1, do_bcast_p = -1;
17
static procfile *ff = NULL;
18
19
- if(do_bandwidth == -1) do_bandwidth = config_get_boolean("plugin:proc:/proc/net/netstat", "bandwidth", 1);
20
- if(do_inerrors == -1) do_inerrors = config_get_boolean("plugin:proc:/proc/net/netstat", "input errors", 1);
21
- if(do_mcast == -1) do_mcast = config_get_boolean("plugin:proc:/proc/net/netstat", "multicast bandwidth", 1);
22
- if(do_bcast == -1) do_bcast = config_get_boolean("plugin:proc:/proc/net/netstat", "broadcast bandwidth", 1);
23
- if(do_mcast_p == -1) do_mcast_p = config_get_boolean("plugin:proc:/proc/net/netstat", "multicast packets", 1);
24
- if(do_bcast_p == -1) do_bcast_p = config_get_boolean("plugin:proc:/proc/net/netstat", "broadcast packets", 1);
19
+ if(do_bandwidth == -1) do_bandwidth = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "bandwidth", CONFIG_ONDEMAND_ONDEMAND);
20
+ if(do_inerrors == -1) do_inerrors = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "input errors", CONFIG_ONDEMAND_ONDEMAND);
21
+ if(do_mcast == -1) do_mcast = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "multicast bandwidth", CONFIG_ONDEMAND_ONDEMAND);
22
+ if(do_bcast == -1) do_bcast = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "broadcast bandwidth", CONFIG_ONDEMAND_ONDEMAND);
23
+ if(do_mcast_p == -1) do_mcast_p = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "multicast packets", CONFIG_ONDEMAND_ONDEMAND);
24
+ if(do_bcast_p == -1) do_bcast_p = config_get_boolean_ondemand("plugin:proc:/proc/net/netstat", "broadcast packets", CONFIG_ONDEMAND_ONDEMAND);
25
26
if(dt) {};
27
@@ -74,7 +74,8 @@ int do_proc_net_netstat(int update_every, unsigned long long dt) {
74
75
// --------------------------------------------------------------------
76
77
- if(do_bandwidth) {
77
+ if(do_bandwidth == CONFIG_ONDEMAND_YES || (do_bandwidth == CONFIG_ONDEMAND_ONDEMAND && (InOctets || OutOctets))) {
78
+ do_bandwidth = CONFIG_ONDEMAND_YES;
79
st = rrdset_find("system.ipv4");
80
if(!st) {
81
st = rrdset_create("system", "ipv4", NULL, "network", NULL, "IPv4 Bandwidth", "kilobits/s", 500, update_every, RRDSET_TYPE_AREA);
@@ -91,7 +92,8 @@ int do_proc_net_netstat(int update_every, unsigned long long dt) {
92
93
// --------------------------------------------------------------------
94
94
- if(do_inerrors) {
95
+ if(do_inerrors == CONFIG_ONDEMAND_YES || (do_inerrors == CONFIG_ONDEMAND_ONDEMAND && (InNoRoutes || InTruncatedPkts))) {
96
+ do_inerrors = CONFIG_ONDEMAND_YES;
97
st = rrdset_find("ipv4.inerrors");
98
if(!st) {
99
st = rrdset_create("ipv4", "inerrors", NULL, "errors", NULL, "IPv4 Input Errors", "packets/s", 4000, update_every, RRDSET_TYPE_LINE);
@@ -109,7 +111,8 @@ int do_proc_net_netstat(int update_every, unsigned long long dt) {
111
112
// --------------------------------------------------------------------
113
112
- if(do_mcast) {
114
+ if(do_mcast == CONFIG_ONDEMAND_YES || (do_mcast == CONFIG_ONDEMAND_ONDEMAND && (InMcastOctets || OutMcastOctets))) {
115
+ do_mcast = CONFIG_ONDEMAND_YES;
116
st = rrdset_find("ipv4.mcast");
117
if(!st) {
118
st = rrdset_create("ipv4", "mcast", NULL, "multicast", NULL, "IPv4 Multicast Bandwidth", "kilobits/s", 9000, update_every, RRDSET_TYPE_AREA);
@@ -127,7 +130,8 @@ int do_proc_net_netstat(int update_every, unsigned long long dt) {
130
131
// --------------------------------------------------------------------
132
130
- if(do_bcast) {
133
+ if(do_bcast == CONFIG_ONDEMAND_YES || (do_bcast == CONFIG_ONDEMAND_ONDEMAND && (InBcastOctets || OutBcastOctets))) {
134
+ do_bcast = CONFIG_ONDEMAND_YES;
135
st = rrdset_find("ipv4.bcast");
136
if(!st) {
137
st = rrdset_create("ipv4", "bcast", NULL, "broadcast", NULL, "IPv4 Broadcast Bandwidth", "kilobits/s", 8000, update_every, RRDSET_TYPE_AREA);
@@ -145,7 +149,8 @@ int do_proc_net_netstat(int update_every, unsigned long long dt) {
149
150
// --------------------------------------------------------------------
151
148
- if(do_mcast_p) {
152
+ if(do_mcast_p == CONFIG_ONDEMAND_YES || (do_mcast_p == CONFIG_ONDEMAND_ONDEMAND && (InMcastPkts || OutMcastPkts))) {
153
+ do_mcast_p = CONFIG_ONDEMAND_YES;
154
st = rrdset_find("ipv4.mcastpkts");
155
if(!st) {
156
st = rrdset_create("ipv4", "mcastpkts", NULL, "multicast", NULL, "IPv4 Multicast Packets", "packets/s", 9500, update_every, RRDSET_TYPE_LINE);
@@ -163,7 +168,8 @@ int do_proc_net_netstat(int update_every, unsigned long long dt) {
168
169
// --------------------------------------------------------------------
170
166
- if(do_bcast_p) {
171
+ if(do_bcast_p == CONFIG_ONDEMAND_YES || (do_bcast_p == CONFIG_ONDEMAND_ONDEMAND && (InBcastPkts || OutBcastPkts))) {
172
+ do_bcast_p = CONFIG_ONDEMAND_YES;
173
st = rrdset_find("ipv4.bcastpkts");
174
if(!st) {
175
st = rrdset_create("ipv4", "bcastpkts", NULL, "broadcast", NULL, "IPv4 Broadcast Packets", "packets/s", 8500, update_every, RRDSET_TYPE_LINE);
src/proc_net_snmp6.c
+155
-44
@@ -227,28 +227,28 @@ int do_proc_net_snmp6(int update_every, unsigned long long dt) {
227
hash_UdpLite6InCsumErrors = simple_hash("UdpLite6InCsumErrors");
228
}
229
230
- if(do_ip_packets == -1) do_ip_packets = config_get_boolean("plugin:proc:/proc/net/snmp6", "ipv6 packets", 1);
231
- if(do_ip_fragsout == -1) do_ip_fragsout = config_get_boolean("plugin:proc:/proc/net/snmp6", "ipv6 fragments sent", 1);
232
- if(do_ip_fragsin == -1) do_ip_fragsin = config_get_boolean("plugin:proc:/proc/net/snmp6", "ipv6 fragments assembly", 1);
233
- if(do_ip_errors == -1) do_ip_errors = config_get_boolean("plugin:proc:/proc/net/snmp6", "ipv6 errors", 1);
234
- if(do_udp_packets == -1) do_udp_packets = config_get_boolean("plugin:proc:/proc/net/snmp6", "ipv6 UDP packets", 1);
235
- if(do_udp_errors == -1) do_udp_errors = config_get_boolean("plugin:proc:/proc/net/snmp6", "ipv6 UDP errors", 1);
236
- if(do_udplite_packets == -1) do_udplite_packets = config_get_boolean("plugin:proc:/proc/net/snmp6", "ipv6 UDPlite packets", 1);
237
- if(do_udplite_errors == -1) do_udplite_errors = config_get_boolean("plugin:proc:/proc/net/snmp6", "ipv6 UDPlite errors", 1);
238
- if(do_bandwidth == -1) do_bandwidth = config_get_boolean("plugin:proc:/proc/net/snmp6", "bandwidth", 1);
239
- if(do_mcast == -1) do_mcast = config_get_boolean("plugin:proc:/proc/net/snmp6", "multicast bandwidth", 1);
240
- if(do_bcast == -1) do_bcast = config_get_boolean("plugin:proc:/proc/net/snmp6", "broadcast bandwidth", 1);
241
- if(do_mcast_p == -1) do_mcast_p = config_get_boolean("plugin:proc:/proc/net/snmp6", "multicast packets", 1);
242
- if(do_icmp == -1) do_icmp = config_get_boolean("plugin:proc:/proc/net/snmp6", "icmp", 1);
243
- if(do_icmp_redir == -1) do_icmp_redir = config_get_boolean("plugin:proc:/proc/net/snmp6", "icmp redirects", 1);
244
- if(do_icmp_errors == -1) do_icmp_errors = config_get_boolean("plugin:proc:/proc/net/snmp6", "icmp errors", 1);
245
- if(do_icmp_echos == -1) do_icmp_echos = config_get_boolean("plugin:proc:/proc/net/snmp6", "icmp echos", 1);
246
- if(do_icmp_groupmemb == -1) do_icmp_groupmemb = config_get_boolean("plugin:proc:/proc/net/snmp6", "icmp group membership", 1);
247
- if(do_icmp_router == -1) do_icmp_router = config_get_boolean("plugin:proc:/proc/net/snmp6", "icmp router", 1);
248
- if(do_icmp_neighbor == -1) do_icmp_neighbor = config_get_boolean("plugin:proc:/proc/net/snmp6", "icmp neighbor", 1);
249
- if(do_icmp_mldv2 == -1) do_icmp_mldv2 = config_get_boolean("plugin:proc:/proc/net/snmp6", "icmp mldv2", 1);
250
- if(do_icmp_types == -1) do_icmp_types = config_get_boolean("plugin:proc:/proc/net/snmp6", "icmp types", 1);
251
- if(do_ect == -1) do_ect = config_get_boolean("plugin:proc:/proc/net/snmp6", "ect", 1);
230
+ if(do_ip_packets == -1) do_ip_packets = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 packets", CONFIG_ONDEMAND_ONDEMAND);
231
+ if(do_ip_fragsout == -1) do_ip_fragsout = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 fragments sent", CONFIG_ONDEMAND_ONDEMAND);
232
+ if(do_ip_fragsin == -1) do_ip_fragsin = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 fragments assembly", CONFIG_ONDEMAND_ONDEMAND);
233
+ if(do_ip_errors == -1) do_ip_errors = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 errors", CONFIG_ONDEMAND_ONDEMAND);
234
+ if(do_udp_packets == -1) do_udp_packets = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 UDP packets", CONFIG_ONDEMAND_ONDEMAND);
235
+ if(do_udp_errors == -1) do_udp_errors = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 UDP errors", CONFIG_ONDEMAND_ONDEMAND);
236
+ if(do_udplite_packets == -1) do_udplite_packets = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 UDPlite packets", CONFIG_ONDEMAND_ONDEMAND);
237
+ if(do_udplite_errors == -1) do_udplite_errors = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ipv6 UDPlite errors", CONFIG_ONDEMAND_ONDEMAND);
238
+ if(do_bandwidth == -1) do_bandwidth = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "bandwidth", CONFIG_ONDEMAND_ONDEMAND);
239
+ if(do_mcast == -1) do_mcast = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "multicast bandwidth", CONFIG_ONDEMAND_ONDEMAND);
240
+ if(do_bcast == -1) do_bcast = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "broadcast bandwidth", CONFIG_ONDEMAND_ONDEMAND);
241
+ if(do_mcast_p == -1) do_mcast_p = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "multicast packets", CONFIG_ONDEMAND_ONDEMAND);
242
+ if(do_icmp == -1) do_icmp = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp", CONFIG_ONDEMAND_ONDEMAND);
243
+ if(do_icmp_redir == -1) do_icmp_redir = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp redirects", CONFIG_ONDEMAND_ONDEMAND);
244
+ if(do_icmp_errors == -1) do_icmp_errors = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp errors", CONFIG_ONDEMAND_ONDEMAND);
245
+ if(do_icmp_echos == -1) do_icmp_echos = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp echos", CONFIG_ONDEMAND_ONDEMAND);
246
+ if(do_icmp_groupmemb == -1) do_icmp_groupmemb = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp group membership", CONFIG_ONDEMAND_ONDEMAND);
247
+ if(do_icmp_router == -1) do_icmp_router = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp router", CONFIG_ONDEMAND_ONDEMAND);
248
+ if(do_icmp_neighbor == -1) do_icmp_neighbor = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp neighbor", CONFIG_ONDEMAND_ONDEMAND);
249
+ if(do_icmp_mldv2 == -1) do_icmp_mldv2 = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp mldv2", CONFIG_ONDEMAND_ONDEMAND);
250
+ if(do_icmp_types == -1) do_icmp_types = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "icmp types", CONFIG_ONDEMAND_ONDEMAND);
251
+ if(do_ect == -1) do_ect = config_get_boolean_ondemand("plugin:proc:/proc/net/snmp6", "ect", CONFIG_ONDEMAND_ONDEMAND);
252
253
if(dt) {};
254
@@ -470,7 +470,8 @@ int do_proc_net_snmp6(int update_every, unsigned long long dt) {
470
471
// --------------------------------------------------------------------
472
473
- if(do_bandwidth) {
473
+ if(do_bandwidth == CONFIG_ONDEMAND_YES || (do_bandwidth == CONFIG_ONDEMAND_ONDEMAND && (Ip6InOctets || Ip6OutOctets))) {
474
+ do_bandwidth = CONFIG_ONDEMAND_YES;
475
st = rrdset_find("system.ipv6");
476
if(!st) {
477
st = rrdset_create("system", "ipv6", NULL, "network", NULL, "IPv6 Bandwidth", "kilobits/s", 500, update_every, RRDSET_TYPE_AREA);
@@ -487,7 +488,8 @@ int do_proc_net_snmp6(int update_every, unsigned long long dt) {
488
489
// --------------------------------------------------------------------
490
490
- if(do_ip_packets) {
491
+ if(do_ip_packets == CONFIG_ONDEMAND_YES || (do_ip_packets == CONFIG_ONDEMAND_ONDEMAND && (Ip6InReceives || Ip6OutRequests || Ip6InDelivers || Ip6OutForwDatagrams))) {
492
+ do_ip_packets = CONFIG_ONDEMAND_YES;
493
st = rrdset_find(RRD_TYPE_NET_SNMP6 ".packets");
494
if(!st) {
495
st = rrdset_create(RRD_TYPE_NET_SNMP6, "packets", NULL, "packets", NULL, "IPv6 Packets", "packets/s", 3000, update_every, RRDSET_TYPE_LINE);
@@ -508,7 +510,8 @@ int do_proc_net_snmp6(int update_every, unsigned long long dt) {
510
511
// --------------------------------------------------------------------
512
511
- if(do_ip_fragsout) {
513
+ if(do_ip_fragsout == CONFIG_ONDEMAND_YES || (do_ip_fragsout == CONFIG_ONDEMAND_ONDEMAND && (Ip6FragOKs || Ip6FragFails || Ip6FragCreates))) {
514
+ do_ip_fragsout = CONFIG_ONDEMAND_YES;
515
st = rrdset_find(RRD_TYPE_NET_SNMP6 ".fragsout");
516
if(!st) {
517
st = rrdset_create(RRD_TYPE_NET_SNMP6, "fragsout", NULL, "fragments", NULL, "IPv6 Fragments Sent", "packets/s", 3010, update_every, RRDSET_TYPE_LINE);
@@ -528,7 +531,14 @@ int do_proc_net_snmp6(int update_every, unsigned long long dt) {
531
532
// --------------------------------------------------------------------
533
531
- if(do_ip_fragsin) {
534
+ if(do_ip_fragsin == CONFIG_ONDEMAND_YES || (do_ip_fragsin == CONFIG_ONDEMAND_ONDEMAND
535
+ && (
536
+ Ip6ReasmOKs
537
+ || Ip6ReasmFails
538
+ || Ip6ReasmTimeout
539
+ || Ip6ReasmReqds
540
+ ))) {
541
+ do_ip_fragsin = CONFIG_ONDEMAND_YES;
542
st = rrdset_find(RRD_TYPE_NET_SNMP6 ".fragsin");
543
if(!st) {
544
st = rrdset_create(RRD_TYPE_NET_SNMP6, "fragsin", NULL, "fragments", NULL, "IPv6 Fragments Reassembly", "packets/s", 3011, update_every, RRDSET_TYPE_LINE);
@@ -550,7 +560,18 @@ int do_proc_net_snmp6(int update_every, unsigned long long dt) {
560
561
// --------------------------------------------------------------------
562
553
- if(do_ip_errors) {
563
+ if(do_ip_errors == CONFIG_ONDEMAND_YES || (do_ip_errors == CONFIG_ONDEMAND_ONDEMAND
564
+ && (
565
+ Ip6InDiscards
566
+ || Ip6OutDiscards
567
+ || Ip6InHdrErrors
568
+ || Ip6InAddrErrors
569
+ || Ip6InUnknownProtos
570
+ || Ip6InTooBigErrors
571
+ || Ip6InTruncatedPkts
572
+ || Ip6InNoRoutes
573
+ ))) {
574
+ do_ip_errors = CONFIG_ONDEMAND_YES;
575
st = rrdset_find(RRD_TYPE_NET_SNMP6 ".errors");
576
if(!st) {
577
st = rrdset_create(RRD_TYPE_NET_SNMP6, "errors", NULL, "errors", NULL, "IPv6 Errors", "packets/s", 3002, update_every, RRDSET_TYPE_LINE);
@@ -586,7 +607,8 @@ int do_proc_net_snmp6(int update_every, unsigned long long dt) {
607
608
// --------------------------------------------------------------------
609
589
- if(do_udp_packets) {
610
+ if(do_udp_packets == CONFIG_ONDEMAND_YES || (do_udp_packets == CONFIG_ONDEMAND_ONDEMAND && (Udp6InDatagrams || Udp6OutDatagrams))) {
611
+ do_udp_packets = CONFIG_ONDEMAND_YES;
612
st = rrdset_find(RRD_TYPE_NET_SNMP6 ".udppackets");
613
if(!st) {
614
st = rrdset_create(RRD_TYPE_NET_SNMP6, "udppackets", NULL, "udp", NULL, "IPv6 UDP Packets", "packets/s", 3601, update_every, RRDSET_TYPE_LINE);
@@ -603,7 +625,16 @@ int do_proc_net_snmp6(int update_every, unsigned long long dt) {
625
626
// --------------------------------------------------------------------
627
606
- if(do_udp_errors) {
628
+ if(do_udp_errors == CONFIG_ONDEMAND_YES || (do_udp_errors == CONFIG_ONDEMAND_ONDEMAND
629
+ && (
630
+ Udp6InErrors
631
+ || Udp6NoPorts
632
+ || Udp6RcvbufErrors
633
+ || Udp6SndbufErrors
634
+ || Udp6InCsumErrors
635
+ || Udp6IgnoredMulti
636
+ ))) {
637
+ do_udp_errors = CONFIG_ONDEMAND_YES;
638
st = rrdset_find(RRD_TYPE_NET_SNMP6 ".udperrors");
639
if(!st) {
640
st = rrdset_create(RRD_TYPE_NET_SNMP6, "udperrors", NULL, "udp", NULL, "IPv6 UDP Errors", "events/s", 3701, update_every, RRDSET_TYPE_LINE);
@@ -629,7 +660,8 @@ int do_proc_net_snmp6(int update_every, unsigned long long dt) {
660
661
// --------------------------------------------------------------------
662
632
- if(do_udplite_packets) {
663
+ if(do_udplite_packets == CONFIG_ONDEMAND_YES || (do_udplite_packets == CONFIG_ONDEMAND_ONDEMAND && (UdpLite6InDatagrams || UdpLite6OutDatagrams))) {
664
+ do_udplite_packets = CONFIG_ONDEMAND_YES;
665
st = rrdset_find(RRD_TYPE_NET_SNMP6 ".udplitepackets");
666
if(!st) {
667
st = rrdset_create(RRD_TYPE_NET_SNMP6, "udplitepackets", NULL, "udplite", NULL, "IPv6 UDPlite Packets", "packets/s", 3601, update_every, RRDSET_TYPE_LINE);
@@ -646,7 +678,16 @@ int do_proc_net_snmp6(int update_every, unsigned long long dt) {
678
679
// --------------------------------------------------------------------
680
649
- if(do_udplite_errors) {
681
+ if(do_udplite_errors == CONFIG_ONDEMAND_YES || (do_udplite_errors == CONFIG_ONDEMAND_ONDEMAND
682
+ && (
683
+ UdpLite6InErrors
684
+ || UdpLite6NoPorts
685
+ || UdpLite6RcvbufErrors
686
+ || UdpLite6SndbufErrors
687
+ || Udp6InCsumErrors
688
+ || UdpLite6InCsumErrors
689
+ ))) {
690
+ do_udplite_errors = CONFIG_ONDEMAND_YES;
691
st = rrdset_find(RRD_TYPE_NET_SNMP6 ".udpliteerrors");
692
if(!st) {
693
st = rrdset_create(RRD_TYPE_NET_SNMP6, "udpliteerrors", NULL, "udplite", NULL, "IPv6 UDP Lite Errors", "events/s", 3701, update_every, RRDSET_TYPE_LINE);
@@ -670,7 +711,8 @@ int do_proc_net_snmp6(int update_every, unsigned long long dt) {
711
712
// --------------------------------------------------------------------
713
673
- if(do_mcast) {
714
+ if(do_mcast == CONFIG_ONDEMAND_YES || (do_mcast == CONFIG_ONDEMAND_ONDEMAND && (Ip6OutMcastOctets || Ip6InMcastOctets))) {
715
+ do_mcast = CONFIG_ONDEMAND_YES;
716
st = rrdset_find(RRD_TYPE_NET_SNMP6 ".mcast");
717
if(!st) {
718
st = rrdset_create(RRD_TYPE_NET_SNMP6, "mcast", NULL, "multicast", NULL, "IPv6 Multicast Bandwidth", "kilobits/s", 9000, update_every, RRDSET_TYPE_AREA);
@@ -688,7 +730,8 @@ int do_proc_net_snmp6(int update_every, unsigned long long dt) {
730
731
// --------------------------------------------------------------------
732
691
- if(do_bcast) {
733
+ if(do_bcast == CONFIG_ONDEMAND_YES || (do_bcast == CONFIG_ONDEMAND_ONDEMAND && (Ip6OutBcastOctets || Ip6InBcastOctets))) {
734
+ do_bcast = CONFIG_ONDEMAND_YES;
735
st = rrdset_find(RRD_TYPE_NET_SNMP6 ".bcast");
736
if(!st) {
737
st = rrdset_create(RRD_TYPE_NET_SNMP6, "bcast", NULL, "broadcast", NULL, "IPv6 Broadcast Bandwidth", "kilobits/s", 8000, update_every, RRDSET_TYPE_AREA);
@@ -706,7 +749,8 @@ int do_proc_net_snmp6(int update_every, unsigned long long dt) {
749
750
// --------------------------------------------------------------------
751
709
- if(do_mcast_p) {
752
+ if(do_mcast_p == CONFIG_ONDEMAND_YES || (do_mcast_p == CONFIG_ONDEMAND_ONDEMAND && (Ip6OutMcastPkts || Ip6InMcastPkts))) {
753
+ do_mcast_p = CONFIG_ONDEMAND_YES;
754
st = rrdset_find(RRD_TYPE_NET_SNMP6 ".mcastpkts");
755
if(!st) {
756
st = rrdset_create(RRD_TYPE_NET_SNMP6, "mcastpkts", NULL, "multicast", NULL, "IPv6 Multicast Packets", "packets/s", 9500, update_every, RRDSET_TYPE_LINE);
@@ -724,7 +768,8 @@ int do_proc_net_snmp6(int update_every, unsigned long long dt) {
768
769
// --------------------------------------------------------------------
770
727
- if(do_icmp) {
771
+ if(do_icmp == CONFIG_ONDEMAND_YES || (do_icmp == CONFIG_ONDEMAND_ONDEMAND && (Icmp6InMsgs || Icmp6OutMsgs))) {
772
+ do_icmp = CONFIG_ONDEMAND_YES;
773
st = rrdset_find(RRD_TYPE_NET_SNMP6 ".icmp");
774
if(!st) {
775
st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmp", NULL, "icmp", NULL, "IPv6 ICMP Messages", "messages/s", 10000, update_every, RRDSET_TYPE_LINE);
@@ -741,7 +786,8 @@ int do_proc_net_snmp6(int update_every, unsigned long long dt) {
786
787
// --------------------------------------------------------------------
788
744
- if(do_icmp_redir) {
789
+ if(do_icmp_redir == CONFIG_ONDEMAND_YES || (do_icmp_redir == CONFIG_ONDEMAND_ONDEMAND && (Icmp6InRedirects || Icmp6OutRedirects))) {
790
+ do_icmp_redir = CONFIG_ONDEMAND_YES;
791
st = rrdset_find(RRD_TYPE_NET_SNMP6 ".icmpredir");
792
if(!st) {
793
st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmpredir", NULL, "icmp", NULL, "IPv6 ICMP Redirects", "redirects/s", 10050, update_every, RRDSET_TYPE_LINE);
@@ -758,7 +804,21 @@ int do_proc_net_snmp6(int update_every, unsigned long long dt) {
804
805
// --------------------------------------------------------------------
806
761
- if(do_icmp_errors) {
807
+ if(do_icmp_errors == CONFIG_ONDEMAND_YES || (do_icmp_errors == CONFIG_ONDEMAND_ONDEMAND
808
+ && (
809
+ Icmp6InErrors
810
+ || Icmp6OutErrors
811
+ || Icmp6InCsumErrors
812
+ || Icmp6InDestUnreachs
813
+ || Icmp6InPktTooBigs
814
+ || Icmp6InTimeExcds
815
+ || Icmp6InParmProblems
816
+ || Icmp6OutDestUnreachs
817
+ || Icmp6OutPktTooBigs
818
+ || Icmp6OutTimeExcds
819
+ || Icmp6OutParmProblems
820
+ ))) {
821
+ do_icmp_errors = CONFIG_ONDEMAND_YES;
822
st = rrdset_find(RRD_TYPE_NET_SNMP6 ".icmperrors");
823
if(!st) {
824
st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmperrors", NULL, "icmp", NULL, "IPv6 ICMP Errors", "errors/s", 10100, update_every, RRDSET_TYPE_LINE);
@@ -794,7 +854,14 @@ int do_proc_net_snmp6(int update_every, unsigned long long dt) {
854
855
// --------------------------------------------------------------------
856
797
- if(do_icmp_echos) {
857
+ if(do_icmp_echos == CONFIG_ONDEMAND_YES || (do_icmp_echos == CONFIG_ONDEMAND_ONDEMAND
858
+ && (
859
+ Icmp6InEchos
860
+ || Icmp6OutEchos
861
+ || Icmp6InEchoReplies
862
+ || Icmp6OutEchoReplies
863
+ ))) {
864
+ do_icmp_echos = CONFIG_ONDEMAND_YES;
865
st = rrdset_find(RRD_TYPE_NET_SNMP6 ".icmpechos");
866
if(!st) {
867
st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmpechos", NULL, "icmp", NULL, "IPv6 ICMP Echo", "messages/s", 10200, update_every, RRDSET_TYPE_LINE);
@@ -815,7 +882,16 @@ int do_proc_net_snmp6(int update_every, unsigned long long dt) {
882
883
// --------------------------------------------------------------------
884
818
- if(do_icmp_groupmemb) {
885
+ if(do_icmp_groupmemb == CONFIG_ONDEMAND_YES || (do_icmp_groupmemb == CONFIG_ONDEMAND_ONDEMAND
886
+ && (
887
+ Icmp6InGroupMembQueries
888
+ || Icmp6OutGroupMembQueries
889
+ || Icmp6InGroupMembResponses
890
+ || Icmp6OutGroupMembResponses
891
+ || Icmp6InGroupMembReductions
892
+ || Icmp6OutGroupMembReductions
893
+ ))) {
894
+ do_icmp_groupmemb = CONFIG_ONDEMAND_YES;
895
st = rrdset_find(RRD_TYPE_NET_SNMP6 ".groupmemb");
896
if(!st) {
897
st = rrdset_create(RRD_TYPE_NET_SNMP6, "groupmemb", NULL, "icmp", NULL, "IPv6 ICMP Group Membership", "messages/s", 10300, update_every, RRDSET_TYPE_LINE);
@@ -840,7 +916,14 @@ int do_proc_net_snmp6(int update_every, unsigned long long dt) {
916
917
// --------------------------------------------------------------------
918
843
- if(do_icmp_router) {
919
+ if(do_icmp_router == CONFIG_ONDEMAND_YES || (do_icmp_router == CONFIG_ONDEMAND_ONDEMAND
920
+ && (
921
+ Icmp6InRouterSolicits
922
+ || Icmp6OutRouterSolicits
923
+ || Icmp6InRouterAdvertisements
924
+ || Icmp6OutRouterAdvertisements
925
+ ))) {
926
+ do_icmp_router = CONFIG_ONDEMAND_YES;
927
st = rrdset_find(RRD_TYPE_NET_SNMP6 ".icmprouter");
928
if(!st) {
929
st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmprouter", NULL, "icmp", NULL, "IPv6 Router Messages", "messages/s", 10400, update_every, RRDSET_TYPE_LINE);
@@ -861,7 +944,14 @@ int do_proc_net_snmp6(int update_every, unsigned long long dt) {
944
945
// --------------------------------------------------------------------
946
864
- if(do_icmp_neighbor) {
947
+ if(do_icmp_neighbor == CONFIG_ONDEMAND_YES || (do_icmp_neighbor == CONFIG_ONDEMAND_ONDEMAND
948
+ && (
949
+ Icmp6InNeighborSolicits
950
+ || Icmp6OutNeighborSolicits
951
+ || Icmp6InNeighborAdvertisements
952
+ || Icmp6OutNeighborAdvertisements
953
+ ))) {
954
+ do_icmp_neighbor = CONFIG_ONDEMAND_YES;
955
st = rrdset_find(RRD_TYPE_NET_SNMP6 ".icmpneighbor");
956
if(!st) {
957
st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmpneighbor", NULL, "icmp", NULL, "IPv6 Neighbor Messages", "messages/s", 10500, update_every, RRDSET_TYPE_LINE);
@@ -882,7 +972,8 @@ int do_proc_net_snmp6(int update_every, unsigned long long dt) {
972
973
// --------------------------------------------------------------------
974
885
- if(do_icmp_mldv2) {
975
+ if(do_icmp_mldv2 == CONFIG_ONDEMAND_YES || (do_icmp_mldv2 == CONFIG_ONDEMAND_ONDEMAND && (Icmp6InMLDv2Reports || Icmp6OutMLDv2Reports))) {
976
+ do_icmp_mldv2 = CONFIG_ONDEMAND_YES;
977
st = rrdset_find(RRD_TYPE_NET_SNMP6 ".icmpmldv2");
978
if(!st) {
979
st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmpmldv2", NULL, "icmp", NULL, "IPv6 ICMP MLDv2 Reports", "reports/s", 10600, update_every, RRDSET_TYPE_LINE);
@@ -899,7 +990,20 @@ int do_proc_net_snmp6(int update_every, unsigned long long dt) {
990
991
// --------------------------------------------------------------------
992
902
- if(do_icmp_types) {
993
+ if(do_icmp_types == CONFIG_ONDEMAND_YES || (do_icmp_types == CONFIG_ONDEMAND_ONDEMAND
994
+ && (
995
+ Icmp6InType1
996
+ || Icmp6InType128
997
+ || Icmp6InType129
998
+ || Icmp6InType136
999
+ || Icmp6OutType1
1000
+ || Icmp6OutType128
1001
+ || Icmp6OutType129
1002
+ || Icmp6OutType133
1003
+ || Icmp6OutType135
1004
+ || Icmp6OutType143
1005
+ ))) {
1006
+ do_icmp_types = CONFIG_ONDEMAND_YES;
1007
st = rrdset_find(RRD_TYPE_NET_SNMP6 ".icmptypes");
1008
if(!st) {
1009
st = rrdset_create(RRD_TYPE_NET_SNMP6, "icmptypes", NULL, "icmp", NULL, "IPv6 ICMP Types", "messages/s", 10700, update_every, RRDSET_TYPE_LINE);
@@ -932,7 +1036,14 @@ int do_proc_net_snmp6(int update_every, unsigned long long dt) {
1036
1037
// --------------------------------------------------------------------
1038
935
- if(do_ect) {
1039
+ if(do_ect == CONFIG_ONDEMAND_YES || (do_ect == CONFIG_ONDEMAND_ONDEMAND
1040
+ && (
1041
+ Ip6InNoECTPkts
1042
+ || Ip6InECT1Pkts
1043
+ || Ip6InECT0Pkts
1044
+ || Ip6InCEPkts
1045
+ ))) {
1046
+ do_ect = CONFIG_ONDEMAND_YES;
1047
st = rrdset_find(RRD_TYPE_NET_SNMP6 ".ect");
1048
if(!st) {
1049
st = rrdset_create(RRD_TYPE_NET_SNMP6, "ect", NULL, "packets", NULL, "IPv6 ECT Packets", "packets/s", 10800, update_every, RRDSET_TYPE_LINE);