Minor fixes.

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

1 files changed, 50 insertions, 50 deletions

diff --git a/create/data/data.sql b/create/data/data.sql
index c4e9e69a..19da464c 100644
--- a/create/data/data.sql
+++ b/create/data/data.sql
@@ -78,10 +78,10 @@ insert into hosts_groups (groupid,hostid) values (1,10004);
 -- Data for table items
 --
 
-INSERT INTO items VALUES (10001,0,'','',161,10001,'Free memory','memory[free]',30,30,0,0,NULL,NULL,NULL,0,0,'','bytes',0);
-INSERT INTO items VALUES (10002,0,'','',161,10001,'Free disk space on /','diskfree[/]',30,30,0,0,NULL,NULL,NULL,0,0,'','bytes',1);
-INSERT INTO items VALUES (10003,0,'','',161,10001,'Free disk space on /tmp','diskfree[/tmp]',30,30,0,0,NULL,NULL,NULL,0,0,'','bytes',1);
-INSERT INTO items VALUES (10004,0,'','',161,10001,'Free disk space on /usr','diskfree[/usr]',30,30,0,0,NULL,NULL,NULL,0,0,'','bytes',1);
+INSERT INTO items VALUES (10001,0,'','',161,10001,'Free memory','memory[free]',30,30,0,0,NULL,NULL,NULL,0,0,'','B',0);
+INSERT INTO items VALUES (10002,0,'','',161,10001,'Free disk space on /','diskfree[/]',30,30,0,0,NULL,NULL,NULL,0,0,'','B',1);
+INSERT INTO items VALUES (10003,0,'','',161,10001,'Free disk space on /tmp','diskfree[/tmp]',30,30,0,0,NULL,NULL,NULL,0,0,'','B',1);
+INSERT INTO items VALUES (10004,0,'','',161,10001,'Free disk space on /usr','diskfree[/usr]',30,30,0,0,NULL,NULL,NULL,0,0,'','B',1);
 INSERT INTO items VALUES (10005,0,'','',161,10001,'Free number of inodes on /','inodefree[/]',60,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10006,0,'','',161,10001,'Free number of inodes on /opt','inodefree[/opt]',60,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10007,0,'','',161,10001,'Free number of inodes on /tmp','inodefree[/tmp]',60,30,0,0,NULL,NULL,NULL,0,0,'','',0);
