zabbix-1.2_dev integration

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

10 files changed, 68 insertions, 261 deletions

diff --git a/src/libs/zbxsysinfo/unknown/Makefile.am b/src/libs/zbxsysinfo/unknown/Makefile.am
index 94393287..1905eecf 100644
--- a/src/libs/zbxsysinfo/unknown/Makefile.am
+++ b/src/libs/zbxsysinfo/unknown/Makefile.am
@@ -3,4 +3,4 @@ SUBDIRS=
 libzbxsysinfo2_a_SOURCES=cpu.c diskio.c diskspace.c inodes.c kernel.c memory.c net.c proc.c sensors.c swap.c uptime.c
 
 lib_LIBRARIES=libzbxsysinfo2.a
-libzbxsysinfo2_a_LIBADD = ../../zbxcommon/libzbxcommon.a ../../zbxcrypto/libzbxcrypto.a
+#libzbxsysinfo2_a_LIBADD = ../../zbxcommon/libzbxcommon.a ../../zbxcrypto/libzbxcrypto.a
diff --git a/src/libs/zbxsysinfo/unknown/cpu.c b/src/libs/zbxsysinfo/unknown/cpu.c
index 75a8db56..135e7534 100644
--- a/src/libs/zbxsysinfo/unknown/cpu.c
+++ b/src/libs/zbxsysinfo/unknown/cpu.c
@@ -128,31 +128,31 @@ CPU_FNCLIST
                 return SYSINFO_RET_FAIL;
         }
 
-        if(get_param(param, 1, cpuname, MAX_STRING_LEN) != 0)
+        if(get_param(param, 1, cpuname, sizeof(cpuname)) != 0)
         {
                 return SYSINFO_RET_FAIL;
         }
 	if(cpuname[0] == '\0')
 	{
 		/* default parameter */
-		sprintf(cpuname, "all");
+		zbx_snprintf(cpuname, sizeof(cpuname), "all");
 	}
-	if(strncmp(cpuname, "all", MAX_STRING_LEN))
+	if(strncmp(cpuname, "all", sizeof(cpuname)))
 	{
 		return SYSINFO_RET_FAIL;
 	}
 	
-	if(get_param(param, 2, type, MAX_STRING_LEN) != 0)
+	if(get_param(param, 2, type, sizeof(type)) != 0)
         {
                 type[0] = '\0';
         }
         if(type[0] == '\0')
 	{
 		/* default parameter */
-		sprintf(type, "user");
+		zbx_snprintf(type, sizeof(type), "user");
 	}
 	
-	if(get_param(param, 3, mode, MAX_STRING_LEN) != 0)
+	if(get_param(param, 3, mode, sizeof(mode)) != 0)
         {
                 mode[0] = '\0';
         }
@@ -160,7 +160,7 @@ CPU_FNCLIST
         if(mode[0] == '\0')
 	{
 		/* default parameter */
-		sprintf(mode, "avg1");
+		zbx_snprintf(mode, sizeof(mode), "avg1");
 	}
 	
 	for(i=0; fl[i].type!=0; i++)
@@ -502,28 +502,28 @@ CPU_FNCLIST
                 return SYSINFO_RET_FAIL;
         }
 
-        if(get_param(param, 1, cpuname, MAX_STRING_LEN) != 0)
+        if(get_param(param, 1, cpuname, sizeof(cpuname)) != 0)
         {
                 return SYSINFO_RET_FAIL;
         }
 	if(cpuname[0] == '\0')
 	{
 		/* default parameter */
-		sprintf(cpuname, "all");
+		zbx_snprintf(cpuname, sizeof(cpuname), "all");
 	}
-	if(strncmp(cpuname, "all", MAX_STRING_LEN))
+	if(strncmp(cpuname, "all", sizeof(cpuname)))
 	{
 		return SYSINFO_RET_FAIL;
 	}
 	
