Minor changes.

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

1 files changed, 42 insertions, 42 deletions

diff --git a/create/data/data.sql b/create/data/data.sql
index d410dc08..5bf1ff04 100644
--- a/create/data/data.sql
+++ b/create/data/data.sql
@@ -86,15 +86,15 @@ INSERT INTO hosts_groups VALUES (10007,1);
 -- Dumping data for table `items`
 --
 
-INSERT INTO items VALUES (10001,0,'','',161,10001,'Free memory','memory[free]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10002,0,'','',161,10001,'Free disk space on $1','diskfree[/]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',1,'',0,'',0);
-INSERT INTO items VALUES (10003,0,'','',161,10001,'Free disk space on $1','diskfree[/tmp]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',1,'',0,'',0);
-INSERT INTO items VALUES (10004,0,'','',161,10001,'Free disk space on $1','diskfree[/usr]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',1,'',0,'',0);
-INSERT INTO items VALUES (10005,0,'','',161,10001,'Free number of inodes on $1','inodefree[/]',60,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10006,0,'','',161,10001,'Free number of inodes on $1','inodefree[/opt]',60,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10007,0,'','',161,10001,'Free number of inodes on $1','inodefree[/tmp]',60,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10008,0,'','',161,10001,'Free number of inodes on $1','inodefree[/usr]',60,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10009,0,'','',161,10001,'Number of processes','system[proccount]',30,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10001,0,'','',161,10001,'Free memory','vm.memory.size[free]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10002,0,'','',161,10001,'Free disk space on $1','vfs.fs.size[/,free]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',1,'',0,'',0);
+INSERT INTO items VALUES (10003,0,'','',161,10001,'Free disk space on $1','vfs.fs.size[/tmp,free]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',1,'',0,'',0);
+INSERT INTO items VALUES (10004,0,'','',161,10001,'Free disk space on $1','vfs.fs.size[/usr,free]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',1,'',0,'',0);
+INSERT INTO items VALUES (10005,0,'','',161,10001,'Free number of inodes on $1','vfs.fs.inode[/,free]',60,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10006,0,'','',161,10001,'Free number of inodes on $1','vfs.fs.inode[/opt,free]',60,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10007,0,'','',161,10001,'Free number of inodes on $1','vfs.fs.inode[/tmp,free]',60,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10008,0,'','',161,10001,'Free number of inodes on $1','vfs.fs.inode[/usr,free]',60,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10009,0,'','',161,10001,'Number of processes','proc.num[]',30,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10010,0,'','',161,10001,'Processor load','system[procload]',5,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10011,0,'','',161,10001,'Processor load5','system[procload5]',10,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10012,0,'','',161,10001,'Processor load15','system[procload15]',20,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
@@ -102,19 +102,19 @@ INSERT INTO items VALUES (10013,0,'','',161,10001,'Number of running processes',
 INSERT INTO items VALUES (10014,0,'','',161,10001,'Free swap space','swap[free]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10015,0,'','',161,10001,'Size of $1','filesize[/var/log/syslog]',30,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10016,0,'','',161,10001,'Number of users connected','system[users]',30,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10017,0,'','',161,10001,'Checksum of $1','cksum[/etc/inetd.conf]',600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10018,0,'','',161,10001,'Checksum of $1','cksum[/vmlinuz]',600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10019,0,'','',161,10001,'Checksum of $1','cksum[/etc/passwd]',600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10017,0,'','',161,10001,'Checksum of $1','vfs.file.cksum[/etc/inetd.conf]',600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10018,0,'','',161,10001,'Checksum of $1','vfs.file.cksum[/vmlinuz]',600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10019,0,'','',161,10001,'Checksum of $1','vfs.file.cksum[/etc/passwd]',600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10020,0,'','',161,10001,'Ping to the server (TCP)','ping',30,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10021,0,'','',161,10001,'Free disk space on $1','diskfree[/home]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',1,'',0,'',0);
-INSERT INTO items VALUES (10022,0,'','',161,10001,'Free number of inodes on $1','inodefree[/home]',60,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10023,0,'','',161,10001,'Free disk space on $1','diskfree[/var]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',1,'',0,'',0);
-INSERT INTO items VALUES (10024,0,'','',161,10001,'Free disk space on $1','diskfree[/opt]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',1,'',0,'',0);
+INSERT INTO items VALUES (10021,0,'','',161,10001,'Free disk space on $1','vfs.fs.size[/home,free]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',1,'',0,'',0);
+INSERT INTO items VALUES (10022,0,'','',161,10001,'Free number of inodes on $1','vfs.fs.inode[/home,free]',60,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10023,0,'','',161,10001,'Free disk space on $1','vfs.fs.size[/var,free]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',1,'',0,'',0);
+INSERT INTO items VALUES (10024,0,'','',161,10001,'Free disk space on $1','vfs.fs.size[/opt,free]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',1,'',0,'',0);
 INSERT INTO items VALUES (10025,0,'','',161,10001,'Host uptime (in sec)','system[uptime]',300,7,365,0,NULL,NULL,NULL,0,0,'','s',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10026,0,'','',161,10001,'Total memory','memory[total]',1800,7,365,0,NULL,NULL,NULL,0,0,'','B',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10027,0,'','',161,10001,'Shared memory','memory[shared]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10028,0,'','',161,10001,'Buffers memory','memory[buffers]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10029,0,'','',161,10001,'Cached memory','memory[cached]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10026,0,'','',161,10001,'Total memory','vm.memory.size[total]',1800,7,365,0,NULL,NULL,NULL,0,0,'','B',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10027,0,'','',161,10001,'Shared memory','vm.memory.size[shared]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10028,0,'','',161,10001,'Buffers memory','vm.memory.size[buffers]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10029,0,'','',161,10001,'Cached memory','vm.memory.size[cached]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10030,0,'','',161,10001,'Total swap space','swap[total]',1800,7,365,0,NULL,NULL,NULL,0,0,'','B',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10031,0,'','',161,10001,'Email (SMTP) server is running','check_service[smtp]',60,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10032,0,'','',161,10001,'FTP server is running','check_service[ftp]',60,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
@@ -123,9 +123,9 @@ INSERT INTO items VALUES (10034,0,'','',161,10001,'Telnet server is running','ne
 INSERT INTO items VALUES (10035,0,'','',161,10001,'WEB server is running','net[listen_80]',60,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10036,0,'','',161,10001,'POP3 server is running','check_service[pop]',60,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10037,0,'','',161,10001,'IMAP server is running','check_service[imap]',60,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10038,0,'','',161,10001,'Checksum of $1','cksum[/usr/sbin/sshd]',600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10039,0,'','',161,10001,'Checksum of $1','cksum[/usr/bin/ssh]',600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10040,0,'','',161,10001,'Checksum of $1','cksum[/etc/services]',600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10038,0,'','',161,10001,'Checksum of $1','vfs.file.cksum[/usr/sbin/sshd]',600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10039,0,'','',161,10001,'Checksum of $1','vfs.file.cksum[/usr/bin/ssh]',600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10040,0,'','',161,10001,'Checksum of $1','vfs.file.cksum[/etc/services]',600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10041,0,'','',161,10001,'Number of disks read/write operations','io[disk_io]',30,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10042,0,'','',161,10001,'Number of disks read operations','io[disk_rio]',30,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10043,0,'','',161,10001,'Number of disks write operations','io[disk_wio]',30,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
@@ -147,16 +147,16 @@ INSERT INTO items VALUES (10058,0,'','',161,10001,'Host information','system[una
 INSERT INTO items VALUES (10059,0,'','',161,10001,'Version of zabbix_agent(d) running','version[zabbix_agent]',1800,7,365,0,NULL,NULL,NULL,0,1,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10060,0,'','',161,10001,'WEB (HTTP) server is running','check_service[http]',60,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10061,0,'','',161,10001,'Host status','status',60,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10062,0,'','',161,10001,'Total number of inodes on $1','inodetotal[/]',3600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10063,0,'','',161,10001,'Total number of inodes on $1','inodetotal[/opt]',3600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10064,0,'','',161,10001,'Total number of inodes on $1','inodetotal[/tmp]',3600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10065,0,'','',161,10001,'Total number of inodes on $1','inodetotal[/usr]',3600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10066,0,'','',161,10001,'Total number of inodes on $1','inodetotal[/home]',3600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10067,0,'','',161,10001,'Total disk space on $1','disktotal[/]',3600,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10068,0,'','',161,10001,'Total disk space on $1','disktotal[/opt]',3600,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10069,0,'','',161,10001,'Total disk space on $1','disktotal[/tmp]',3600,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10070,0,'','',161,10001,'Total disk space on $1','disktotal[/usr]',3600,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10071,0,'','',161,10001,'Total disk space on $1','disktotal[/home]',3600,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10062,0,'','',161,10001,'Total number of inodes on $1','vfs.fs.inode[/,total]',3600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10063,0,'','',161,10001,'Total number of inodes on $1','vfs.fs.inode[/opt,total]',3600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10064,0,'','',161,10001,'Total number of inodes on $1','vfs.fs.inode[/tmp,total]',3600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10065,0,'','',161,10001,'Total number of inodes on $1','vfs.fs.inode[/usr,total]',3600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10066,0,'','',161,10001,'Total number of inodes on $1','vfs.fs.inode[/home,total]',3600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10067,0,'','',161,10001,'Total disk space on $1','vfs.fs.size[/,total]',3600,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10068,0,'','',161,10001,'Total disk space on $1','vfs.fs.size[/opt,total]',3600,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10069,0,'','',161,10001,'Total disk space on $1','vfs.fs.size[/tmp,total]',3600,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10070,0,'','',161,10001,'Total disk space on $1','vfs.fs.size[/usr,total]',3600,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10071,0,'','',161,10001,'Total disk space on $1','vfs.fs.size[/home,total]',3600,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10072,0,'','',161,10001,'Incoming traffic on interface lo (1min)','netloadin1[lo]',5,7,365,0,NULL,NULL,NULL,0,0,'','Bps',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10073,0,'','',161,10001,'Incoming traffic on interface lo (5min)','netloadin5[lo]',10,7,365,0,NULL,NULL,NULL,0,0,'','Bps',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10074,0,'','',161,10001,'Incoming traffic on interface lo (15min)','netloadin15[lo]',20,7,365,0,NULL,NULL,NULL,0,0,'','Bps',0,0,NULL,'',0,'','',0,'',0,'',0);
@@ -196,28 +196,28 @@ INSERT INTO items VALUES (10417,0,'','',161,10001,'Used disk space on $1','disku
 INSERT INTO items VALUES (10418,0,'','',161,10001,'Temperature of mainboard','sensor[temp1]',30,7,365,0,NULL,NULL,NULL,0,0,'','C',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10419,0,'','',161,10001,'Temperature of CPU 1of2','sensor[temp2]',30,7,365,0,NULL,NULL,NULL,0,0,'','C',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10420,0,'','',161,10001,'Temperature of CPU 2of2','sensor[temp3]',30,7,365,0,NULL,NULL,NULL,0,0,'','C',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10090,0,'','',161,10002,'Free memory','memory[free]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10091,0,'','',161,10002,'Free disk space on $1','diskfree[c:]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',1,'',0,'',0);
-INSERT INTO items VALUES (10098,0,'','',161,10002,'Number of processes','system[proccount]',30,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10090,0,'','',161,10002,'Free memory','vm.memory.size[free]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10091,0,'','',161,10002,'Free disk space on $1','vfs.fs.size[c:,free]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',1,'',0,'',0);
+INSERT INTO items VALUES (10098,0,'','',161,10002,'Number of processes','proc.num[]',30,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10099,0,'','',161,10002,'Processor load','system[procload]',5,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10100,0,'','',161,10002,'Processor load5','system[procload5]',10,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10101,0,'','',161,10002,'Processor load15','system[procload15]',20,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10102,0,'','',161,10002,'Number of running processes','system[procrunning]',30,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10103,0,'','',161,10002,'Free swap space','swap[free]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10104,0,'','',161,10002,'Size of $1','filesize[c:\\msdos.sys]',30,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10106,0,'','',161,10002,'Checksum of $1','cksum[c:\\autoexec.bat]',600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10106,0,'','',161,10002,'Checksum of $1','vfs.file.cksum[c:\\autoexec.bat]',600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10109,0,'','',161,10002,'Ping to the server (TCP)','ping',30,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10114,0,'','',161,10002,'Host uptime (in sec)','system[uptime]',300,7,365,0,NULL,NULL,NULL,0,0,'','s',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10115,0,'','',161,10002,'Total memory','memory[total]',1800,7,365,0,NULL,NULL,NULL,0,0,'','B',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10115,0,'','',161,10002,'Total memory','vm.memory.size[total]',1800,7,365,0,NULL,NULL,NULL,0,0,'','B',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10119,0,'','',161,10002,'Total swap space','swap[total]',1800,7,365,0,NULL,NULL,NULL,0,0,'','B',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10137,0,'','',161,10002,'Number of running processes apache','proc_cnt[httpd]',60,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10147,0,'','',161,10002,'Host information','system[uname]',1800,7,365,0,NULL,NULL,NULL,0,1,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10148,0,'','',161,10002,'Version of zabbix_agent(d) running','version[zabbix_agent]',1800,7,365,0,NULL,NULL,NULL,0,1,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10150,0,'','',161,10002,'Host status','status',60,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10156,0,'','',161,10002,'Total disk space on $1','disktotal[c:]',3600,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10359,0,'','',161,10002,'Total disk space on $1','disktotal[d:]',3600,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10357,0,'','',161,10002,'Checksum of $1','cksum[c:\\config.sys]',600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10358,0,'','',161,10002,'Free disk space on $1','diskfree[d:]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',1,'',0,'',0);
+INSERT INTO items VALUES (10156,0,'','',161,10002,'Total disk space on $1','vfs.fs.size[c:,total]',3600,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10359,0,'','',161,10002,'Total disk space on $1','vfs.fs.size[d:,total]',3600,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10357,0,'','',161,10002,'Checksum of $1','vfs.file.cksum[c:\\config.sys]',600,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10358,0,'','',161,10002,'Free disk space on $1','vfs.fs.size[d:,free]',30,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',1,'',0,'',0);
 
 
 INSERT INTO items VALUES (10200,0,'','',161,10003,'MySQL is alive','mysql[ping]',60,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);