@@ -91,23 +91,23 @@ INSERT INTO items VALUES (10010,0,'','',161,10001,'Processor load','system[procl
 INSERT INTO items VALUES (10011,0,'','',161,10001,'Processor load5','system[procload5]',10,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10012,0,'','',161,10001,'Processor load15','system[procload15]',20,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10013,0,'','',161,10001,'Number of running processes','system[procrunning]',30,30,0,0,NULL,NULL,NULL,0,0,'','',0);
-INSERT INTO items VALUES (10014,0,'','',161,10001,'Free swap space','swap[free]',30,30,0,0,NULL,NULL,NULL,0,0,'','bytes',0);
+INSERT INTO items VALUES (10014,0,'','',161,10001,'Free swap space','swap[free]',30,30,0,0,NULL,NULL,NULL,0,0,'','B',0);
 INSERT INTO items VALUES (10015,0,'','',161,10001,'Size of /var/log/syslog','filesize[/var/log/syslog]',30,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10016,0,'','',161,10001,'Number of users connected','system[users]',30,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10017,0,'','',161,10001,'Checksum of /etc/inetd.conf','cksum[/etc/inetd.conf]',600,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10018,0,'','',161,10001,'Checksum of /vmlinuz','cksum[/vmlinuz]',600,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10019,0,'','',161,10001,'Checksum of /etc/passwd','cksum[/etc/passwd]',600,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10020,0,'','',161,10001,'Ping to the server (TCP)','ping',30,30,0,0,NULL,NULL,NULL,0,0,'','',0);
-INSERT INTO items VALUES (10021,0,'','',161,10001,'Free disk space on /home','diskfree[/home]',30,30,0,0,NULL,NULL,NULL,0,0,'','bytes',1);
+INSERT INTO items VALUES (10021,0,'','',161,10001,'Free disk space on /home','diskfree[/home]',30,30,0,0,NULL,NULL,NULL,0,0,'','B',1);
 INSERT INTO items VALUES (10022,0,'','',161,10001,'Free number of inodes on /home','inodefree[/home]',60,30,0,0,NULL,NULL,NULL,0,0,'','',0);
-INSERT INTO items VALUES (10023,0,'','',161,10001,'Free disk space on /var','diskfree[/var]',30,30,0,0,NULL,NULL,NULL,0,0,'','bytes',1);
-INSERT INTO items VALUES (10024,0,'','',161,10001,'Free disk space on /opt','diskfree[/opt]',30,30,0,0,NULL,NULL,NULL,0,0,'','bytes',1);
+INSERT INTO items VALUES (10023,0,'','',161,10001,'Free disk space on /var','diskfree[/var]',30,30,0,0,NULL,NULL,NULL,0,0,'','B',1);
+INSERT INTO items VALUES (10024,0,'','',161,10001,'Free disk space on /opt','diskfree[/opt]',30,30,0,0,NULL,NULL,NULL,0,0,'','B',1);
 INSERT INTO items VALUES (10025,0,'','',161,10001,'Host uptime (in sec)','system[uptime]',300,30,0,0,NULL,NULL,NULL,0,0,'','',0);
-INSERT INTO items VALUES (10026,0,'','',161,10001,'Total memory','memory[total]',1800,30,0,0,NULL,NULL,NULL,0,0,'','bytes',0);
-INSERT INTO items VALUES (10027,0,'','',161,10001,'Shared memory','memory[shared]',30,30,0,0,NULL,NULL,NULL,0,0,'','bytes',0);
-INSERT INTO items VALUES (10028,0,'','',161,10001,'Buffers memory','memory[buffers]',30,30,0,0,NULL,NULL,NULL,0,0,'','bytes',0);
-INSERT INTO items VALUES (10029,0,'','',161,10001,'Cached memory','memory[cached]',30,30,0,0,NULL,NULL,NULL,0,0,'','bytes',0);
-INSERT INTO items VALUES (10030,0,'','',161,10001,'Total swap space','swap[total]',1800,30,0,0,NULL,NULL,NULL,0,0,'','bytes',0);
+INSERT INTO items VALUES (10026,0,'','',161,10001,'Total memory','memory[total]',1800,30,0,0,NULL,NULL,NULL,0,0,'','B',0);
+INSERT INTO items VALUES (10027,0,'','',161,10001,'Shared memory','memory[shared]',30,30,0,0,NULL,NULL,NULL,0,0,'','B',0);
+INSERT INTO items VALUES (10028,0,'','',161,10001,'Buffers memory','memory[buffers]',30,30,0,0,NULL,NULL,NULL,0,0,'','B',0);
+INSERT INTO items VALUES (10029,0,'','',161,10001,'Cached memory','memory[cached]',30,30,0,0,NULL,NULL,NULL,0,0,'','B',0);
+INSERT INTO items VALUES (10030,0,'','',161,10001,'Total swap space','swap[total]',1800,30,0,0,NULL,NULL,NULL,0,0,'','B',0);
 INSERT INTO items VALUES (10031,0,'','',161,10001,'Email (SMTP) server is running','check_service[smtp]',60,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10032,0,'','',161,10001,'FTP server is running','check_service[ftp]',60,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10033,0,'','',161,10001,'SSH server is running','check_service[ssh]',60,30,0,0,NULL,NULL,NULL,0,0,'','',0);
@@ -144,29 +144,29 @@ INSERT INTO items VALUES (10063,0,'','',161,10001,'Total number of inodes on /op
 INSERT INTO items VALUES (10064,0,'','',161,10001,'Total number of inodes on /tmp','inodetotal[/tmp]',3600,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10065,0,'','',161,10001,'Total number of inodes on /usr','inodetotal[/usr]',3600,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10066,0,'','',161,10001,'Total number of inodes on /home','inodetotal[/home]',3600,30,0,0,NULL,NULL,NULL,0,0,'','',0);
-INSERT INTO items VALUES (10067,0,'','',161,10001,'Total disk space on /','disktotal[/]',3600,30,0,0,NULL,NULL,NULL,0,0,'','bytes',1);
-INSERT INTO items VALUES (10068,0,'','',161,10001,'Total disk space on /opt','disktotal[/opt]',3600,30,0,0,NULL,NULL,NULL,0,0,'','bytes',1);
-INSERT INTO items VALUES (10069,0,'','',161,10001,'Total disk space on /tmp','disktotal[/tmp]',3600,30,0,0,NULL,NULL,NULL,0,0,'','bytes',1);
-INSERT INTO items VALUES (10070,0,'','',161,10001,'Total disk space on /usr','disktotal[/usr]',3600,30,0,0,NULL,NULL,NULL,0,0,'','bytes',1);
-INSERT INTO items VALUES (10071,0,'','',161,10001,'Total disk space on /home','disktotal[/home]',3600,30,0,0,NULL,NULL,NULL,0,0,'','bytes',1);
-INSERT INTO items VALUES (10072,0,'','',161,10001,'Incoming traffic on interface lo (1min)','netloadin1[lo]',5,30,0,0,NULL,NULL,NULL,0,0,'','bps',0);
-INSERT INTO items VALUES (10073,0,'','',161,10001,'Incoming traffic on interface lo (5min)','netloadin5[lo]',10,30,0,0,NULL,NULL,NULL,0,0,'','bps',0);
-INSERT INTO items VALUES (10074,0,'','',161,10001,'Incoming traffic on interface lo (15min)','netloadin15[lo]',20,30,0,0,NULL,NULL,NULL,0,0,'','bps',0);
-INSERT INTO items VALUES (10075,0,'','',161,10001,'Incoming traffic on interface eth0 (1min)','netloadin1[eth0]',5,30,0,0,NULL,NULL,NULL,0,0,'','bps',0);
-INSERT INTO items VALUES (10076,0,'','',161,10001,'Incoming traffic on interface eth0 (5min)','netloadin5[eth0]',10,30,0,0,NULL,NULL,NULL,0,0,'','bps',0);
-INSERT INTO items VALUES (10077,0,'','',161,10001,'Incoming traffic on interface eth0 (15min)','netloadin15[eth0]',20,30,0,0,NULL,NULL,NULL,0,0,'','bps',0);
-INSERT INTO items VALUES (10078,0,'','',161,10001,'Incoming traffic on interface eth1 (1min)','netloadin1[eth1]',5,30,0,0,NULL,NULL,NULL,0,0,'','bps',0);
-INSERT INTO items VALUES (10079,0,'','',161,10001,'Incoming traffic on interface eth1 (5min)','netloadin5[eth1]',10,30,0,0,NULL,NULL,NULL,0,0,'','bps',0);
-INSERT INTO items VALUES (10080,0,'','',161,10001,'Incoming traffic on interface eth1 (15min)','netloadin15[eth1]',20,30,0,0,NULL,NULL,NULL,0,0,'','bps',0);
-INSERT INTO items VALUES (10081,0,'','',161,10001,'Outgoing traffic on interface lo (1min)','netloadout1[lo]',5,30,0,0,NULL,NULL,NULL,0,0,'','bps',0);
-INSERT INTO items VALUES (10082,0,'','',161,10001,'Outgoing traffic on interface lo (5min)','netloadout5[lo]',10,30,0,0,NULL,NULL,NULL,0,0,'','bps',0);
-INSERT INTO items VALUES (10083,0,'','',161,10001,'Outgoing traffic on interface lo (15min)','netloadout15[lo]',20,30,0,0,NULL,NULL,NULL,0,0,'','bps',0);
-INSERT INTO items VALUES (10084,0,'','',161,10001,'Outgoing traffic on interface eth0 (1min)','netloadout1[eth0]',5,30,0,0,NULL,NULL,NULL,0,0,'','bps',0);
-INSERT INTO items VALUES (10085,0,'','',161,10001,'Outgoing traffic on interface eth0 (5min)','netloadout5[eth0]',10,30,0,0,NULL,NULL,NULL,0,0,'','bps',0);
-INSERT INTO items VALUES (10086,0,'','',161,10001,'Outgoing traffic on interface eth0 (15min)','netloadout15[eth0]',20,30,0,0,NULL,NULL,NULL,0,0,'','bps',0);
-INSERT INTO items VALUES (10087,0,'','',161,10001,'Outgoing traffic on interface eth1 (1min)','netloadout1[eth1]',5,30,0,0,NULL,NULL,NULL,0,0,'','bps',0);
-INSERT INTO items VALUES (10088,0,'','',161,10001,'Outgoing traffic on interface eth1 (5min)','netloadout5[eth1]',10,30,0,0,NULL,NULL,NULL,0,0,'','bps',0);
-INSERT INTO items VALUES (10089,0,'','',161,10001,'Outgoing traffic on interface eth1 (15min)','netloadout15[eth1]',20,30,0,0,NULL,NULL,NULL,0,0,'','bps',0);
+INSERT INTO items VALUES (10067,0,'','',161,10001,'Total disk space on /','disktotal[/]',3600,30,0,0,NULL,NULL,NULL,0,0,'','B',1);
+INSERT INTO items VALUES (10068,0,'','',161,10001,'Total disk space on /opt','disktotal[/opt]',3600,30,0,0,NULL,NULL,NULL,0,0,'','B',1);
+INSERT INTO items VALUES (10069,0,'','',161,10001,'Total disk space on /tmp','disktotal[/tmp]',3600,30,0,0,NULL,NULL,NULL,0,0,'','B',1);
+INSERT INTO items VALUES (10070,0,'','',161,10001,'Total disk space on /usr','disktotal[/usr]',3600,30,0,0,NULL,NULL,NULL,0,0,'','B',1);
+INSERT INTO items VALUES (10071,0,'','',161,10001,'Total disk space on /home','disktotal[/home]',3600,30,0,0,NULL,NULL,NULL,0,0,'','B',1);
+INSERT INTO items VALUES (10072,0,'','',161,10001,'Incoming traffic on interface lo (1min)','netloadin1[lo]',5,30,0,0,NULL,NULL,NULL,0,0,'','Bps',0);
+INSERT INTO items VALUES (10073,0,'','',161,10001,'Incoming traffic on interface lo (5min)','netloadin5[lo]',10,30,0,0,NULL,NULL,NULL,0,0,'','Bps',0);
+INSERT INTO items VALUES (10074,0,'','',161,10001,'Incoming traffic on interface lo (15min)','netloadin15[lo]',20,30,0,0,NULL,NULL,NULL,0,0,'','Bps',0);
+INSERT INTO items VALUES (10075,0,'','',161,10001,'Incoming traffic on interface eth0 (1min)','netloadin1[eth0]',5,30,0,0,NULL,NULL,NULL,0,0,'','Bps',0);
+INSERT INTO items VALUES (10076,0,'','',161,10001,'Incoming traffic on interface eth0 (5min)','netloadin5[eth0]',10,30,0,0,NULL,NULL,NULL,0,0,'','Bps',0);
+INSERT INTO items VALUES (10077,0,'','',161,10001,'Incoming traffic on interface eth0 (15min)','netloadin15[eth0]',20,30,0,0,NULL,NULL,NULL,0,0,'','Bps',0);
+INSERT INTO items VALUES (10078,0,'','',161,10001,'Incoming traffic on interface eth1 (1min)','netloadin1[eth1]',5,30,0,0,NULL,NULL,NULL,0,0,'','Bps',0);
+INSERT INTO items VALUES (10079,0,'','',161,10001,'Incoming traffic on interface eth1 (5min)','netloadin5[eth1]',10,30,0,0,NULL,NULL,NULL,0,0,'','Bps',0);
+INSERT INTO items VALUES (10080,0,'','',161,10001,'Incoming traffic on interface eth1 (15min)','netloadin15[eth1]',20,30,0,0,NULL,NULL,NULL,0,0,'','Bps',0);
+INSERT INTO items VALUES (10081,0,'','',161,10001,'Outgoing traffic on interface lo (1min)','netloadout1[lo]',5,30,0,0,NULL,NULL,NULL,0,0,'','Bps',0);
+INSERT INTO items VALUES (10082,0,'','',161,10001,'Outgoing traffic on interface lo (5min)','netloadout5[lo]',10,30,0,0,NULL,NULL,NULL,0,0,'','Bps',0);
+INSERT INTO items VALUES (10083,0,'','',161,10001,'Outgoing traffic on interface lo (15min)','netloadout15[lo]',20,30,0,0,NULL,NULL,NULL,0,0,'','Bps',0);
+INSERT INTO items VALUES (10084,0,'','',161,10001,'Outgoing traffic on interface eth0 (1min)','netloadout1[eth0]',5,30,0,0,NULL,NULL,NULL,0,0,'','Bps',0);
+INSERT INTO items VALUES (10085,0,'','',161,10001,'Outgoing traffic on interface eth0 (5min)','netloadout5[eth0]',10,30,0,0,NULL,NULL,NULL,0,0,'','Bps',0);
+INSERT INTO items VALUES (10086,0,'','',161,10001,'Outgoing traffic on interface eth0 (15min)','netloadout15[eth0]',20,30,0,0,NULL,NULL,NULL,0,0,'','Bps',0);
+INSERT INTO items VALUES (10087,0,'','',161,10001,'Outgoing traffic on interface eth1 (1min)','netloadout1[eth1]',5,30,0,0,NULL,NULL,NULL,0,0,'','Bps',0);
+INSERT INTO items VALUES (10088,0,'','',161,10001,'Outgoing traffic on interface eth1 (5min)','netloadout5[eth1]',10,30,0,0,NULL,NULL,NULL,0,0,'','Bps',0);
+INSERT INTO items VALUES (10089,0,'','',161,10001,'Outgoing traffic on interface eth1 (15min)','netloadout15[eth1]',20,30,0,0,NULL,NULL,NULL,0,0,'','Bps',0);
 
 
 INSERT INTO items VALUES (10400,0,'','',161,10001,'Number of read operations on disk hda (1min)','disk_read_ops1[hda]',5,30,0,0,NULL,NULL,NULL,0,0,'','',0);
@@ -182,37 +182,37 @@ INSERT INTO items VALUES (10408,0,'','',161,10001,'Number of read operations on
 INSERT INTO items VALUES (10409,0,'','',161,10001,'Number of write operations on disk hdb (1min)','disk_write_ops1[hdb]',5,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10410,0,'','',161,10001,'Number of write operations on disk hdb (5min)','disk_write_ops5[hdb]',10,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10411,0,'','',161,10001,'Number of write operations on disk hdb (15min)','disk_write_ops15[hdb]',20,30,0,0,NULL,NULL,NULL,0,0,'','',0);
-INSERT INTO items VALUES (10412,0,'','',161,10001,'Used disk space on /','diskused[/]',30,30,0,0,NULL,NULL,NULL,0,0,'','bytes',1);
-INSERT INTO items VALUES (10413,0,'','',161,10001,'Used disk space on /opt','diskused[/opt]',30,30,0,0,NULL,NULL,NULL,0,0,'','bytes',1);
-INSERT INTO items VALUES (10414,0,'','',161,10001,'Used disk space on /var','diskused[/var]',30,30,0,0,NULL,NULL,NULL,0,0,'','bytes',1);
-INSERT INTO items VALUES (10415,0,'','',161,10001,'Used disk space on /tmp','diskused[/tmp]',30,30,0,0,NULL,NULL,NULL,0,0,'','bytes',1);
-INSERT INTO items VALUES (10416,0,'','',161,10001,'Used disk space on /usr','diskused[/usr]',30,30,0,0,NULL,NULL,NULL,0,0,'','bytes',1);
-INSERT INTO items VALUES (10417,0,'','',161,10001,'Used disk space on /home','diskused[/home]',30,30,0,0,NULL,NULL,NULL,0,0,'','bytes',1);
+INSERT INTO items VALUES (10412,0,'','',161,10001,'Used disk space on /','diskused[/]',30,30,0,0,NULL,NULL,NULL,0,0,'','B',1);
+INSERT INTO items VALUES (10413,0,'','',161,10001,'Used disk space on /opt','diskused[/opt]',30,30,0,0,NULL,NULL,NULL,0,0,'','B',1);
+INSERT INTO items VALUES (10414,0,'','',161,10001,'Used disk space on /var','diskused[/var]',30,30,0,0,NULL,NULL,NULL,0,0,'','B',1);
+INSERT INTO items VALUES (10415,0,'','',161,10001,'Used disk space on /tmp','diskused[/tmp]',30,30,0,0,NULL,NULL,NULL,0,0,'','B',1);
+INSERT INTO items VALUES (10416,0,'','',161,10001,'Used disk space on /usr','diskused[/usr]',30,30,0,0,NULL,NULL,NULL,0,0,'','B',1);
+INSERT INTO items VALUES (10417,0,'','',161,10001,'Used disk space on /home','diskused[/home]',30,30,0,0,NULL,NULL,NULL,0,0,'','B',1);
 
 
 
-INSERT INTO items VALUES (10090,0,'','',161,10002,'Free memory','memory[free]',30,30,0,0,NULL,NULL,NULL,0,0,'','bytes',0);
-INSERT INTO items VALUES (10091,0,'','',161,10002,'Free disk space on c:','diskfree[c:]',30,30,0,0,NULL,NULL,NULL,0,0,'','bytes',1);
+INSERT INTO items VALUES (10090,0,'','',161,10002,'Free memory','memory[free]',30,30,0,0,NULL,NULL,NULL,0,0,'','B',0);
+INSERT INTO items VALUES (10091,0,'','',161,10002,'Free disk space on c:','diskfree[c:]',30,30,0,0,NULL,NULL,NULL,0,0,'','B',1);
 INSERT INTO items VALUES (10098,0,'','',161,10002,'Number of processes','system[proccount]',30,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10099,0,'','',161,10002,'Processor load','system[procload]',5,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10100,0,'','',161,10002,'Processor load5','system[procload5]',10,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10101,0,'','',161,10002,'Processor load15','system[procload15]',20,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10102,0,'','',161,10002,'Number of running processes','system[procrunning]',30,30,0,0,NULL,NULL,NULL,0,0,'','',0);
-INSERT INTO items VALUES (10103,0,'','',161,10002,'Free swap space','swap[free]',30,30,0,0,NULL,NULL,NULL,0,0,'','bytes',0);
+INSERT INTO items VALUES (10103,0,'','',161,10002,'Free swap space','swap[free]',30,30,0,0,NULL,NULL,NULL,0,0,'','B',0);
 INSERT INTO items VALUES (10104,0,'','',161,10002,'Size of c:\\msdos.sys','filesize[c:\\msdos.sys]',30,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10106,0,'','',161,10002,'Checksum of c:\\autoexec.bat','cksum[c:\\autoexec.bat]',600,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10109,0,'','',161,10002,'Ping to the server (TCP)','ping',30,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10114,0,'','',161,10002,'Host uptime (in sec)','system[uptime]',300,30,0,0,NULL,NULL,NULL,0,0,'','',0);
-INSERT INTO items VALUES (10115,0,'','',161,10002,'Total memory','memory[total]',1800,30,0,0,NULL,NULL,NULL,0,0,'','bytes',0);
-INSERT INTO items VALUES (10119,0,'','',161,10002,'Total swap space','swap[total]',1800,30,0,0,NULL,NULL,NULL,0,0,'','bytes',0);
+INSERT INTO items VALUES (10115,0,'','',161,10002,'Total memory','memory[total]',1800,30,0,0,NULL,NULL,NULL,0,0,'','B',0);
+INSERT INTO items VALUES (10119,0,'','',161,10002,'Total swap space','swap[total]',1800,30,0,0,NULL,NULL,NULL,0,0,'','B',0);
 INSERT INTO items VALUES (10137,0,'','',161,10002,'Number of running processes apache','proc_cnt[httpd]',60,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10147,0,'','',161,10002,'Host information','system[uname]',1800,30,0,0,NULL,NULL,NULL,0,1,'','',0);
 INSERT INTO items VALUES (10148,0,'','',161,10002,'Version of zabbix_agent(d) running','version[zabbix_agent]',1800,30,0,0,NULL,NULL,NULL,0,1,'','',0);
 INSERT INTO items VALUES (10150,0,'','',161,10002,'Host status','status',60,30,0,0,NULL,NULL,NULL,0,0,'','',0);
-INSERT INTO items VALUES (10156,0,'','',161,10002,'Total disk space on c:','disktotal[c:]',3600,30,0,0,NULL,NULL,NULL,0,0,'','bytes',1);
-INSERT INTO items VALUES (10359,0,'','',161,10002,'Total disk space on d:','disktotal[d:]',3600,30,0,0,NULL,NULL,NULL,0,0,'','bytes',1);
+INSERT INTO items VALUES (10156,0,'','',161,10002,'Total disk space on c:','disktotal[c:]',3600,30,0,0,NULL,NULL,NULL,0,0,'','B',1);
+INSERT INTO items VALUES (10359,0,'','',161,10002,'Total disk space on d:','disktotal[d:]',3600,30,0,0,NULL,NULL,NULL,0,0,'','B',1);
 INSERT INTO items VALUES (10357,0,'','',161,10002,'Checksum of c:\\config.sys','cksum[c:\\config.sys]',600,30,0,0,NULL,NULL,NULL,0,0,'','',0);
-INSERT INTO items VALUES (10358,0,'','',161,10002,'Free disk space on d:','diskfree[d:]',30,30,0,0,NULL,NULL,NULL,0,0,'','bytes',1);
+INSERT INTO items VALUES (10358,0,'','',161,10002,'Free disk space on d:','diskfree[d:]',30,30,0,0,NULL,NULL,NULL,0,0,'','B',1);
 
 INSERT INTO items VALUES (10298,3,'','',161,10004,'Email (SMTP) server is running','smtp',60,30,0,0,NULL,NULL,NULL,0,0,'','',0);
 INSERT INTO items VALUES (10299,3,'','',161,10004,'FTP server is running','ftp',60,30,0,0,NULL,NULL,NULL,0,0,'','',0);