-	if(get_param(param, 2, mode, MAX_STRING_LEN) != 0)
+	if(get_param(param, 2, mode, sizeof(mode)) != 0)
         {
                 mode[0] = '\0';
         }
         if(mode[0] == '\0')
 	{
 		/* default parameter */
-		sprintf(mode, "avg1");
+		zbx_snprintf(mode, sizeof(mode), "avg1");
 	}
 	for(i=0; fl[i].mode!=0; i++)
 	{
diff --git a/src/libs/zbxsysinfo/unknown/diskio.c b/src/libs/zbxsysinfo/unknown/diskio.c
index 333b177a..bad61e3a 100644
--- a/src/libs/zbxsysinfo/unknown/diskio.c
+++ b/src/libs/zbxsysinfo/unknown/diskio.c
@@ -26,7 +26,7 @@ static int	DISKREADOPS1(const char *cmd, const char *param, unsigned flags, AGEN
 {
 	char	key[MAX_STRING_LEN];
 
-	snprintf(key,sizeof(key)-1,"disk_read_ops1[%s]",param);
+	zbx_snprintf(key,sizeof(key),"disk_read_ops1[%s]",param);
 
 	return	get_stat(key, flags, result);
 }
@@ -35,7 +35,7 @@ static int	DISKREADOPS5(const char *cmd, const char *param, unsigned flags, AGEN
 {
 	char	key[MAX_STRING_LEN];
 
-	snprintf(key,sizeof(key)-1,"disk_read_ops5[%s]",param);
+	zbx_snprintf(key,sizeof(key),"disk_read_ops5[%s]",param);
 
 	return	get_stat(key, flags, result);
 }
@@ -44,7 +44,7 @@ static int	DISKREADOPS15(const char *cmd, const char *param, unsigned flags, AGE
 {
 	char	key[MAX_STRING_LEN];
 
-	snprintf(key,sizeof(key)-1,"disk_read_ops15[%s]",param);
+	zbx_snprintf(key,sizeof(key),"disk_read_ops15[%s]",param);
 
 	return	get_stat(key, flags, result);
 }
@@ -53,7 +53,7 @@ static int	DISKREADBLKS1(const char *cmd, const char *param, unsigned flags, AGE
 {
 	char	key[MAX_STRING_LEN];
 
-	snprintf(key,sizeof(key)-1,"disk_read_blks1[%s]",param);
+	zbx_snprintf(key,sizeof(key),"disk_read_blks1[%s]",param);
 
 	return	get_stat(key, flags, result);
 }
@@ -62,7 +62,7 @@ static int	DISKREADBLKS5(const char *cmd, const char *param, unsigned flags, AGE
 {
 	char	key[MAX_STRING_LEN];
 
-	snprintf(key,sizeof(key)-1,"disk_read_blks5[%s]",param);
+	zbx_snprintf(key,sizeof(key),"disk_read_blks5[%s]",param);
 
 	return	get_stat(key, flags, result);
 }
@@ -71,7 +71,7 @@ static int	DISKREADBLKS15(const char *cmd, const char *param, unsigned flags, AG
 {
 	char	key[MAX_STRING_LEN];
 
-	snprintf(key,sizeof(key)-1,"disk_read_blks15[%s]",param);
+	zbx_snprintf(key,sizeof(key),"disk_read_blks15[%s]",param);
 
 	return	get_stat(key, flags, result);
 }
@@ -80,7 +80,7 @@ static int	DISKWRITEOPS1(const char *cmd, const char *param, unsigned flags, AGE
 {
 	char	key[MAX_STRING_LEN];
 
-	snprintf(key,sizeof(key)-1,"disk_write_ops1[%s]",param);
+	zbx_snprintf(key,sizeof(key),"disk_write_ops1[%s]",param);
 
 	return	get_stat(key, flags, result);
 }
@@ -89,7 +89,7 @@ static int	DISKWRITEOPS5(const char *cmd, const char *param, unsigned flags, AGE
 {
 	char	key[MAX_STRING_LEN];
 
-	snprintf(key,sizeof(key)-1,"disk_write_ops5[%s]",param);
+	zbx_snprintf(key,sizeof(key),"disk_write_ops5[%s]",param);
 
 	return	get_stat(key, flags, result);
 }
@@ -98,7 +98,7 @@ static int	DISKWRITEOPS15(const char *cmd, const char *param, unsigned flags, AG
 {
 	char	key[MAX_STRING_LEN];
 
-	snprintf(key,sizeof(key)-1,"disk_write_ops15[%s]",param);
+	zbx_snprintf(key,sizeof(key),"disk_write_ops15[%s]",param);
 
 	return	get_stat(key, flags, result);
 }
@@ -107,7 +107,7 @@ static int	DISKWRITEBLKS1(const char *cmd, const char *param, unsigned flags, AG
 {
 	char	key[MAX_STRING_LEN];
 
-	snprintf(key,sizeof(key)-1,"disk_write_blks1[%s]",param);
+	zbx_snprintf(key,sizeof(key),"disk_write_blks1[%s]",param);
 
 	return	get_stat(key, flags, result);
 }
@@ -116,7 +116,7 @@ static int	DISKWRITEBLKS5(const char *cmd, const char *param, unsigned flags, AG
 {
 	char	key[MAX_STRING_LEN];
 
-	snprintf(key,sizeof(key)-1,"disk_write_blks5[%s]",param);
+	zbx_snprintf(key,sizeof(key), "disk_write_blks5[%s]",param);
 
 	return	get_stat(key, flags, result);
 }
@@ -125,7 +125,7 @@ static int	DISKWRITEBLKS15(const char *cmd, const char *param, unsigned flags, A
 {
 	char	key[MAX_STRING_LEN];
 
-	snprintf(key,sizeof(key)-1,"disk_write_blks15[%s]",param);
+	zbx_snprintf(key,sizeof(key),"disk_write_blks15[%s]",param);
 
 	return	get_stat(key, flags, result);
 }
@@ -166,19 +166,19 @@ DEV_FNCLIST
                 return SYSINFO_RET_FAIL;
         }
 
-        if(get_param(param, 1, devname, MAX_STRING_LEN) != 0)
+        if(get_param(param, 1, devname, sizeof(devname)) != 0)
         {
                 return SYSINFO_RET_FAIL;
         }
 	
-	if(get_param(param, 2, type, MAX_STRING_LEN) != 0)
+	if(get_param(param, 2, type, sizeof(type)) != 0)
         {
                 type[0] = '\0';
         }
         if(type[0] == '\0')
 	{
 		/* default parameter */
-		sprintf(type, "bps");
+		zbx_snprintf(type, sizeof(type), "bps");
 	}
 	
 	if(get_param(param, 3, mode, MAX_STRING_LEN) != 0)
@@ -189,7 +189,7 @@ DEV_FNCLIST
         if(mode[0] == '\0')
 	{
 		/* default parameter */
-		sprintf(mode, "avg1");
+		zbx_snprintf(mode, sizeof(mode), "avg1");
 	}
 	
 	for(i=0; fl[i].type!=0; i++)
@@ -242,22 +242,22 @@ DEV_FNCLIST
                 return SYSINFO_RET_FAIL;
         }
 
-        if(get_param(param, 1, devname, MAX_STRING_LEN) != 0)
+        if(get_param(param, 1, devname, sizeof(devname)) != 0)
         {
                 return SYSINFO_RET_FAIL;
         }
 	
-	if(get_param(param, 2, type, MAX_STRING_LEN) != 0)
+	if(get_param(param, 2, type, sizeof(type)) != 0)
         {
                 type[0] = '\0';
         }
         if(type[0] == '\0')
 	{
 		/* default parameter */
-		sprintf(type, "bps");
+		zbx_snprintf(type, sizeof(type), "bps");
 	}
 	
-	if(get_param(param, 3, mode, MAX_STRING_LEN) != 0)
+	if(get_param(param, 3, mode, sizeof(mode)) != 0)
         {
                 mode[0] = '\0';
         }
@@ -265,7 +265,7 @@ DEV_FNCLIST
         if(mode[0] == '\0')
 	{
 		/* default parameter */
-		sprintf(mode, "avg1");
+		zbx_snprintf(mode, sizeof(mode), "avg1");
 	}
 	
 	for(i=0; fl[i].type!=0; i++)
diff --git a/src/libs/zbxsysinfo/unknown/diskspace.c b/src/libs/zbxsysinfo/unknown/diskspace.c
index fd89f469..f37aeb7c 100644
--- a/src/libs/zbxsysinfo/unknown/diskspace.c
+++ b/src/libs/zbxsysinfo/unknown/diskspace.c
@@ -212,19 +212,19 @@ FS_FNCLIST
                 return SYSINFO_RET_FAIL;
         }
 
-        if(get_param(param, 1, fsname, MAX_STRING_LEN) != 0)
+        if(get_param(param, 1, fsname, sizeof(fsname)) != 0)
         {
                 return SYSINFO_RET_FAIL;
         }
 	
-	if(get_param(param, 2, mode, MAX_STRING_LEN) != 0)
+	if(get_param(param, 2, mode, sizeof(mode)) != 0)
         {
                 mode[0] = '\0';
         }
         if(mode[0] == '\0')
 	{
 		/* default parameter */
-		sprintf(mode, "total");
+		zbx_snprintf(mode, sizeof(mode), "total");
 	}
 	
 	for(i=0; fl[i].mode!=0; i++)
diff --git a/src/libs/zbxsysinfo/unknown/inodes.c b/src/libs/zbxsysinfo/unknown/inodes.c
index d773c1e0..b4af34c1 100644
--- a/src/libs/zbxsysinfo/unknown/inodes.c
+++ b/src/libs/zbxsysinfo/unknown/inodes.c
@@ -211,19 +211,19 @@ FS_FNCLIST
                 return SYSINFO_RET_FAIL;
         }
 
-        if(get_param(param, 1, fsname, MAX_STRING_LEN) != 0)
+        if(get_param(param, 1, fsname, sizeof(fsname)) != 0)
         {
                 return SYSINFO_RET_FAIL;
         }
 	
-	if(get_param(param, 2, mode, MAX_STRING_LEN) != 0)
+	if(get_param(param, 2, mode, sizeof(mode)) != 0)
         {
                 mode[0] = '\0';
         }
         if(mode[0] == '\0')
 	{
 		/* default parameter */
-		sprintf(mode, "total");
+		zbx_snprintf(mode, sizeof(mode), "total");
 	}
 	
 	for(i=0; fl[i].mode!=0; i++)
diff --git a/src/libs/zbxsysinfo/unknown/memory.c b/src/libs/zbxsysinfo/unknown/memory.c
index dab28847..60c3286f 100644
--- a/src/libs/zbxsysinfo/unknown/memory.c
+++ b/src/libs/zbxsysinfo/unknown/memory.c
@@ -34,8 +34,7 @@ static int	VM_MEMORY_CACHED(const char *cmd, const char *param, unsigned flags,
 
         init_result(result);
 
-        f=fopen("/proc/meminfo","r");
-        if(NULL == f)
+        if(NULL == (f = fopen("/proc/meminfo","r") ))
         {
                 return  SYSINFO_RET_FAIL;
         }
@@ -56,7 +55,7 @@ static int	VM_MEMORY_CACHED(const char *cmd, const char *param, unsigned flags,
                         break;
                 }
         }
-        fclose(f);
+        zbx_fclose(f);
 
         SET_UI64_RESULT(result, res);
         return SYSINFO_RET_OK;
@@ -387,7 +386,7 @@ MEM_FNCLIST
                 return SYSINFO_RET_FAIL;
         }
 
-        if(get_param(param, 1, mode, MAX_STRING_LEN) != 0)
+        if(get_param(param, 1, mode, sizeof(mode)) != 0)
         {
                 mode[0] = '\0';
         }
@@ -395,7 +394,7 @@ MEM_FNCLIST
         if(mode[0] == '\0')
 	{
 		/* default parameter */
-		sprintf(mode, "total");
+		zbx_snprintf(mode, sizeof(mode), "total");
 	}
 	
 	for(i=0; fl[i].mode!=0; i++)
diff --git a/src/libs/zbxsysinfo/unknown/proc.c b/src/libs/zbxsysinfo/unknown/proc.c
index f9ec223c..1f9b90e6 100644
--- a/src/libs/zbxsysinfo/unknown/proc.c
+++ b/src/libs/zbxsysinfo/unknown/proc.c
@@ -143,8 +143,7 @@ int     PROC_MEMORY(const char *cmd, const char *param, unsigned flags, AGENT_RE
     
         if(stat(filename,&buf)==0)
         {
-            f=fopen(filename,"r");
-            if(f==NULL)
+            if( NULL == (f = fopen(filename,"r") ))
             {
                 continue;
             }
@@ -165,7 +164,7 @@ int     PROC_MEMORY(const char *cmd, const char *param, unsigned flags, AGENT_RE
             
                 if(proc_ok == 0) 
                 {
-                    fclose(f);
+                    zbx_fclose(f);
                     continue;
                 }
             }
@@ -260,7 +259,7 @@ int     PROC_MEMORY(const char *cmd, const char *param, unsigned flags, AGENT_RE
             }
             
                     
-            fclose(f);
+            zbx_fclose(f);
         }
     }
     closedir(dir);
@@ -400,8 +399,7 @@ int	    PROC_NUM(const char *cmd, const char *param, unsigned flags, AGENT_RESUL
 
             if(stat(filename,&buf)==0)
             {
-                f=fopen(filename,"r");
-                if(f==NULL)
+                if(NULL == (f = fopen(filename,"r") ))
                 {
                     continue;
                 }
@@ -422,7 +420,7 @@ int	    PROC_NUM(const char *cmd, const char *param, unsigned flags, AGENT_RESUL
                 
                     if(proc_ok == 0) 
                     {
-                        fclose(f);
+                        zbx_fclose(f);
                         continue;
                     }
                 }
@@ -490,7 +488,7 @@ int	    PROC_NUM(const char *cmd, const char *param, unsigned flags, AGENT_RESUL
                     proccount++;
                 }
                 
-                fclose(f);
+                zbx_fclose(f);
             }
     }
     closedir(dir);
diff --git a/src/libs/zbxsysinfo/unknown/sensors.c b/src/libs/zbxsysinfo/unknown/sensors.c
index cc5a3af8..b01bfecc 100644
--- a/src/libs/zbxsysinfo/unknown/sensors.c
+++ b/src/libs/zbxsysinfo/unknown/sensors.c
@@ -53,13 +53,12 @@ static int	get_sensor(const char *name, unsigned flags, AGENT_RESULT *result)
 
 		if(stat(filename,&buf)==0)
 		{
-			f=fopen(filename,"r");
-			if(f==NULL)
+			if( NULL == (f = fopen(filename,"r") ))
 			{
 				continue;
 			}
 			fgets(line,MAX_STRING_LEN,f);
-			fclose(f);
+			zbx_fclose(f);
 
 			if(sscanf(line,"%lf\t%lf\t%lf\n",&d1, &d2, &d3) == 3)
 			{
diff --git a/src/libs/zbxsysinfo/unknown/swap.c b/src/libs/zbxsysinfo/unknown/swap.c
index 2bfd5511..ba48d579 100644
--- a/src/libs/zbxsysinfo/unknown/swap.c
+++ b/src/libs/zbxsysinfo/unknown/swap.c
@@ -211,7 +211,7 @@ SWP_FNCLIST
                 return SYSINFO_RET_FAIL;
         }
 
-        if(get_param(param, 1, swapdev, MAX_STRING_LEN) != 0)
+        if(get_param(param, 1, swapdev, sizeof(swapdev)) != 0)
         {
                 return SYSINFO_RET_FAIL;
         }
@@ -219,15 +219,15 @@ SWP_FNCLIST
         if(swapdev[0] == '\0')
 	{
 		/* default parameter */
-		sprintf(swapdev, "all");
+		zbx_snprintf(swapdev, sizeof(swapdev) "all");
 	}
 
-	if(strncmp(swapdev, "all", MAX_STRING_LEN))
+	if(strncmp(swapdev, "all", sizeof(swapdev)))
 	{
 		return SYSINFO_RET_FAIL;
 	}
 	
-	if(get_param(param, 2, mode, MAX_STRING_LEN) != 0)
+	if(get_param(param, 2, mode, sizeof(mode)) != 0)
         {
                 mode[0] = '\0';
         }
@@ -235,7 +235,7 @@ SWP_FNCLIST
         if(mode[0] == '\0')
 	{
 		/* default parameter */
-		sprintf(mode, "free");
+		zbx_snprintf(mode, sizeof(mode), "free");
 	}
 
 	for(i=0; fl[i].mode!=0; i++)
diff --git a/src/libs/zbxsysinfo/unknown/unknown.c b/src/libs/zbxsysinfo/unknown/unknown.c
index 62ae30c0..0591e666 100644
--- a/src/libs/zbxsysinfo/unknown/unknown.c
+++ b/src/libs/zbxsysinfo/unknown/unknown.c
@@ -25,212 +25,28 @@ ZBX_METRIC	parameters_specific[]=
 /* 	KEY			FLAG	FUNCTION 	ADD_PARAM	TEST_PARAM */
 	{
 
-/* Outdated */
-/* incorrect OLD naming */
-	{"cpu",			CF_USEUPARAM,	OLD_CPU, 	0,	"idle1"},
-/*
-	{"cpu[idle1]",		0,	0, 	0,	0},
-	{"cpu[idle5]",		0,	0, 	0,	0},
-	{"cpu[idle15]",		0,	0, 	0,	0},
-	{"cpu[nice1]",		0,	0, 	0,	0},
-	{"cpu[nice5]",		0,	0, 	0,	0},
-	{"cpu[nice15]",		0,	0, 	0,	0},
-	{"cpu[system1]",	0,	0, 	0,	0},
-	{"cpu[system5]",	0,	0, 	0,	0},
-	{"cpu[system15]",	0,	0, 	0,	0},
-	{"cpu[user1]",		0,	0, 	0,	0},
-	{"cpu[user5]",		0,	0, 	0,	0},
-	{"cpu[user15]",		0,	0, 	0,	0},
-*/
-	{"io",			CF_USEUPARAM,	OLD_IO,  	0,	"disk_io"},
-/*
-	{"io[disk_io]",		0,	0,  	0,	0},
-	{"io[disk_rio]",	0,	0, 	0,	0},
-	{"io[disk_wio]",	0,	0, 	0,	0},
-	{"io[disk_rblk]",	0,	0, 	0,	0},
-	{"io[disk_wblk]",	0,	0, 	0,	0},
-*/
-	{"kern",		CF_USEUPARAM,	OLD_KERNEL,	0,	"maxfiles"},
-/*
-	{"kern[maxfiles]",	0,	0,	0,	0},
-	{"kern[maxproc]",	0,	0,	0,	0},
-*/
-	{"memory",		CF_USEUPARAM,	OLD_MEMORY,	0,	"buffers"},
-/*
-	{"memory[buffers]",	0,	0,	0,	0},
-	{"memory[cached]",	0,	0, 	0,	0},
-	{"memory[free]",	0,	0, 	0,	0},
-	{"memory[shared]",	0,	0, 	0,	0},
-	{"memory[total]",	0,	0,	0,	0},
-*/
-	{"system",		CF_USEUPARAM,	OLD_SYSTEM, 	0,	"uname"},
-/*
-	{"system[proccount]",	0,	0, 	0,	0},
-
-	{"system[procload]",	0,	0, 	0,	0},
-	{"system[procload5]",	0,	0, 	0,	0},
-	{"system[procload15]",	0,	0, 	0,	0},
-	{"system[hostname]",	0,	0, 	0,	0},
-	{"system[uname]",	0,	0, 	0,	0},
-	{"system[uptime]",	0,	0,	0,	0},
-	{"system[users]",	0,	0, 	0,	0},
-
-	{"system[procrunning]",	0,	0, 	0,	0},
-*/
-	{"sensor",		CF_USEUPARAM,	OLD_SENSOR, 	0,	"temp1"},
-/*
-	{"sensor[temp1]",	0,	0, 	0,	0},
-	{"sensor[temp2]",	0,	0, 	0,	0},
-	{"sensor[temp3]",	0,	0, 	0,	0},
-*/	
-	{"swap",		CF_USEUPARAM,	OLD_SWAP,	0,	"total"},
-/*
-	{"swap[free]",		0,	0,	0,	0},
-	{"swap[total]",		0,	0,	0,	0},
-*/
-	{"version",		CF_USEUPARAM,	OLD_VERSION,	0,	"zabbix_agent"},
-/*
-	{"version[zabbix_agent]",	0,	OLD_VERSION, 		0,	0},
-*/
-/* correct OLD naming */	
-/*
-	{"cksum",		CF_USEUPARAM,	VFS_FILE_CKSUM, 	0,	"/etc/services"},
-*/
-/*
- 	{"diskfree",		CF_USEUPARAM,	VFS_FS_FREE,		0,	"/"},
-	{"disktotal",		CF_USEUPARAM,	VFS_FS_TOTAL,		0,	"/"},
-	{"diskused",		CF_USEUPARAM,	VFS_FS_USED,		0,	"/"},
-	{"diskfree_perc",	CF_USEUPARAM,	VFS_FS_PFREE,		0,	"/"},
-	{"diskused_perc",	CF_USEUPARAM,	VFS_FS_PUSED,		0,	"/"},
-*/
-/*
-	{"file",		CF_USEUPARAM,	VFS_FILE_EXISTS,	0,	"/etc/passwd"},
-	{"filesize",		CF_USEUPARAM,	VFS_FILE_SIZE, 		0,	"/etc/passwd"},
-*/
-/*
-	{"inodefree",		CF_USEUPARAM,	VFS_FS_INODE_FREE,	0,	"/"},
-	{"inodetotal",		CF_USEUPARAM,	VFS_FS_INODE_TOTAL,	0,	"/"},
-	{"inodefree_perc",	CF_USEUPARAM,	VFS_FS_INODE_PFREE,	0,	"/"},
-*/
-/*
-	{"md5sum",		CF_USEUPARAM,	VFS_FILE_MD5SUM,	0,	"/etc/services"},
-*/
-/*
-	{"netloadin1",		CF_USEUPARAM,	NET_IF_IBYTES1,		0,	"lo"},
-	{"netloadin5",		CF_USEUPARAM,	NET_IF_IBYTES5,		0,	"lo"},
-	{"netloadin15",		CF_USEUPARAM,	NET_IF_IBYTES15,	0,	"lo"},
-	{"netloadout1",		CF_USEUPARAM,	NET_IF_OBYTES1,		0,	"lo"},
-	{"netloadout5",		CF_USEUPARAM,	NET_IF_OBYTES5, 	0,	"lo"},
-	{"netloadout15",	CF_USEUPARAM,	NET_IF_OBYTES15,	0,	"lo"},
-*/
-/*
-	{"ping",		0,		AGENT_PING, 		0,	0},
-*/	
-/* New naming  */
-/*
-	{"system.cpu.idle1",	0,	SYSTEM_CPU_IDLE1, 	0,	0},
-	{"system.cpu.idle5",	0,	SYSTEM_CPU_IDLE5, 	0,	0},
-	{"system.cpu.idle15",	0,	SYSTEM_CPU_IDLE15, 	0,	0},
-	{"system.cpu.nice1",	0,	SYSTEM_CPU_NICE1, 	0,	0},
-	{"system.cpu.nice5",	0,	SYSTEM_CPU_NICE5, 	0,	0},
-	{"system.cpu.nice15",	0,	SYSTEM_CPU_NICE15, 	0,	0},
-	{"system.cpu.sys1",	0,	SYSTEM_CPU_SYS1, 	0,	0},
-	{"system.cpu.sys5",	0,	SYSTEM_CPU_SYS5, 	0,	0},
-	{"system.cpu.sys15",	0,	SYSTEM_CPU_SYS15, 	0,	0},
-	{"system.cpu.user1",	0,	SYSTEM_CPU_USER1, 	0,	0},
-	{"system.cpu.user5",	0,	SYSTEM_CPU_USER5, 	0,	0},
-	{"system.cpu.user15",	0,	SYSTEM_CPU_USER15, 	0,	0},
-*/
-/*
-	{"vm.memory.total",	0,	VM_MEMORY_TOTAL,	0,	0},
-	{"vm.memory.shared",	0,	VM_MEMORY_SHARED,	0,	0},
-	{"vm.memory.buffers",	0,	VM_MEMORY_BUFFERS,	0,	0},
-	{"vm.memory.cached",	0,	VM_MEMORY_CACHED, 	0,	0},
-	{"vm.memory.free",	0,	VM_MEMORY_FREE, 	0,	0},
-*/
-/*
-	{"vfs.fs.free",		CF_USEUPARAM,	VFS_FS_FREE,		0,	"/"},
-	{"vfs.fs.total",	CF_USEUPARAM,	VFS_FS_TOTAL,		0,	"/"},
-	{"vfs.fs.used",		CF_USEUPARAM,	VFS_FS_USED,		0,	"/"},
-	{"vfs.fs.pfree",	CF_USEUPARAM,	VFS_FS_PFREE,		0,	"/"},
-	{"vfs.fs.pused",	CF_USEUPARAM,	VFS_FS_PUSED,		0,	"/"},
-*/
-/*
-	{"vfs.fs.inode.free",	CF_USEUPARAM,	VFS_FS_INODE_FREE,	0,	"/"},
-	{"vfs.fs.inode.total",	CF_USEUPARAM,	VFS_FS_INODE_TOTAL,	0,	"/"},
-	{"vfs.fs.inode.pfree",	CF_USEUPARAM,	VFS_FS_INODE_PFREE,	0,	"/"},
-*/
-/*
-	{"net.if.ibytes1",	CF_USEUPARAM,	NET_IF_IBYTES1,	0,	"lo"},
-	{"net.if.ibytes5",	CF_USEUPARAM,	NET_IF_IBYTES5,	0,	"lo"},
-	{"net.if.ibytes15",	CF_USEUPARAM,	NET_IF_IBYTES15,0,	"lo"},
-
-	{"net.if.obytes1",	CF_USEUPARAM,	NET_IF_OBYTES1,	0,	"lo"},
-	{"net.if.obytes5",	CF_USEUPARAM,	NET_IF_OBYTES5,	0,	"lo"},
-	{"net.if.obytes15",	CF_USEUPARAM,	NET_IF_OBYTES15,0,	"lo"},
-*/
-/*
-	{"disk_read_ops1",	CF_USEUPARAM,	DISKREADOPS1, 	0,	"hda"},
-	{"disk_read_ops5",	CF_USEUPARAM,	DISKREADOPS5, 	0,	"hda"},
-	{"disk_read_ops15",	CF_USEUPARAM,	DISKREADOPS15,	0,	"hda"},
-
-	{"disk_read_blks1",	CF_USEUPARAM,	DISKREADBLKS1,	0,	"hda"},
-	{"disk_read_blks5",	CF_USEUPARAM,	DISKREADBLKS5,	0,	"hda"},
-	{"disk_read_blks15",	CF_USEUPARAM,	DISKREADBLKS15,	0,	"hda"},
-
-	{"disk_write_ops1",	CF_USEUPARAM,	DISKWRITEOPS1, 	0,	"hda"},
-	{"disk_write_ops5",	CF_USEUPARAM,	DISKWRITEOPS5, 	0,	"hda"},
-	{"disk_write_ops15",	CF_USEUPARAM,	DISKWRITEOPS15,	0,	"hda"},
-
-	{"disk_write_blks1",	CF_USEUPARAM,	DISKWRITEBLKS1,	0,	"hda"},
-	{"disk_write_blks5",	CF_USEUPARAM,	DISKWRITEBLKS5,	0,	"hda"},
-	{"disk_write_blks15",	CF_USEUPARAM,	DISKWRITEBLKS15,0,	"hda"},
-*/
-/*
-	{"system.cpu.load1",	0,	SYSTEM_CPU_LOAD1,	0,	0},
-	{"system.cpu.load5",	0,	SYSTEM_CPU_LOAD5,	0,	0},
-	{"system.cpu.load15",	0,	SYSTEM_CPU_LOAD15,	0,	0},
-*/
-
-/****************************************
-  	All these perameters require more than 1 second to retrieve.
-
-  	{"swap[in]"		,EXECUTE, 0, "vmstat -n 1 2|tail -1|cut -b37-40"},
-	{"swap[out]"		,EXECUTE, 0, "vmstat -n 1 2|tail -1|cut -b41-44"},
-
-	{"system[interrupts]"	,EXECUTE, 0, "vmstat -n 1 2|tail -1|cut -b57-61"},
-	{"system[switches]"	,EXECUTE, 0, "vmstat -n 1 2|tail -1|cut -b62-67"},
-***************************************/
-
-/*	{"tcp_count"		,EXECUTE, 	0, "netstat -tn|grep EST|wc -l"}, */
-/*
-	{"check_port",		CF_USEUPARAM,	CHECK_PORT,		0,	"80"},
-	{"check_service",	CF_USEUPARAM,	CHECK_SERVICE, 		0,	"ssh,127.0.0.1,22"},
-	{"check_service_perf", 	CF_USEUPARAM,	CHECK_SERVICE_PERF, 	0,	"ssh,127.0.0.1,22"},
-*/
-/*
-	{"dns",			CF_USEUPARAM,	CHECK_DNS,		0,	"127.0.0.1,localhost"},
-*/
 	{"agent.ping",		0,	AGENT_PING, 		0,	0},
 	{"agent.version",	0,	AGENT_VERSION,		0,	0},
 
 	{"kernel.maxfiles",	0,	KERNEL_MAXFILES,	0,	0},
 	{"kernel.maxproc",	0,	KERNEL_MAXPROC, 	0,	0},
 
+	{"vfs.file.exists",	CF_USEUPARAM,	VFS_FILE_EXISTS,	0,	"/etc/passwd"},
+	{"vfs.file.time",       CF_USEUPARAM,   VFS_FILE_TIME,          0,      "/etc/passwd,modify"},
+	{"vfs.file.size",	CF_USEUPARAM,	VFS_FILE_SIZE, 		0,	"/etc/passwd"},
+	{"vfs.file.regexp",	CF_USEUPARAM,	VFS_FILE_REGEXP,	0,	"/etc/passwd,root"},
+	{"vfs.file.regmatch",	CF_USEUPARAM,	VFS_FILE_REGMATCH, 	0,	"/etc/passwd,root"},
 	{"vfs.file.cksum",	CF_USEUPARAM,	VFS_FILE_CKSUM,		0,	"/etc/services"},
 	{"vfs.file.md5sum",	CF_USEUPARAM,	VFS_FILE_MD5SUM,	0,	"/etc/services"},
 
-/************************************
- *          NEW FUNCTIONS           *
- ************************************/
+	{"vfs.fs.size",		CF_USEUPARAM,	VFS_FS_SIZE,	0,	"/,free"},
+	{"vfs.fs.inode",	CF_USEUPARAM,	VFS_FS_INODE,	0,	"/,free"},
 
-	{"system.cpu.switches", 0,              SYSTEM_CPU_SWITCHES,    0,      0},
-	{"system.cpu.intr",     0,              SYSTEM_CPU_INTR,        0,      0},
+	{"vfs.dev.read",	CF_USEUPARAM,	VFS_DEV_READ,	0,	"hda,ops,avg1"},
+	{"vfs.dev.write",	CF_USEUPARAM,	VFS_DEV_WRITE,	0,	"hda,ops,avg1"},
 
 	{"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"},
@@ -240,19 +56,14 @@ ZBX_METRIC	parameters_specific[]=
 	{"net.if.total",	CF_USEUPARAM,	NET_IF_TOTAL,	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.switches", 0,              SYSTEM_CPU_SWITCHES,    0,      0},
+	{"system.cpu.intr",     0,              SYSTEM_CPU_INTR,        0,      0},
 	{"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"},