diff options
Diffstat (limited to 'src/libs/zbxsysinfo/linux/linux.c')
| -rw-r--r-- | src/libs/zbxsysinfo/linux/linux.c | 89 |
1 files changed, 45 insertions, 44 deletions
diff --git a/src/libs/zbxsysinfo/linux/linux.c b/src/libs/zbxsysinfo/linux/linux.c index d1038f05f19..540f309fa56 100644 --- a/src/libs/zbxsysinfo/linux/linux.c +++ b/src/libs/zbxsysinfo/linux/linux.c @@ -18,68 +18,69 @@ **/ #include "zbxsysinfo.h" +#include "../sysinfo.h" ZBX_METRIC parameters_specific[] = /* KEY FLAG FUNCTION TEST PARAMETERS */ { - {"kernel.maxfiles", 0, KERNEL_MAXFILES, NULL}, - {"kernel.maxproc", 0, KERNEL_MAXPROC, NULL}, - {"kernel.openfiles", 0, KERNEL_OPENFILES, NULL}, + {"kernel.maxfiles", 0, kernel_maxfiles, NULL}, + {"kernel.maxproc", 0, kernel_maxproc, NULL}, + {"kernel.openfiles", 0, kernel_openfiles, NULL}, - {"vfs.fs.size", CF_HAVEPARAMS, VFS_FS_SIZE, "/,free"}, - {"vfs.fs.inode", CF_HAVEPARAMS, VFS_FS_INODE, "/,free"}, - {"vfs.fs.discovery", 0, VFS_FS_DISCOVERY, NULL}, - {"vfs.fs.get", 0, VFS_FS_GET, NULL}, + {"vfs.fs.size", CF_HAVEPARAMS, vfs_fs_size, "/,free"}, + {"vfs.fs.inode", CF_HAVEPARAMS, vfs_fs_inode, "/,free"}, + {"vfs.fs.discovery", 0, vfs_fs_discovery, NULL}, + {"vfs.fs.get", 0, vfs_fs_get, NULL}, - {"vfs.dev.read", CF_HAVEPARAMS, VFS_DEV_READ, "sda,operations"}, - {"vfs.dev.write", CF_HAVEPARAMS, VFS_DEV_WRITE, "sda,operations"}, - {"vfs.dev.discovery", 0, VFS_DEV_DISCOVERY, NULL}, + {"vfs.dev.read", CF_HAVEPARAMS, vfs_dev_read, "sda,operations"}, + {"vfs.dev.write", CF_HAVEPARAMS, vfs_dev_write, "sda,operations"}, + {"vfs.dev.discovery", 0, vfs_dev_discovery, NULL}, - {"net.tcp.listen", CF_HAVEPARAMS, NET_TCP_LISTEN, "80"}, - {"net.udp.listen", CF_HAVEPARAMS, NET_UDP_LISTEN, "68"}, + {"net.tcp.listen", CF_HAVEPARAMS, net_tcp_listen, "80"}, + {"net.udp.listen", CF_HAVEPARAMS, net_udp_listen, "68"}, - {"net.tcp.socket.count",CF_HAVEPARAMS, NET_TCP_SOCKET_COUNT, ",80"}, - {"net.udp.socket.count",CF_HAVEPARAMS, NET_UDP_SOCKET_COUNT, ",68"}, + {"net.tcp.socket.count",CF_HAVEPARAMS, net_tcp_socket_count, ",80"}, + {"net.udp.socket.count",CF_HAVEPARAMS, net_udp_socket_count, ",68"}, - {"net.if.in", CF_HAVEPARAMS, NET_IF_IN, "lo,bytes"}, - {"net.if.out", CF_HAVEPARAMS, NET_IF_OUT, "lo,bytes"}, - {"net.if.total", CF_HAVEPARAMS, NET_IF_TOTAL, "lo,bytes"}, - {"net.if.collisions", CF_HAVEPARAMS, NET_IF_COLLISIONS, "lo"}, - {"net.if.discovery", 0, NET_IF_DISCOVERY, NULL}, + {"net.if.in", CF_HAVEPARAMS, net_if_in, "lo,bytes"}, + {"net.if.out", CF_HAVEPARAMS, net_if_out, "lo,bytes"}, + {"net.if.total", CF_HAVEPARAMS, net_if_total, "lo,bytes"}, + {"net.if.collisions", CF_HAVEPARAMS, net_if_collisions, "lo"}, + {"net.if.discovery", 0, net_if_discovery, NULL}, - {"vm.memory.size", CF_HAVEPARAMS, VM_MEMORY_SIZE, "total"}, + {"vm.memory.size", CF_HAVEPARAMS, vm_memory_size, "total"}, - {"proc.cpu.util", CF_HAVEPARAMS, PROC_CPU_UTIL, "inetd"}, - {"proc.get", CF_HAVEPARAMS, PROC_GET, "inetd"}, - {"proc.num", CF_HAVEPARAMS, PROC_NUM, "inetd"}, - {"proc.mem", CF_HAVEPARAMS, PROC_MEM, "inetd"}, + {"proc.cpu.util", CF_HAVEPARAMS, proc_cpu_util, "inetd"}, + {"proc.get", CF_HAVEPARAMS, proc_get, "inetd"}, + {"proc.num", CF_HAVEPARAMS, proc_num, "inetd"}, + {"proc.mem", CF_HAVEPARAMS, proc_mem, "inetd"}, - {"system.cpu.switches", 0, SYSTEM_CPU_SWITCHES, NULL}, - {"system.cpu.intr", 0, SYSTEM_CPU_INTR, NULL}, - {"system.cpu.util", CF_HAVEPARAMS, SYSTEM_CPU_UTIL, "all,user,avg1"}, - {"system.cpu.load", CF_HAVEPARAMS, SYSTEM_CPU_LOAD, "all,avg1"}, - {"system.cpu.num", CF_HAVEPARAMS, SYSTEM_CPU_NUM, "online"}, - {"system.cpu.discovery",0, SYSTEM_CPU_DISCOVERY, NULL}, + {"system.cpu.switches", 0, system_cpu_switches, NULL}, + {"system.cpu.intr", 0, system_cpu_intr, NULL}, + {"system.cpu.util", CF_HAVEPARAMS, system_cpu_util, "all,user,avg1"}, + {"system.cpu.load", CF_HAVEPARAMS, system_cpu_load, "all,avg1"}, + {"system.cpu.num", CF_HAVEPARAMS, system_cpu_num, "online"}, + {"system.cpu.discovery",0, system_cpu_discovery, NULL}, - {"system.uname", 0, SYSTEM_UNAME, NULL}, + {"system.uname", 0, system_uname, NULL}, - {"system.hw.chassis", CF_HAVEPARAMS, SYSTEM_HW_CHASSIS, NULL}, - {"system.hw.cpu", CF_HAVEPARAMS, SYSTEM_HW_CPU, NULL}, - {"system.hw.devices", CF_HAVEPARAMS, SYSTEM_HW_DEVICES, NULL}, - {"system.hw.macaddr", CF_HAVEPARAMS, SYSTEM_HW_MACADDR, NULL}, + {"system.hw.chassis", CF_HAVEPARAMS, system_hw_chassis, NULL}, + {"system.hw.cpu", CF_HAVEPARAMS, system_hw_cpu, NULL}, + {"system.hw.devices", CF_HAVEPARAMS, system_hw_devices, NULL}, + {"system.hw.macaddr", CF_HAVEPARAMS, system_hw_macaddr, NULL}, - {"system.sw.arch", 0, SYSTEM_SW_ARCH, NULL}, - {"system.sw.os", CF_HAVEPARAMS, SYSTEM_SW_OS, NULL}, - {"system.sw.packages", CF_HAVEPARAMS, SYSTEM_SW_PACKAGES, NULL}, + {"system.sw.arch", 0, system_sw_arch, NULL}, + {"system.sw.os", CF_HAVEPARAMS, system_sw_os, NULL}, + {"system.sw.packages", CF_HAVEPARAMS, system_sw_packages, NULL}, - {"system.swap.size", CF_HAVEPARAMS, SYSTEM_SWAP_SIZE, "all,free"}, - {"system.swap.in", CF_HAVEPARAMS, SYSTEM_SWAP_IN, "all"}, - {"system.swap.out", CF_HAVEPARAMS, SYSTEM_SWAP_OUT, "all"}, + {"system.swap.size", CF_HAVEPARAMS, system_swap_size, "all,free"}, + {"system.swap.in", CF_HAVEPARAMS, system_swap_in, "all"}, + {"system.swap.out", CF_HAVEPARAMS, system_swap_out, "all"}, - {"system.uptime", 0, SYSTEM_UPTIME, NULL}, - {"system.boottime", 0, SYSTEM_BOOTTIME, NULL}, + {"system.uptime", 0, system_uptime, NULL}, + {"system.boottime", 0, system_boottime, NULL}, - {"sensor", CF_HAVEPARAMS, GET_SENSOR, "w83781d-i2c-0-2d,temp1"}, + {"sensor", CF_HAVEPARAMS, get_sensor, "w83781d-i2c-0-2d,temp1"}, {NULL} }; |