archive/netdata_netdata
0
0
Fork 0
mirror of https://github.com/netdata/netdata.git synced 2025-04-14 09:38:34 +00:00
Code Issues Projects Releases Wiki Activity

Fix freebsd compilation ()

Browse source 
Fix config_get_boolean_ondemand --> inicfg_get_boolean_ondemand on freebsd
This commit is contained in:
Stelios Fragkakis 2025-02-19 23:11:25 +02:00 • committed by GitHub
parent 9656ccbd44
commit a1a5b94127
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 58 additions and 58 deletions

40
src/collectors/freebsd.plugin/freebsd_devstat.c
View file

@ -195,30 +195,30 @@ int do_kern_devstat(int update_every, usec_t dt) {
static SIMPLE_PATTERN *excluded_disks = NULL;
if (unlikely(enable_new_disks == -1)) {
enable_new_disks = config_get_boolean_ondemand(CONFIG_SECTION_KERN_DEVSTAT,
enable_new_disks = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_KERN_DEVSTAT,
"enable new disks detected at runtime", CONFIG_BOOLEAN_AUTO);
enable_pass_devices = config_get_boolean_ondemand(CONFIG_SECTION_KERN_DEVSTAT,
enable_pass_devices = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_KERN_DEVSTAT,
"performance metrics for pass devices", CONFIG_BOOLEAN_AUTO);
do_system_io = config_get_boolean_ondemand(CONFIG_SECTION_KERN_DEVSTAT, "total bandwidth for all disks",
do_system_io = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_KERN_DEVSTAT, "total bandwidth for all disks",
CONFIG_BOOLEAN_YES);
do_io = config_get_boolean_ondemand(CONFIG_SECTION_KERN_DEVSTAT, "bandwidth for all disks",
do_io = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_KERN_DEVSTAT, "bandwidth for all disks",
CONFIG_BOOLEAN_AUTO);
do_ops = config_get_boolean_ondemand(CONFIG_SECTION_KERN_DEVSTAT, "operations for all disks",
do_ops = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_KERN_DEVSTAT, "operations for all disks",
CONFIG_BOOLEAN_AUTO);
do_qops = config_get_boolean_ondemand(CONFIG_SECTION_KERN_DEVSTAT, "queued operations for all disks",
do_qops = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_KERN_DEVSTAT, "queued operations for all disks",
CONFIG_BOOLEAN_AUTO);
do_util = config_get_boolean_ondemand(CONFIG_SECTION_KERN_DEVSTAT, "utilization percentage for all disks",
do_util = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_KERN_DEVSTAT, "utilization percentage for all disks",
CONFIG_BOOLEAN_AUTO);
do_iotime = config_get_boolean_ondemand(CONFIG_SECTION_KERN_DEVSTAT, "i/o time for all disks",
do_iotime = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_KERN_DEVSTAT, "i/o time for all disks",
CONFIG_BOOLEAN_AUTO);
do_await = config_get_boolean_ondemand(CONFIG_SECTION_KERN_DEVSTAT, "average completed i/o time for all disks",
do_await = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_KERN_DEVSTAT, "average completed i/o time for all disks",
CONFIG_BOOLEAN_AUTO);
do_avagsz = config_get_boolean_ondemand(CONFIG_SECTION_KERN_DEVSTAT, "average completed i/o bandwidth for all disks",
do_avagsz = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_KERN_DEVSTAT, "average completed i/o bandwidth for all disks",
CONFIG_BOOLEAN_AUTO);
do_svctm = config_get_boolean_ondemand(CONFIG_SECTION_KERN_DEVSTAT, "average service time for all disks",
do_svctm = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_KERN_DEVSTAT, "average service time for all disks",
CONFIG_BOOLEAN_AUTO);
excluded_disks = simple_pattern_create(
@ -302,18 +302,18 @@ int do_kern_devstat(int update_every, usec_t dt) {
dm->enabled = !simple_pattern_matches(excluded_disks, disk);
snprintfz(var_name, 4096, "%s:%s", CONFIG_SECTION_KERN_DEVSTAT, disk);
dm->enabled = config_get_boolean_ondemand(var_name, "enabled", dm->enabled);
dm->enabled = inicfg_get_boolean_ondemand(&netdata_config, var_name, "enabled", dm->enabled);
dm->do_io = config_get_boolean_ondemand(var_name, "bandwidth", do_io);
dm->do_ops = config_get_boolean_ondemand(var_name, "operations", do_ops);
dm->do_qops = config_get_boolean_ondemand(var_name, "queued operations", do_qops);
dm->do_util = config_get_boolean_ondemand(var_name, "utilization percentage", do_util);
dm->do_iotime = config_get_boolean_ondemand(var_name, "i/o time", do_iotime);
dm->do_await = config_get_boolean_ondemand(var_name, "average completed i/o time",
dm->do_io = inicfg_get_boolean_ondemand(&netdata_config, var_name, "bandwidth", do_io);
dm->do_ops = inicfg_get_boolean_ondemand(&netdata_config, var_name, "operations", do_ops);
dm->do_qops = inicfg_get_boolean_ondemand(&netdata_config, var_name, "queued operations", do_qops);
dm->do_util = inicfg_get_boolean_ondemand(&netdata_config, var_name, "utilization percentage", do_util);
dm->do_iotime = inicfg_get_boolean_ondemand(&netdata_config, var_name, "i/o time", do_iotime);
dm->do_await = inicfg_get_boolean_ondemand(&netdata_config, var_name, "average completed i/o time",
do_await);
dm->do_avagsz = config_get_boolean_ondemand(var_name, "average completed i/o bandwidth",
dm->do_avagsz = inicfg_get_boolean_ondemand(&netdata_config, var_name, "average completed i/o bandwidth",
do_avagsz);
dm->do_svctm = config_get_boolean_ondemand(var_name, "average service time", do_svctm);
dm->do_svctm = inicfg_get_boolean_ondemand(&netdata_config, var_name, "average service time", do_svctm);
// initialise data for differential charts

32
src/collectors/freebsd.plugin/freebsd_getifaddrs.c
View file

@ -153,27 +153,27 @@ int do_getifaddrs(int update_every, usec_t dt) {
static SIMPLE_PATTERN *excluded_interfaces = NULL, *physical_interfaces = NULL;
if (unlikely(enable_new_interfaces == -1)) {
enable_new_interfaces = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS,
enable_new_interfaces = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETIFADDRS,
"enable new interfaces detected at runtime",
CONFIG_BOOLEAN_AUTO);
do_bandwidth_net = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS, "total bandwidth for physical interfaces",
do_bandwidth_net = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETIFADDRS, "total bandwidth for physical interfaces",
CONFIG_BOOLEAN_AUTO);
do_packets_net = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS, "total packets for physical interfaces",
do_packets_net = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETIFADDRS, "total packets for physical interfaces",
CONFIG_BOOLEAN_AUTO);
do_bandwidth_ipv4 = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS, "total bandwidth for ipv4 interfaces",
do_bandwidth_ipv4 = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETIFADDRS, "total bandwidth for ipv4 interfaces",
CONFIG_BOOLEAN_AUTO);
do_bandwidth_ipv6 = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS, "total bandwidth for ipv6 interfaces",
do_bandwidth_ipv6 = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETIFADDRS, "total bandwidth for ipv6 interfaces",
CONFIG_BOOLEAN_AUTO);
do_bandwidth = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS, "bandwidth for all interfaces",
do_bandwidth = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETIFADDRS, "bandwidth for all interfaces",
CONFIG_BOOLEAN_AUTO);
do_packets = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS, "packets for all interfaces",
do_packets = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETIFADDRS, "packets for all interfaces",
CONFIG_BOOLEAN_AUTO);
do_errors = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS, "errors for all interfaces",
do_errors = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETIFADDRS, "errors for all interfaces",
CONFIG_BOOLEAN_AUTO);
do_drops = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS, "drops for all interfaces",
do_drops = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETIFADDRS, "drops for all interfaces",
CONFIG_BOOLEAN_AUTO);
do_events = config_get_boolean_ondemand(CONFIG_SECTION_GETIFADDRS, "collisions for all interfaces",
do_events = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETIFADDRS, "collisions for all interfaces",
CONFIG_BOOLEAN_AUTO);
excluded_interfaces = simple_pattern_create(
@ -406,16 +406,16 @@ int do_getifaddrs(int update_every, usec_t dt) {
ifm->enabled = !simple_pattern_matches(excluded_interfaces, ifa->ifa_name);
snprintfz(var_name, 4096, "%s:%s", CONFIG_SECTION_GETIFADDRS, ifa->ifa_name);
ifm->enabled = config_get_boolean_ondemand(var_name, "enabled", ifm->enabled);
ifm->enabled = inicfg_get_boolean_ondemand(&netdata_config, var_name, "enabled", ifm->enabled);
if (unlikely(ifm->enabled == CONFIG_BOOLEAN_NO))
continue;
ifm->do_bandwidth = config_get_boolean_ondemand(var_name, "bandwidth", do_bandwidth);
ifm->do_packets = config_get_boolean_ondemand(var_name, "packets", do_packets);
ifm->do_errors = config_get_boolean_ondemand(var_name, "errors", do_errors);
ifm->do_drops = config_get_boolean_ondemand(var_name, "drops", do_drops);
ifm->do_events = config_get_boolean_ondemand(var_name, "events", do_events);
ifm->do_bandwidth = inicfg_get_boolean_ondemand(&netdata_config, var_name, "bandwidth", do_bandwidth);
ifm->do_packets = inicfg_get_boolean_ondemand(&netdata_config, var_name, "packets", do_packets);
ifm->do_errors = inicfg_get_boolean_ondemand(&netdata_config, var_name, "errors", do_errors);
ifm->do_drops = inicfg_get_boolean_ondemand(&netdata_config, var_name, "drops", do_drops);
ifm->do_events = inicfg_get_boolean_ondemand(&netdata_config, var_name, "events", do_events);
}
if (unlikely(!ifm->enabled))

12
src/collectors/freebsd.plugin/freebsd_getmntinfo.c
View file

@ -135,12 +135,12 @@ int do_getmntinfo(int update_every, usec_t dt) {
static SIMPLE_PATTERN *excluded_filesystems = NULL;
if (unlikely(enable_new_mount_points == -1)) {
enable_new_mount_points = config_get_boolean_ondemand(CONFIG_SECTION_GETMNTINFO,
enable_new_mount_points = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETMNTINFO,
"enable new mount points detected at runtime",
CONFIG_BOOLEAN_AUTO);
do_space = config_get_boolean_ondemand(CONFIG_SECTION_GETMNTINFO, "space usage for all disks", CONFIG_BOOLEAN_AUTO);
do_inodes = config_get_boolean_ondemand(CONFIG_SECTION_GETMNTINFO, "inodes usage for all disks", CONFIG_BOOLEAN_AUTO);
do_space = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETMNTINFO, "space usage for all disks", CONFIG_BOOLEAN_AUTO);
do_inodes = inicfg_get_boolean_ondemand(&netdata_config, CONFIG_SECTION_GETMNTINFO, "inodes usage for all disks", CONFIG_BOOLEAN_AUTO);
excluded_mountpoints = simple_pattern_create(
inicfg_get(&netdata_config, CONFIG_SECTION_GETMNTINFO, "exclude space metrics on paths", DEFAULT_EXCLUDED_PATHS),
@ -195,13 +195,13 @@ int do_getmntinfo(int update_every, usec_t dt) {
|| simple_pattern_matches(excluded_filesystems, mntbuf[i].f_fstypename));
snprintfz(var_name, 4096, "%s:%s", CONFIG_SECTION_GETMNTINFO, mntbuf[i].f_mntonname);
m->enabled = config_get_boolean_ondemand(var_name, "enabled", m->enabled);
m->enabled = inicfg_get_boolean_ondemand(&netdata_config, var_name, "enabled", m->enabled);
if (unlikely(m->enabled == CONFIG_BOOLEAN_NO))
continue;
m->do_space = config_get_boolean_ondemand(var_name, "space usage", do_space);
m->do_inodes = config_get_boolean_ondemand(var_name, "inodes usage", do_inodes);
m->do_space = inicfg_get_boolean_ondemand(&netdata_config, var_name, "space usage", do_space);
m->do_inodes = inicfg_get_boolean_ondemand(&netdata_config, var_name, "inodes usage", do_inodes);
}
if (unlikely(!m->enabled))

32
src/collectors/freebsd.plugin/freebsd_sysctl.c
View file

@ -1662,15 +1662,15 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
do_tcp_packets = inicfg_get_boolean(&netdata_config, "plugin:freebsd:net.inet.tcp.stats", "ipv4 TCP packets", 1);
do_tcp_errors = inicfg_get_boolean(&netdata_config, "plugin:freebsd:net.inet.tcp.stats", "ipv4 TCP errors", 1);
do_tcp_handshake = inicfg_get_boolean(&netdata_config, "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",
do_tcpext_connaborts = inicfg_get_boolean_ondemand(&netdata_config, "plugin:freebsd:net.inet.tcp.stats", "TCP connection aborts",
CONFIG_BOOLEAN_AUTO);
do_tcpext_ofo = config_get_boolean_ondemand("plugin:freebsd:net.inet.tcp.stats", "TCP out-of-order queue",
do_tcpext_ofo = inicfg_get_boolean_ondemand(&netdata_config, "plugin:freebsd:net.inet.tcp.stats", "TCP out-of-order queue",
CONFIG_BOOLEAN_AUTO);
do_tcpext_syncookies = config_get_boolean_ondemand("plugin:freebsd:net.inet.tcp.stats", "TCP SYN cookies",
do_tcpext_syncookies = inicfg_get_boolean_ondemand(&netdata_config, "plugin:freebsd:net.inet.tcp.stats", "TCP SYN cookies",
CONFIG_BOOLEAN_AUTO);
do_tcpext_listen = config_get_boolean_ondemand("plugin:freebsd:net.inet.tcp.stats", "TCP listen issues",
do_tcpext_listen = inicfg_get_boolean_ondemand(&netdata_config, "plugin:freebsd:net.inet.tcp.stats", "TCP listen issues",
CONFIG_BOOLEAN_AUTO);
do_ecn = config_get_boolean_ondemand("plugin:freebsd:net.inet.tcp.stats", "ECN packets",
do_ecn = inicfg_get_boolean_ondemand(&netdata_config, "plugin:freebsd:net.inet.tcp.stats", "ECN packets",
CONFIG_BOOLEAN_AUTO);
}
@ -2415,13 +2415,13 @@ 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:net.inet6.ip6.stats", "ipv6 packets",
do_ip6_packets = inicfg_get_boolean_ondemand(&netdata_config, "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",
do_ip6_fragsout = inicfg_get_boolean_ondemand(&netdata_config, "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",
do_ip6_fragsin = inicfg_get_boolean_ondemand(&netdata_config, "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",
do_ip6_errors = inicfg_get_boolean_ondemand(&netdata_config, "plugin:freebsd:net.inet6.ip6.stats", "ipv6 errors",
CONFIG_BOOLEAN_AUTO);
}
@ -2604,19 +2604,19 @@ 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:net.inet6.icmp6.stats", "icmp",
do_icmp6 = inicfg_get_boolean_ondemand(&netdata_config, "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",
do_icmp6_redir = inicfg_get_boolean_ondemand(&netdata_config, "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",
do_icmp6_errors = inicfg_get_boolean_ondemand(&netdata_config, "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",
do_icmp6_echos = inicfg_get_boolean_ondemand(&netdata_config, "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",
do_icmp6_router = inicfg_get_boolean_ondemand(&netdata_config, "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",
do_icmp6_neighbor = inicfg_get_boolean_ondemand(&netdata_config, "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",
do_icmp6_types = inicfg_get_boolean_ondemand(&netdata_config, "plugin:freebsd:net.inet6.icmp6.stats", "icmp types",
CONFIG_BOOLEAN_AUTO);
}