summaryrefslogtreecommitdiffstats
path: root/collectors/freebsd.plugin/freebsd_sysctl.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--collectors/freebsd.plugin/freebsd_sysctl.c (renamed from src/freebsd_sysctl.c)191
1 files changed, 104 insertions, 87 deletions
diff --git a/src/freebsd_sysctl.c b/collectors/freebsd.plugin/freebsd_sysctl.c
index 1e11255aa..da5a351de 100644
--- a/src/freebsd_sysctl.c
+++ b/collectors/freebsd.plugin/freebsd_sysctl.c
@@ -1,4 +1,6 @@
-#include "common.h"
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include "plugin_freebsd.h"
#include <sys/vmmeter.h>
#include <vm/vm_param.h>
@@ -84,6 +86,10 @@ typedef struct __vmmeter vmmeter_t;
typedef struct vmmeter vmmeter_t;
#endif
+#if (__FreeBSD_version >= 1101516 && __FreeBSD_version < 1200000) || __FreeBSD_version >= 1200015
+#define NETDATA_COLLECT_LAUNDRY 1
+#endif
+
// --------------------------------------------------------------------------------------------------------------------
// FreeBSD plugin initialization
@@ -141,9 +147,9 @@ int do_vm_loadavg(int update_every, usec_t dt){
NULL,
"System Load Average",
"load",
- "freebsd",
+ "freebsd.plugin",
"vm.loadavg",
- 100,
+ NETDATA_CHART_PRIO_SYSTEM_LOAD,
(update_every < MIN_LOADAVG_UPDATE_EVERY) ?
MIN_LOADAVG_UPDATE_EVERY : update_every, RRDSET_TYPE_LINE
);
@@ -210,9 +216,9 @@ int do_vm_vmtotal(int update_every, usec_t dt) {
NULL,
"System Active Processes",
"processes",
- "freebsd",
+ "freebsd.plugin",
"vm.vmtotal",
- 750,
+ NETDATA_CHART_PRIO_SYSTEM_ACTIVE_PROCESSES,
update_every,
RRDSET_TYPE_LINE
);
@@ -239,9 +245,9 @@ int do_vm_vmtotal(int update_every, usec_t dt) {
NULL,
"System Processes",
"processes",
- "freebsd",
+ "freebsd.plugin",
"vm.vmtotal",
- 600,
+ NETDATA_CHART_PRIO_SYSTEM_PROCESSES,
update_every,
RRDSET_TYPE_LINE
);
@@ -271,7 +277,7 @@ int do_vm_vmtotal(int update_every, usec_t dt) {
NULL,
"Committed (Allocated) Memory",
"MB",
- "freebsd",
+ "freebsd.plugin",
"vm.vmtotal",
NETDATA_CHART_PRIO_MEM_SYSTEM_COMMITTED,
update_every,
@@ -330,9 +336,10 @@ int do_kern_cp_time(int update_every, usec_t dt) {
"system.cpu",
"Total CPU utilization",
"percentage",
- "freebsd",
+ "freebsd.plugin",
"kern.cp_time",
- 100, update_every,
+ NETDATA_CHART_PRIO_SYSTEM_CPU,
+ update_every,
RRDSET_TYPE_STACKED
);
@@ -411,9 +418,9 @@ int do_kern_cp_times(int update_every, usec_t dt) {
"cpu.cpu",
"Core utilization",
"percentage",
- "freebsd",
+ "freebsd.plugin",
"kern.cp_times",
- 1000,
+ NETDATA_CHART_PRIO_CPU_PER_CORE,
update_every,
RRDSET_TYPE_STACKED
);
@@ -495,9 +502,9 @@ int do_dev_cpu_temperature(int update_every, usec_t dt) {
"cpu.temperatute",
"Core temperature",
"Celsius",
- "freebsd",
+ "freebsd.plugin",
"dev.cpu.temperature",
- 1050,
+ NETDATA_CHART_PRIO_CPU_TEMPERATURE,
update_every,
RRDSET_TYPE_LINE
);
@@ -548,9 +555,9 @@ int do_dev_cpu_0_freq(int update_every, usec_t dt) {
NULL,
"Current CPU Scaling Frequency",
"MHz",
- "freebsd",
+ "freebsd.plugin",
"dev.cpu.0.freq",
- 5003,
+ NETDATA_CHART_PRIO_CPUFREQ_SCALING_CUR_FREQ,
update_every,
RRDSET_TYPE_LINE
);
@@ -612,9 +619,9 @@ int do_hw_intcnt(int update_every, usec_t dt) {
NULL,
"Total Hardware Interrupts",
"interrupts/s",
- "freebsd",
+ "freebsd.plugin",
"hw.intrcnt",
- 900,
+ NETDATA_CHART_PRIO_SYSTEM_INTR,
update_every,
RRDSET_TYPE_LINE
);
@@ -657,9 +664,9 @@ int do_hw_intcnt(int update_every, usec_t dt) {
NULL,
"System interrupts",
"interrupts/s",
- "freebsd",
+ "freebsd.plugin",
"hw.intrcnt",
- 1000,
+ NETDATA_CHART_PRIO_SYSTEM_INTERRUPTS,
update_every,
RRDSET_TYPE_STACKED
);
@@ -715,9 +722,9 @@ int do_vm_stats_sys_v_intr(int update_every, usec_t dt) {
NULL,
"Device Interrupts",
"interrupts/s",
- "freebsd",
+ "freebsd.plugin",
"vm.stats.sys.v_intr",
- 1000,
+ NETDATA_CHART_PRIO_SYSTEM_DEV_INTR,
update_every,
RRDSET_TYPE_LINE
);
@@ -761,9 +768,9 @@ int do_vm_stats_sys_v_soft(int update_every, usec_t dt) {
NULL,
"Software Interrupts",
"interrupts/s",
- "freebsd",
+ "freebsd.plugin",
"vm.stats.sys.v_soft",
- 1100,
+ NETDATA_CHART_PRIO_SYSTEM_SOFT_INTR,
update_every,
RRDSET_TYPE_LINE
);
@@ -807,9 +814,9 @@ int do_vm_stats_sys_v_swtch(int update_every, usec_t dt) {
NULL,
"CPU Context Switches",
"context switches/s",
- "freebsd",
+ "freebsd.plugin",
"vm.stats.sys.v_swtch",
- 800,
+ NETDATA_CHART_PRIO_SYSTEM_CTXT,
update_every,
RRDSET_TYPE_LINE
);
@@ -853,9 +860,9 @@ int do_vm_stats_sys_v_forks(int update_every, usec_t dt) {
NULL,
"Started Processes",
"processes/s",
- "freebsd",
+ "freebsd.plugin",
"vm.stats.sys.v_swtch",
- 700,
+ NETDATA_CHART_PRIO_SYSTEM_FORKS,
update_every,
RRDSET_TYPE_LINE
);
@@ -930,9 +937,9 @@ int do_vm_swap_info(int update_every, usec_t dt) {
NULL,
"System Swap",
"MB",
- "freebsd",
+ "freebsd.plugin",
"vm.swap_info",
- 201,
+ NETDATA_CHART_PRIO_SYSTEM_SWAP,
update_every,
RRDSET_TYPE_STACKED
);
@@ -958,7 +965,8 @@ int do_vm_swap_info(int update_every, usec_t dt) {
int do_system_ram(int update_every, usec_t dt) {
(void)dt;
static int mib_active_count[4] = {0, 0, 0, 0}, mib_inactive_count[4] = {0, 0, 0, 0}, mib_wire_count[4] = {0, 0, 0, 0},
- mib_cache_count[4] = {0, 0, 0, 0}, mib_vfs_bufspace[2] = {0, 0}, mib_free_count[4] = {0, 0, 0, 0};
+ mib_cache_count[4] = {0, 0, 0, 0}, mib_laundry_count[4] = {0, 0, 0, 0}, mib_vfs_bufspace[2] = {0, 0},
+ mib_free_count[4] = {0, 0, 0, 0};
vmmeter_t vmmeter_data;
int vfs_bufspace_count;
@@ -968,6 +976,9 @@ int do_system_ram(int update_every, usec_t dt) {
#if __FreeBSD_version < 1200016
GETSYSCTL_SIMPLE("vm.stats.vm.v_cache_count", mib_cache_count, vmmeter_data.v_cache_count) ||
#endif
+#if defined(NETDATA_COLLECT_LAUNDRY)
+ GETSYSCTL_SIMPLE("vm.stats.vm.v_laundry_count", mib_laundry_count, vmmeter_data.v_laundry_count) ||
+#endif
GETSYSCTL_SIMPLE("vfs.bufspace", mib_vfs_bufspace, vfs_bufspace_count) ||
GETSYSCTL_SIMPLE("vm.stats.vm.v_free_count", mib_free_count, vmmeter_data.v_free_count))) {
error("DISABLED: system.ram chart");
@@ -978,8 +989,8 @@ int do_system_ram(int update_every, usec_t dt) {
// --------------------------------------------------------------------
static RRDSET *st = NULL;
- static RRDDIM *rd_free = NULL, *rd_active = NULL, *rd_inactive = NULL,
- *rd_wired = NULL, *rd_cache = NULL, *rd_buffers = NULL;
+ static RRDDIM *rd_free = NULL, *rd_active = NULL, *rd_inactive = NULL, *rd_wired = NULL,
+ *rd_cache = NULL, *rd_laundry = NULL, *rd_buffers = NULL;
if (unlikely(!st)) {
st = rrdset_create_localhost(
@@ -990,9 +1001,9 @@ int do_system_ram(int update_every, usec_t dt) {
NULL,
"System RAM",
"MB",
- "freebsd",
+ "freebsd.plugin",
"system.ram",
- 200,
+ NETDATA_CHART_PRIO_SYSTEM_RAM,
update_every,
RRDSET_TYPE_STACKED
);
@@ -1004,6 +1015,9 @@ int do_system_ram(int update_every, usec_t dt) {
#if __FreeBSD_version < 1200016
rd_cache = rrddim_add(st, "cache", NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
#endif
+#if defined(NETDATA_COLLECT_LAUNDRY)
+ rd_laundry = rrddim_add(st, "laundry", NULL, system_pagesize, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
+#endif
rd_buffers = rrddim_add(st, "buffers", NULL, 1, MEGA_FACTOR, RRD_ALGORITHM_ABSOLUTE);
}
else rrdset_next(st);
@@ -1015,6 +1029,9 @@ int do_system_ram(int update_every, usec_t dt) {
#if __FreeBSD_version < 1200016
rrddim_set_by_pointer(st, rd_cache, vmmeter_data.v_cache_count);
#endif
+#if defined(NETDATA_COLLECT_LAUNDRY)
+ rrddim_set_by_pointer(st, rd_laundry, vmmeter_data.v_laundry_count);
+#endif
rrddim_set_by_pointer(st, rd_buffers, vfs_bufspace_count);
rrdset_done(st);
}
@@ -1051,9 +1068,9 @@ int do_vm_stats_sys_v_swappgs(int update_every, usec_t dt) {
NULL,
"Swap I/O",
"kilobytes/s",
- "freebsd",
+ "freebsd.plugin",
"vm.stats.vm.v_swappgs",
- 250,
+ NETDATA_CHART_PRIO_SYSTEM_SWAPIO,
update_every,
RRDSET_TYPE_AREA
);
@@ -1105,7 +1122,7 @@ int do_vm_stats_sys_v_pgfaults(int update_every, usec_t dt) {
NULL,
"Memory Page Faults",
"page faults/s",
- "freebsd",
+ "freebsd.plugin",
"vm.stats.vm.v_pgfaults",
NETDATA_CHART_PRIO_MEM_SYSTEM_PGFAULTS,
update_every,
@@ -1187,9 +1204,9 @@ int do_kern_ipc_sem(int update_every, usec_t dt) {
NULL,
"IPC Semaphores",
"semaphores",
- "freebsd",
+ "freebsd.plugin",
"kern.ipc.sem",
- 1000,
+ NETDATA_CHART_PRIO_SYSTEM_IPC_SEMAPHORES,
update_every,
RRDSET_TYPE_AREA
);
@@ -1212,9 +1229,9 @@ int do_kern_ipc_sem(int update_every, usec_t dt) {
NULL,
"IPC Semaphore Arrays",
"arrays",
- "freebsd",
+ "freebsd.plugin",
"kern.ipc.sem",
- 1000,
+ NETDATA_CHART_PRIO_SYSTEM_IPC_SEM_ARRAYS,
update_every,
RRDSET_TYPE_AREA
);
@@ -1286,9 +1303,9 @@ int do_kern_ipc_shm(int update_every, usec_t dt) {
NULL,
"IPC Shared Memory Segments",
"segments",
- "freebsd",
+ "freebsd.plugin",
"kern.ipc.shm",
- 1000,
+ NETDATA_CHART_PRIO_SYSTEM_IPC_SHARED_MEM_SEGS,
update_every,
RRDSET_TYPE_AREA
);
@@ -1311,9 +1328,9 @@ int do_kern_ipc_shm(int update_every, usec_t dt) {
NULL,
"IPC Shared Memory Segments Size",
"kilobytes",
- "freebsd",
+ "freebsd.plugin",
"kern.ipc.shm",
- 1000,
+ NETDATA_CHART_PRIO_SYSTEM_IPC_SHARED_MEM_SIZE,
update_every,
RRDSET_TYPE_AREA
);
@@ -1391,9 +1408,9 @@ int do_kern_ipc_msq(int update_every, usec_t dt) {
NULL,
"Number of IPC Message Queues",
"queues",
- "freebsd",
+ "freebsd.plugin",
"kern.ipc.msq",
- 990,
+ NETDATA_CHART_PRIO_SYSTEM_IPC_MSQ_QUEUES,
update_every,
RRDSET_TYPE_AREA
);
@@ -1416,9 +1433,9 @@ int do_kern_ipc_msq(int update_every, usec_t dt) {
NULL,
"Number of Messages in IPC Message Queues",
"messages",
- "freebsd",
+ "freebsd.plugin",
"kern.ipc.msq",
- 1000,
+ NETDATA_CHART_PRIO_SYSTEM_IPC_MSQ_MESSAGES,
update_every,
RRDSET_TYPE_AREA
);
@@ -1441,9 +1458,9 @@ int do_kern_ipc_msq(int update_every, usec_t dt) {
NULL,
"Size of IPC Message Queues",
"bytes",
- "freebsd",
+ "freebsd.plugin",
"kern.ipc.msq",
- 1100,
+ NETDATA_CHART_PRIO_SYSTEM_IPC_MSQ_SIZE,
update_every,
RRDSET_TYPE_LINE
);
@@ -1485,9 +1502,9 @@ int do_uptime(int update_every, usec_t dt) {
NULL,
"System Uptime",
"seconds",
- "freebsd",
+ "freebsd.plugin",
"uptime",
- 1000,
+ NETDATA_CHART_PRIO_SYSTEM_UPTIME,
update_every,
RRDSET_TYPE_LINE
);
@@ -1613,9 +1630,9 @@ int do_net_isr(int update_every, usec_t dt) {
NULL,
"System softnet_stat",
"events/s",
- "freebsd",
+ "freebsd.plugin",
"net.isr",
- 955,
+ NETDATA_CHART_PRIO_SYSTEM_SOFTNET_STAT,
update_every,
RRDSET_TYPE_LINE
);
@@ -1666,9 +1683,9 @@ int do_net_isr(int update_every, usec_t dt) {
NULL,
"Per CPU netisr statistics",
"events/s",
- "freebsd",
+ "freebsd.plugin",
"net.isr",
- 1101 + i,
+ NETDATA_CHART_PRIO_SOFTNET_PER_CORE + i,
update_every,
RRDSET_TYPE_LINE
);
@@ -1728,7 +1745,7 @@ int do_net_inet_tcp_states(int update_every, usec_t dt) {
NULL,
"IPv4 TCP Connections",
"active connections",
- "freebsd",
+ "freebsd.plugin",
"net.inet.tcp.states",
2500,
update_every,
@@ -1812,7 +1829,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
NULL,
"IPv4 TCP Packets",
"packets/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet.tcp.stats",
2600,
update_every,
@@ -1844,7 +1861,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
NULL,
"IPv4 TCP Errors",
"packets/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet.tcp.stats",
2700,
update_every,
@@ -1886,7 +1903,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
NULL,
"IPv4 TCP Handshake Issues",
"events/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet.tcp.stats",
2900,
update_every,
@@ -1927,7 +1944,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
NULL,
"TCP Connection Aborts",
"connections/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet.tcp.stats",
3010,
update_every,
@@ -1967,7 +1984,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
NULL,
"TCP Out-Of-Order Queue",
"packets/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet.tcp.stats",
3050,
update_every,
@@ -1999,7 +2016,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
NULL,
"TCP SYN Cookies",
"packets/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet.tcp.stats",
3100,
update_every,
@@ -2036,7 +2053,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
NULL,
"TCP Listen Socket Issues",
"packets/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet.tcp.stats",
3015,
update_every,
@@ -2070,7 +2087,7 @@ int do_net_inet_tcp_stats(int update_every, usec_t dt) {
NULL,
"IPv4 ECN Statistics",
"packets/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet.tcp.stats",
8700,
update_every,
@@ -2144,7 +2161,7 @@ int do_net_inet_udp_stats(int update_every, usec_t dt) {
NULL,
"IPv4 UDP Packets",
"packets/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet.udp.stats",
2601,
update_every,
@@ -2177,7 +2194,7 @@ int do_net_inet_udp_stats(int update_every, usec_t dt) {
NULL,
"IPv4 UDP Errors",
"events/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet.udp.stats",
2701,
update_every,
@@ -2263,7 +2280,7 @@ int do_net_inet_icmp_stats(int update_every, usec_t dt) {
, NULL
, "IPv4 ICMP Packets"
, "packets/s"
- , "freebsd"
+ , "freebsd.plugin"
, "net.inet.icmp.stats"
, 2602
, update_every
@@ -2296,7 +2313,7 @@ int do_net_inet_icmp_stats(int update_every, usec_t dt) {
, NULL
, "IPv4 ICMP Errors"
, "packets/s"
- , "freebsd"
+ , "freebsd.plugin"
, "net.inet.icmp.stats"
, 2603
, update_every
@@ -2332,7 +2349,7 @@ int do_net_inet_icmp_stats(int update_every, usec_t dt) {
, NULL
, "IPv4 ICMP Messages"
, "packets/s"
- , "freebsd"
+ , "freebsd.plugin"
, "net.inet.icmp.stats"
, 2604
, update_every
@@ -2410,7 +2427,7 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
NULL,
"IPv4 Packets",
"packets/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet.ip.stats",
3000,
update_every,
@@ -2446,7 +2463,7 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
NULL,
"IPv4 Fragments Sent",
"packets/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet.ip.stats",
3010,
update_every,
@@ -2482,7 +2499,7 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
NULL,
"IPv4 Fragments Reassembly",
"packets/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet.ip.stats",
3011,
update_every,
@@ -2520,7 +2537,7 @@ int do_net_inet_ip_stats(int update_every, usec_t dt) {
NULL,
"IPv4 Errors",
"packets/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet.ip.stats",
3002,
update_every,
@@ -2611,7 +2628,7 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
NULL,
"IPv6 Packets",
"packets/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet6.ip6.stats",
3000,
update_every,
@@ -2651,7 +2668,7 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
NULL,
"IPv6 Fragments Sent",
"packets/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet6.ip6.stats",
3010,
update_every,
@@ -2691,7 +2708,7 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
NULL,
"IPv6 Fragments Reassembly",
"packets/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet6.ip6.stats",
3011,
update_every,
@@ -2742,7 +2759,7 @@ int do_net_inet6_ip6_stats(int update_every, usec_t dt) {
NULL,
"IPv6 Errors",
"packets/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet6.ip6.stats",
3002,
update_every,
@@ -2856,7 +2873,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
NULL,
"IPv6 ICMP Messages",
"messages/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet6.icmp6.stats",
10000,
update_every,
@@ -2891,7 +2908,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
NULL,
"IPv6 ICMP Redirects",
"redirects/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet6.icmp6.stats",
10050,
update_every,
@@ -2938,7 +2955,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
NULL,
"IPv6 ICMP Errors",
"errors/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet6.icmp6.stats",
10100,
update_every,
@@ -2993,7 +3010,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
NULL,
"IPv6 ICMP Echo",
"messages/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet6.icmp6.stats",
10200,
update_every,
@@ -3036,7 +3053,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
NULL,
"IPv6 Router Messages",
"messages/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet6.icmp6.stats",
10400,
update_every,
@@ -3079,7 +3096,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
NULL,
"IPv6 Neighbor Messages",
"messages/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet6.icmp6.stats",
10500,
update_every,
@@ -3129,7 +3146,7 @@ int do_net_inet6_icmp6_stats(int update_every, usec_t dt) {
NULL,
"IPv6 ICMP Types",
"messages/s",
- "freebsd",
+ "freebsd.plugin",
"net.inet6.icmp6.stats",
10700,
update_every,
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-08 16:28:33 +0000