Rename config sections for modules

diff --git a/src/freebsd_sysctl.c b/src/freebsd_sysctl.c
index 90837bdbc1b82b406cc4c86f9d2601d3e593f824..c4cd57746a15b5f9f38eb4648562c64aeca16aa3 100644 (file)
--- a/src/freebsd_sysctl.c
+++ b/src/freebsd_sysctl.c
@@ -1229,8 +1229,8 @@ int do_net_isr(int update_every, usec_t dt) {
     static int do_netisr = -1, do_netisr_per_core = -1;
 
     if (unlikely(do_netisr == -1)) {
-        do_netisr =          config_get_boolean("plugin:freebsd:sysctl", "netisr",          1);
-        do_netisr_per_core = config_get_boolean("plugin:freebsd:sysctl", "netisr per core", 1);
+        do_netisr =          config_get_boolean("plugin:freebsd:net.isr", "netisr",          1);
+        do_netisr_per_core = config_get_boolean("plugin:freebsd:net.isr", "netisr per core", 1);
     }
 
     static int mib_workstream[3] = {0, 0, 0}, mib_work[3] = {0, 0, 0};
@@ -1439,16 +1439,16 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
     static int do_tcp_packets = -1, do_tcp_errors = -1, do_tcp_handshake = -1, do_tcpext_connaborts = -1, do_tcpext_ofo = -1, do_tcpext_syncookies = -1, do_ecn = -1;
 
     if (unlikely(do_tcp_packets == -1)) {
-        do_tcp_packets       = config_get_boolean("plugin:freebsd:sysctl", "ipv4 TCP packets",          1);
-        do_tcp_errors        = config_get_boolean("plugin:freebsd:sysctl", "ipv4 TCP errors",           1);
-        do_tcp_handshake     = config_get_boolean("plugin:freebsd:sysctl", "ipv4 TCP handshake issues", 1);
-        do_tcpext_connaborts = config_get_boolean_ondemand("plugin:freebsd:sysctl", "TCP connection aborts",
+        do_tcp_packets       = config_get_boolean("plugin:freebsd:net.inet.tcp.stats", "ipv4 TCP packets",          1);
+        do_tcp_errors        = config_get_boolean("plugin:freebsd:net.inet.tcp.stats", "ipv4 TCP errors",           1);
+        do_tcp_handshake     = config_get_boolean("plugin:freebsd:net.inet.tcp.stats", "ipv4 TCP handshake issues", 1);
+        do_tcpext_connaborts = config_get_boolean_ondemand("plugin:freebsd:net.inet.tcp.stats", "TCP connection aborts",
                                                            CONFIG_BOOLEAN_AUTO);
-        do_tcpext_ofo        = config_get_boolean_ondemand("plugin:freebsd:sysctl", "TCP out-of-order queue",
+        do_tcpext_ofo        = config_get_boolean_ondemand("plugin:freebsd:net.inet.tcp.stats", "TCP out-of-order queue",
                                                            CONFIG_BOOLEAN_AUTO);
-        do_tcpext_syncookies = config_get_boolean_ondemand("plugin:freebsd:sysctl", "TCP SYN cookies",
+        do_tcpext_syncookies = config_get_boolean_ondemand("plugin:freebsd:net.inet.tcp.stats", "TCP SYN cookies",
                                                            CONFIG_BOOLEAN_AUTO);
-        do_ecn               = config_get_boolean_ondemand("plugin:freebsd:sysctl", "ECN packets",
+        do_ecn               = config_get_boolean_ondemand("plugin:freebsd:net.inet.tcp.stats", "ECN packets",
                                                            CONFIG_BOOLEAN_AUTO);
     }
 
@@ -1733,8 +1733,8 @@ int do_net_inet_udp_stats(int update_every, usec_t dt) {
     static int do_udp_packets = -1, do_udp_errors = -1;
 
     if (unlikely(do_udp_packets == -1)) {
-        do_udp_packets = config_get_boolean("plugin:freebsd:sysctl", "ipv4 UDP packets", 1);
-        do_udp_errors  = config_get_boolean("plugin:freebsd:sysctl", "ipv4 UDP errors", 1);
+        do_udp_packets = config_get_boolean("plugin:freebsd:net.inet.udp.stats", "ipv4 UDP packets", 1);
+        do_udp_errors  = config_get_boolean("plugin:freebsd:net.inet.udp.stats", "ipv4 UDP errors", 1);
     }
 
     // see http://net-snmp.sourceforge.net/docs/mibs/udp.html
@@ -1833,9 +1833,9 @@ int do_net_inet_icmp_stats(int update_every, usec_t dt) {
     static int do_icmp_packets = -1, do_icmp_errors = -1, do_icmpmsg = -1;
 
     if (unlikely(do_icmp_packets == -1)) {
-        do_icmp_packets = config_get_boolean("plugin:freebsd:sysctl", "ipv4 ICMP packets",  1);
-        do_icmp_errors  = config_get_boolean("plugin:freebsd:sysctl", "ipv4 ICMP errors",   1);
-        do_icmpmsg      = config_get_boolean("plugin:freebsd:sysctl", "ipv4 ICMP messages", 1);
+        do_icmp_packets = config_get_boolean("plugin:freebsd:net.inet.icmp.stats", "ipv4 ICMP packets",  1);
+        do_icmp_errors  = config_get_boolean("plugin:freebsd:net.inet.icmp.stats", "ipv4 ICMP errors",   1);
+        do_icmpmsg      = config_get_boolean("plugin:freebsd:net.inet.icmp.stats", "ipv4 ICMP messages", 1);
     }
 
     if (likely(do_icmp_packets || do_icmp_errors || do_icmpmsg)) {
@@ -1958,10 +1958,10 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
     static int do_ip_packets = -1, do_ip_fragsout = -1, do_ip_fragsin = -1, do_ip_errors = -1;
 
     if (unlikely(do_ip_packets == -1)) {
-        do_ip_packets  = config_get_boolean("plugin:freebsd:sysctl", "ipv4 packets", 1);
-        do_ip_fragsout = config_get_boolean("plugin:freebsd:sysctl", "ipv4 fragments sent", 1);
-        do_ip_fragsin  = config_get_boolean("plugin:freebsd:sysctl", "ipv4 fragments assembly", 1);
-        do_ip_errors   = config_get_boolean("plugin:freebsd:sysctl", "ipv4 errors", 1);
+        do_ip_packets  = config_get_boolean("plugin:freebsd:net.inet.ip.stats", "ipv4 packets", 1);
+        do_ip_fragsout = config_get_boolean("plugin:freebsd:net.inet.ip.stats", "ipv4 fragments sent", 1);
+        do_ip_fragsin  = config_get_boolean("plugin:freebsd:net.inet.ip.stats", "ipv4 fragments assembly", 1);
+        do_ip_errors   = config_get_boolean("plugin:freebsd:net.inet.ip.stats", "ipv4 errors", 1);
     }
 
     // see also http://net-snmp.sourceforge.net/docs/mibs/ip.html
@@ -2140,11 +2140,14 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
     static int do_ip6_packets = -1, do_ip6_fragsout = -1, do_ip6_fragsin = -1, do_ip6_errors = -1;
 
     if (unlikely(do_ip6_packets == -1)) {
-        do_ip6_packets  = config_get_boolean_ondemand("plugin:freebsd:sysctl", "ipv6 packets",        CONFIG_BOOLEAN_AUTO);
-        do_ip6_fragsout = config_get_boolean_ondemand("plugin:freebsd:sysctl", "ipv6 fragments sent", CONFIG_BOOLEAN_AUTO);
-        do_ip6_fragsin  = config_get_boolean_ondemand("plugin:freebsd:sysctl", "ipv6 fragments assembly",
+        do_ip6_packets  = config_get_boolean_ondemand("plugin:freebsd:net.inet6.ip6.stats", "ipv6 packets",
+                                                      CONFIG_BOOLEAN_AUTO);
+        do_ip6_fragsout = config_get_boolean_ondemand("plugin:freebsd:net.inet6.ip6.stats", "ipv6 fragments sent",
+                                                      CONFIG_BOOLEAN_AUTO);
+        do_ip6_fragsin  = config_get_boolean_ondemand("plugin:freebsd:net.inet6.ip6.stats", "ipv6 fragments assembly",
+                                                      CONFIG_BOOLEAN_AUTO);
+        do_ip6_errors   = config_get_boolean_ondemand("plugin:freebsd:net.inet6.ip6.stats", "ipv6 errors",
                                                       CONFIG_BOOLEAN_AUTO);
-        do_ip6_errors   = config_get_boolean_ondemand("plugin:freebsd:sysctl", "ipv6 errors",         CONFIG_BOOLEAN_AUTO);
     }
 
     if (likely(do_ip6_packets || do_ip6_fragsout || do_ip6_fragsin || do_ip6_errors)) {
@@ -2348,13 +2351,20 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
             do_icmp6_neighbor = -1, do_icmp6_types = -1;
 
     if (unlikely(do_icmp6 == -1)) {
-        do_icmp6          = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp",           CONFIG_BOOLEAN_AUTO);
-        do_icmp6_redir    = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp redirects", CONFIG_BOOLEAN_AUTO);
-        do_icmp6_errors   = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp errors",    CONFIG_BOOLEAN_AUTO);
-        do_icmp6_echos    = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp echos",     CONFIG_BOOLEAN_AUTO);
-        do_icmp6_router   = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp router",    CONFIG_BOOLEAN_AUTO);
-        do_icmp6_neighbor = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp neighbor",  CONFIG_BOOLEAN_AUTO);
-        do_icmp6_types    = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp types",     CONFIG_BOOLEAN_AUTO);
+        do_icmp6          = config_get_boolean_ondemand("plugin:freebsd:net.inet6.icmp6.stats", "icmp",
+                                                        CONFIG_BOOLEAN_AUTO);
+        do_icmp6_redir    = config_get_boolean_ondemand("plugin:freebsd:net.inet6.icmp6.stats", "icmp redirects",
+                                                        CONFIG_BOOLEAN_AUTO);
+        do_icmp6_errors   = config_get_boolean_ondemand("plugin:freebsd:net.inet6.icmp6.stats", "icmp errors",
+                                                        CONFIG_BOOLEAN_AUTO);
+        do_icmp6_echos    = config_get_boolean_ondemand("plugin:freebsd:net.inet6.icmp6.stats", "icmp echos",
+                                                        CONFIG_BOOLEAN_AUTO);
+        do_icmp6_router   = config_get_boolean_ondemand("plugin:freebsd:net.inet6.icmp6.stats", "icmp router",
+                                                        CONFIG_BOOLEAN_AUTO);
+        do_icmp6_neighbor = config_get_boolean_ondemand("plugin:freebsd:net.inet6.icmp6.stats", "icmp neighbor",
+                                                        CONFIG_BOOLEAN_AUTO);
+        do_icmp6_types    = config_get_boolean_ondemand("plugin:freebsd:net.inet6.icmp6.stats", "icmp types",
+                                                        CONFIG_BOOLEAN_AUTO);
     }
 
     if (likely(do_icmp6 || do_icmp6_redir || do_icmp6_errors || do_icmp6_echos || do_icmp6_router || do_icmp6_neighbor || do_icmp6_types)) {