- integrated 'OpenBSD3.7.c' functionality (Eugene)

git-svn-id: svn://svn.zabbix.com/trunk@2259 97f52cf1-0a1b-0410-bd0e-c28be96e8082

2 files changed, 32 insertions, 6 deletions

diff --git a/src/libs/zbxsysinfo/aix/aix.c b/src/libs/zbxsysinfo/aix/aix.c
index df66bf38..e635572f 100644
--- a/src/libs/zbxsysinfo/aix/aix.c
+++ b/src/libs/zbxsysinfo/aix/aix.c
@@ -231,32 +231,40 @@ ZBX_METRIC	parameters_specific[]=
  *          NEW FUNCTIONS           *
  ************************************/
 
+	{"system.cpu.switches", 0,              SYSTEM_CPU_SWITCHES,    0,      0},
+	{"system.cpu.intr",     0,              SYSTEM_CPU_INTR,        0,      0},
+
 	{"net.tcp.dns",		CF_USEUPARAM,	CHECK_DNS,		0,	"127.0.0.1,localhost"},
-	
+
+	{"net.tcp.listen",      CF_USEUPARAM,   NET_TCP_LISTEN, 0,      "80"},	
+
 	{"net.tcp.port",	CF_USEUPARAM,	CHECK_PORT,		0,	"80"},
 	{"net.tcp.service",	CF_USEUPARAM,	CHECK_SERVICE, 		0,	"ssh,127.0.0.1,22"},
 	{"net.tcp.service.perf",CF_USEUPARAM,	CHECK_SERVICE_PERF, 	0,	"ssh,127.0.0.1,22"},
-	
+
 	{"net.if.in",		CF_USEUPARAM,	NET_IF_IN,	0,	"lo,bytes"},
 	{"net.if.out",		CF_USEUPARAM,	NET_IF_OUT,	0,	"lo,bytes"},
+        {"net.if.collisions",   CF_USEUPARAM,   NET_IF_COLLISIONS,      0,      "lo"},
 
 	{"vfs.fs.size",		CF_USEUPARAM,	VFS_FS_SIZE,	0,	"/,free"},
 	{"vfs.fs.inode",	CF_USEUPARAM,	VFS_FS_INODE,	0,	"/,free"},
 
 	{"vfs.dev.read",	CF_USEUPARAM,	VFS_DEV_READ,	0,	"hda,ops,avg1"},
 	{"vfs.dev.write",	CF_USEUPARAM,	VFS_DEV_WRITE,	0,	"hda,ops,avg1"},
-	
+
 	{"vm.memory.size",	CF_USEUPARAM,	VM_MEMORY_SIZE,	0,	"free"},
-	
+
 	{"proc.num",		CF_USEUPARAM,	PROC_NUM,	0,	"inetd,,"},
 	{"proc.mem",		CF_USEUPARAM,	PROC_MEMORY,	0,	"inetd,,"},
 
 	{"system.cpu.util",	CF_USEUPARAM,	SYSTEM_CPU_UTIL,	0,	"all,user,avg1"},
 
 	{"system.cpu.load",	CF_USEUPARAM,	SYSTEM_CPU_LOAD,	0,	"all,avg1"},
-	
+
 	{"system.swap.size",	CF_USEUPARAM,	SYSTEM_SWAP_SIZE,	0,	"all,free"},
-	
+	{"system.swap.in",      CF_USEUPARAM,   SYSTEM_SWAP_SIZE,       0,      "all"},
+	{"system.swap.out",     CF_USEUPARAM,   SYSTEM_SWAP_SIZE,       0,      "all,count"},	
+
 	{"system.hostname",	0,	SYSTEM_HOSTNAME,	0,	0},
 
 	{"system.uname",	0,	SYSTEM_UNAME,		0,	0},
diff --git a/src/libs/zbxsysinfo/aix/cpu.c b/src/libs/zbxsysinfo/aix/cpu.c
index 4e7e1502..f45b39db 100644
--- a/src/libs/zbxsysinfo/aix/cpu.c
+++ b/src/libs/zbxsysinfo/aix/cpu.c
@@ -548,3 +548,21 @@ CPU_FNCLIST
 	return SYSINFO_RET_FAIL;
 }
 
+int     SYSTEM_CPU_SWITCHES(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
+{
+        assert(result);
+
+        clean_result(result);
+	
+	return SYSINFO_RET_FAIL;
+}
+
+int     SYSTEM_CPU_INTR(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
+{
+        assert(result);
+
+        clean_result(result);
+	
+	return SYSINFO_RET_FAIL;
+}
+