Rename config sections for modules
Vladimir Kobal committed
Mar 15, 2017 at 20:44 UTC
6699ea8c3cffb87df3c241d84b8f7b7eb873f700
1 file changed
+39
-29
src/freebsd_sysctl.c
+39
-29
@@ -1229,8 +1229,8 @@ int do_net_isr(int update_every, usec_t dt) {
1229
static int do_netisr = -1, do_netisr_per_core = -1;
1230
1231
if (unlikely(do_netisr == -1)) {
1232
- do_netisr = config_get_boolean("plugin:freebsd:sysctl", "netisr", 1);
1233
- do_netisr_per_core = config_get_boolean("plugin:freebsd:sysctl", "netisr per core", 1);
1232
+ do_netisr = config_get_boolean("plugin:freebsd:net.isr", "netisr", 1);
1233
+ do_netisr_per_core = config_get_boolean("plugin:freebsd:net.isr", "netisr per core", 1);
1234
}
1235
1236
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) {
1439
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;
1440
1441
if (unlikely(do_tcp_packets == -1)) {
1442
- do_tcp_packets = config_get_boolean("plugin:freebsd:sysctl", "ipv4 TCP packets", 1);
1443
- do_tcp_errors = config_get_boolean("plugin:freebsd:sysctl", "ipv4 TCP errors", 1);
1444
- do_tcp_handshake = config_get_boolean("plugin:freebsd:sysctl", "ipv4 TCP handshake issues", 1);
1445
- do_tcpext_connaborts = config_get_boolean_ondemand("plugin:freebsd:sysctl", "TCP connection aborts",
1442
+ do_tcp_packets = config_get_boolean("plugin:freebsd:net.inet.tcp.stats", "ipv4 TCP packets", 1);
1443
+ do_tcp_errors = config_get_boolean("plugin:freebsd:net.inet.tcp.stats", "ipv4 TCP errors", 1);
1444
+ do_tcp_handshake = config_get_boolean("plugin:freebsd:net.inet.tcp.stats", "ipv4 TCP handshake issues", 1);
1445
+ do_tcpext_connaborts = config_get_boolean_ondemand("plugin:freebsd:net.inet.tcp.stats", "TCP connection aborts",
1446
CONFIG_BOOLEAN_AUTO);
1447
- do_tcpext_ofo = config_get_boolean_ondemand("plugin:freebsd:sysctl", "TCP out-of-order queue",
1447
+ do_tcpext_ofo = config_get_boolean_ondemand("plugin:freebsd:net.inet.tcp.stats", "TCP out-of-order queue",
1448
CONFIG_BOOLEAN_AUTO);
1449
- do_tcpext_syncookies = config_get_boolean_ondemand("plugin:freebsd:sysctl", "TCP SYN cookies",
1449
+ do_tcpext_syncookies = config_get_boolean_ondemand("plugin:freebsd:net.inet.tcp.stats", "TCP SYN cookies",
1450
CONFIG_BOOLEAN_AUTO);
1451
- do_ecn = config_get_boolean_ondemand("plugin:freebsd:sysctl", "ECN packets",
1451
+ do_ecn = config_get_boolean_ondemand("plugin:freebsd:net.inet.tcp.stats", "ECN packets",
1452
CONFIG_BOOLEAN_AUTO);
1453
}
1454
@@ -1733,8 +1733,8 @@ int do_net_inet_udp_stats(int update_every, usec_t dt) {
1733
static int do_udp_packets = -1, do_udp_errors = -1;
1734
1735
if (unlikely(do_udp_packets == -1)) {
1736
- do_udp_packets = config_get_boolean("plugin:freebsd:sysctl", "ipv4 UDP packets", 1);
1737
- do_udp_errors = config_get_boolean("plugin:freebsd:sysctl", "ipv4 UDP errors", 1);
1736
+ do_udp_packets = config_get_boolean("plugin:freebsd:net.inet.udp.stats", "ipv4 UDP packets", 1);
1737
+ do_udp_errors = config_get_boolean("plugin:freebsd:net.inet.udp.stats", "ipv4 UDP errors", 1);
1738
}
1739
1740
// 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) {
1833
static int do_icmp_packets = -1, do_icmp_errors = -1, do_icmpmsg = -1;
1834
1835
if (unlikely(do_icmp_packets == -1)) {
1836
- do_icmp_packets = config_get_boolean("plugin:freebsd:sysctl", "ipv4 ICMP packets", 1);
1837
- do_icmp_errors = config_get_boolean("plugin:freebsd:sysctl", "ipv4 ICMP errors", 1);
1838
- do_icmpmsg = config_get_boolean("plugin:freebsd:sysctl", "ipv4 ICMP messages", 1);
1836
+ do_icmp_packets = config_get_boolean("plugin:freebsd:net.inet.icmp.stats", "ipv4 ICMP packets", 1);
1837
+ do_icmp_errors = config_get_boolean("plugin:freebsd:net.inet.icmp.stats", "ipv4 ICMP errors", 1);
1838
+ do_icmpmsg = config_get_boolean("plugin:freebsd:net.inet.icmp.stats", "ipv4 ICMP messages", 1);
1839
}
1840
1841
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) {
1958
static int do_ip_packets = -1, do_ip_fragsout = -1, do_ip_fragsin = -1, do_ip_errors = -1;
1959
1960
if (unlikely(do_ip_packets == -1)) {
1961
- do_ip_packets = config_get_boolean("plugin:freebsd:sysctl", "ipv4 packets", 1);
1962
- do_ip_fragsout = config_get_boolean("plugin:freebsd:sysctl", "ipv4 fragments sent", 1);
1963
- do_ip_fragsin = config_get_boolean("plugin:freebsd:sysctl", "ipv4 fragments assembly", 1);
1964
- do_ip_errors = config_get_boolean("plugin:freebsd:sysctl", "ipv4 errors", 1);
1961
+ do_ip_packets = config_get_boolean("plugin:freebsd:net.inet.ip.stats", "ipv4 packets", 1);
1962
+ do_ip_fragsout = config_get_boolean("plugin:freebsd:net.inet.ip.stats", "ipv4 fragments sent", 1);
1963
+ do_ip_fragsin = config_get_boolean("plugin:freebsd:net.inet.ip.stats", "ipv4 fragments assembly", 1);
1964
+ do_ip_errors = config_get_boolean("plugin:freebsd:net.inet.ip.stats", "ipv4 errors", 1);
1965
}
1966
1967
// 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) {
2140
static int do_ip6_packets = -1, do_ip6_fragsout = -1, do_ip6_fragsin = -1, do_ip6_errors = -1;
2141
2142
if (unlikely(do_ip6_packets == -1)) {
2143
- do_ip6_packets = config_get_boolean_ondemand("plugin:freebsd:sysctl", "ipv6 packets", CONFIG_BOOLEAN_AUTO);
2144
- do_ip6_fragsout = config_get_boolean_ondemand("plugin:freebsd:sysctl", "ipv6 fragments sent", CONFIG_BOOLEAN_AUTO);
2145
- do_ip6_fragsin = config_get_boolean_ondemand("plugin:freebsd:sysctl", "ipv6 fragments assembly",
2143
+ do_ip6_packets = config_get_boolean_ondemand("plugin:freebsd:net.inet6.ip6.stats", "ipv6 packets",
2144
+ CONFIG_BOOLEAN_AUTO);
2145
+ do_ip6_fragsout = config_get_boolean_ondemand("plugin:freebsd:net.inet6.ip6.stats", "ipv6 fragments sent",
2146
+ CONFIG_BOOLEAN_AUTO);
2147
+ do_ip6_fragsin = config_get_boolean_ondemand("plugin:freebsd:net.inet6.ip6.stats", "ipv6 fragments assembly",
2148
+ CONFIG_BOOLEAN_AUTO);
2149
+ do_ip6_errors = config_get_boolean_ondemand("plugin:freebsd:net.inet6.ip6.stats", "ipv6 errors",
2150
CONFIG_BOOLEAN_AUTO);
2147
- do_ip6_errors = config_get_boolean_ondemand("plugin:freebsd:sysctl", "ipv6 errors", CONFIG_BOOLEAN_AUTO);
2151
}
2152
2153
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) {
2351
do_icmp6_neighbor = -1, do_icmp6_types = -1;
2352
2353
if (unlikely(do_icmp6 == -1)) {
2351
- do_icmp6 = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp", CONFIG_BOOLEAN_AUTO);
2352
- do_icmp6_redir = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp redirects", CONFIG_BOOLEAN_AUTO);
2353
- do_icmp6_errors = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp errors", CONFIG_BOOLEAN_AUTO);
2354
- do_icmp6_echos = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp echos", CONFIG_BOOLEAN_AUTO);
2355
- do_icmp6_router = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp router", CONFIG_BOOLEAN_AUTO);
2356
- do_icmp6_neighbor = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp neighbor", CONFIG_BOOLEAN_AUTO);
2357
- do_icmp6_types = config_get_boolean_ondemand("plugin:freebsd:sysctl", "icmp types", CONFIG_BOOLEAN_AUTO);
2354
+ do_icmp6 = config_get_boolean_ondemand("plugin:freebsd:net.inet6.icmp6.stats", "icmp",
2355
+ CONFIG_BOOLEAN_AUTO);
2356
+ do_icmp6_redir = config_get_boolean_ondemand("plugin:freebsd:net.inet6.icmp6.stats", "icmp redirects",
2357
+ CONFIG_BOOLEAN_AUTO);
2358
+ do_icmp6_errors = config_get_boolean_ondemand("plugin:freebsd:net.inet6.icmp6.stats", "icmp errors",
2359
+ CONFIG_BOOLEAN_AUTO);
2360
+ do_icmp6_echos = config_get_boolean_ondemand("plugin:freebsd:net.inet6.icmp6.stats", "icmp echos",
2361
+ CONFIG_BOOLEAN_AUTO);
2362
+ do_icmp6_router = config_get_boolean_ondemand("plugin:freebsd:net.inet6.icmp6.stats", "icmp router",
2363
+ CONFIG_BOOLEAN_AUTO);
2364
+ do_icmp6_neighbor = config_get_boolean_ondemand("plugin:freebsd:net.inet6.icmp6.stats", "icmp neighbor",
2365
+ CONFIG_BOOLEAN_AUTO);
2366
+ do_icmp6_types = config_get_boolean_ondemand("plugin:freebsd:net.inet6.icmp6.stats", "icmp types",
2367
+ CONFIG_BOOLEAN_AUTO);
2368
}
2369
2370
if (likely(do_icmp6 || do_icmp6_redir || do_icmp6_errors || do_icmp6_echos || do_icmp6_router || do_icmp6_neighbor || do_icmp6_types)) {