Minor changes.

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

1 files changed, 17 insertions, 17 deletions

diff --git a/create/data/data.sql b/create/data/data.sql
index 5bf1ff04..087decbc 100644
--- a/create/data/data.sql
+++ b/create/data/data.sql
@@ -95,27 +95,27 @@ INSERT INTO items VALUES (10006,0,'','',161,10001,'Free number of inodes on $1',
 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);
+INSERT INTO items VALUES (10010,0,'','',161,10001,'Processor load','system.cpu.load[,avg1]',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.cpu.load[,avg5]',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.cpu.load[,avg15]',20,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10013,0,'','',161,10001,'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 (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 (10014,0,'','',161,10001,'Free swap space','system.swap.size[,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 (10016,0,'','',161,10001,'Number of users connected','system.users.num',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','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 (10020,0,'','',161,10001,'Ping to the server (TCP)','agent.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','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 (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','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 (10030,0,'','',161,10001,'Total swap space','system.swap.size[,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);
 INSERT INTO items VALUES (10033,0,'','',161,10001,'SSH server is running','check_service[ssh]',60,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
@@ -143,7 +143,7 @@ INSERT INTO items VALUES (10053,0,'','',161,10001,'Number of running processes $
 INSERT INTO items VALUES (10055,0,'','',161,10001,'Maximum number of processes','kern[maxproc]',1800,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10056,0,'','',161,10001,'Maximum number of opened files','kern[maxfiles]',1800,7,365,0,NULL,NULL,NULL,0,0,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 INSERT INTO items VALUES (10057,0,'','',161,10001,'Host name','system[hostname]',1800,7,365,0,NULL,NULL,NULL,0,1,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
-INSERT INTO items VALUES (10058,0,'','',161,10001,'Host information','system[uname]',1800,7,365,0,NULL,NULL,NULL,0,1,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
+INSERT INTO items VALUES (10058,0,'','',161,10001,'Host information','system.uname',1800,7,365,0,NULL,NULL,NULL,0,1,'','',0,0,NULL,'',0,'','',0,'',0,'',0);
 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);
@@ -199,19 +199,19 @@ INSERT INTO items VALUES (10420,0,'','',161,10001,'Temperature of CPU 2of2','sen
 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 (10099,0,'','',161,10002,'Processor load','system.cpu.load[,avg1]',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.cpu.load[,avg5]',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.cpu.load[,avg15]',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 (10103,0,'','',161,10002,'Free swap space','system.swap.size[,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','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 (10109,0,'','',161,10002,'Ping to the server (TCP)','agent.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','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 (10119,0,'','',161,10002,'Total swap space','system.swap.size[,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 (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','vfs.fs.size[c:,total]',3600,7,365,0,NULL,NULL,NULL,0,0,'','B',1,0,NULL,'',0,'','',0,'',0,'',0);