diff options
Diffstat (limited to 'src/libs/zbxsysinfo/win32/win32.c')
| -rw-r--r-- | src/libs/zbxsysinfo/win32/win32.c | 71 |
1 files changed, 36 insertions, 35 deletions
diff --git a/src/libs/zbxsysinfo/win32/win32.c b/src/libs/zbxsysinfo/win32/win32.c index cd378909562..65ec0854913 100644 --- a/src/libs/zbxsysinfo/win32/win32.c +++ b/src/libs/zbxsysinfo/win32/win32.c @@ -18,62 +18,63 @@ **/ #include "zbxsysinfo.h" +#include "../sysinfo.h" #include "zbxwinservice.h" ZBX_METRIC parameters_specific[] = /* KEY FLAG FUNCTION TEST PARAMETERS */ { - {"vfs.fs.size", CF_HAVEPARAMS, VFS_FS_SIZE, "c:,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, "c:,free"}, + {"vfs.fs.discovery", 0, vfs_fs_discovery, NULL}, + {"vfs.fs.get", 0, vfs_fs_get, NULL}, - {"net.tcp.listen", CF_HAVEPARAMS, NET_TCP_LISTEN, "80"}, + {"net.tcp.listen", CF_HAVEPARAMS, net_tcp_listen, "80"}, - {"net.if.in", CF_HAVEPARAMS, NET_IF_IN, "MS TCP Loopback interface,bytes"}, - {"net.if.out", CF_HAVEPARAMS, NET_IF_OUT, "MS TCP Loopback interface,bytes"}, - {"net.if.total", CF_HAVEPARAMS, NET_IF_TOTAL, "MS TCP Loopback interface,bytes"}, - {"net.if.discovery", 0, NET_IF_DISCOVERY, NULL}, - {"net.if.list", 0, NET_IF_LIST, NULL}, + {"net.if.in", CF_HAVEPARAMS, net_if_in, "MS TCP Loopback interface,bytes"}, + {"net.if.out", CF_HAVEPARAMS, net_if_out, "MS TCP Loopback interface,bytes"}, + {"net.if.total", CF_HAVEPARAMS, net_if_total, "MS TCP Loopback interface,bytes"}, + {"net.if.discovery", 0, net_if_discovery, NULL}, + {"net.if.list", 0, net_if_list, NULL}, - {"vm.memory.size", CF_HAVEPARAMS, VM_MEMORY_SIZE, "free"}, + {"vm.memory.size", CF_HAVEPARAMS, vm_memory_size, "free"}, - {"proc.get", CF_HAVEPARAMS, PROC_GET, "svchost.exe"}, - {"proc.num", CF_HAVEPARAMS, PROC_NUM, "svchost.exe"}, + {"proc.get", CF_HAVEPARAMS, proc_get, "svchost.exe"}, + {"proc.num", CF_HAVEPARAMS, proc_num, "svchost.exe"}, - {"system.cpu.util", CF_HAVEPARAMS, SYSTEM_CPU_UTIL, "all,system,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.util", CF_HAVEPARAMS, system_cpu_util, "all,system,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.sw.arch", 0, SYSTEM_SW_ARCH, NULL}, + {"system.sw.arch", 0, system_sw_arch, NULL}, - {"system.swap.size", CF_HAVEPARAMS, SYSTEM_SWAP_SIZE, "all,free"}, - {"vm.vmemory.size", CF_HAVEPARAMS, VM_VMEMORY_SIZE, "total"}, + {"system.swap.size", CF_HAVEPARAMS, system_swap_size, "all,free"}, + {"vm.vmemory.size", CF_HAVEPARAMS, vm_vmemory_size, "total"}, - {"system.uptime", 0, SYSTEM_UPTIME, NULL}, + {"system.uptime", 0, system_uptime, NULL}, - {"system.uname", 0, SYSTEM_UNAME, NULL}, + {"system.uname", 0, system_uname, NULL}, - {"service.discovery", 0, SERVICE_DISCOVERY, NULL}, - {"service.info", CF_HAVEPARAMS, SERVICE_INFO, ZABBIX_SERVICE_NAME}, - {"service_state", CF_HAVEPARAMS, SERVICE_STATE, ZABBIX_SERVICE_NAME}, - {"services", CF_HAVEPARAMS, SERVICES, NULL}, - {"perf_counter", CF_HAVEPARAMS, PERF_COUNTER, "\\System\\Processes"}, - {"perf_counter_en", CF_HAVEPARAMS, PERF_COUNTER_EN, "\\System\\Processes"}, - {"perf_instance.discovery", CF_HAVEPARAMS, PERF_INSTANCE_DISCOVERY, "Processor"}, - {"perf_instance_en.discovery", CF_HAVEPARAMS, PERF_INSTANCE_DISCOVERY_EN, "Processor"}, - {"proc_info", CF_HAVEPARAMS, PROC_INFO, "svchost.exe"}, + {"service.discovery", 0, discover_services, NULL}, + {"service.info", CF_HAVEPARAMS, get_service_info, ZABBIX_SERVICE_NAME}, + {"service_state", CF_HAVEPARAMS, get_service_state, ZABBIX_SERVICE_NAME}, + {"services", CF_HAVEPARAMS, get_list_of_services, NULL}, + {"perf_counter", CF_HAVEPARAMS, perf_counter, "\\System\\Processes"}, + {"perf_counter_en", CF_HAVEPARAMS, perf_counter_en, "\\System\\Processes"}, + {"perf_instance.discovery", CF_HAVEPARAMS, perf_instance_discovery, "Processor"}, + {"perf_instance_en.discovery", CF_HAVEPARAMS, perf_instance_discovery_en, "Processor"}, + {"proc_info", CF_HAVEPARAMS, proc_info, "svchost.exe"}, - {"__UserPerfCounter", CF_HAVEPARAMS, USER_PERF_COUNTER, ""}, + {"__UserPerfCounter", CF_HAVEPARAMS, user_perf_counter, ""}, - {"wmi.get", CF_HAVEPARAMS, WMI_GET, + {"wmi.get", CF_HAVEPARAMS, wmi_get, "root\\cimv2,select Caption from Win32_OperatingSystem"}, - {"wmi.getall", CF_HAVEPARAMS, WMI_GETALL, + {"wmi.getall", CF_HAVEPARAMS, wmi_getall, "root\\cimv2,select * from Win32_OperatingSystem"}, - {"registry.data", CF_HAVEPARAMS, REGISTRY_DATA, NULL}, - {"registry.get", CF_HAVEPARAMS, REGISTRY_GET, NULL}, + {"registry.data", CF_HAVEPARAMS, registry_data, NULL}, + {"registry.get", CF_HAVEPARAMS, registry_get, NULL}, {NULL} }; |