- added selection button for item keys (Alexei)

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

7 files changed, 225 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 9d024b05..5cffd613 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Changes for 1.1beta10:
 
+ - added selection button for item keys (Alexei)
  - new table 'help_items' (Alexei)
  - fixed confugration of triggers having logseverity() (Alexei)
  - changed size of functions.function to varchar(12) (Alexei)
diff --git a/TODO b/TODO
index 1a5b129d..2a7b0ee3 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,4 @@
 1.1beta9:
- - item key popup, trigger expression builder
  - fix windows agent crash
 
  - support of PostgreSQL
diff --git a/create/data/data.sql b/create/data/data.sql
index c535bbe9..fdb41bcd 100644
--- a/create/data/data.sql
+++ b/create/data/data.sql
@@ -83,6 +83,79 @@ INSERT INTO hosts_groups VALUES (10004,1);
 INSERT INTO hosts_groups VALUES (10007,1);
 
 --
+-- Dumping data for table `help_items`
+--
+
+
+insert into help_items values (3,'icmpping','Checks if server accessible by ICMP ping	0 - ICMP ping fails 1 - ICMP ping successful	One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds.');
+insert into help_items values (3,'icmppingsec','Return ICMP ping response time	Number of seconds Example: 0.02');
+insert into help_items values (3,'ftp<,port>','Checks if FTP server is running and accepting connections	0 - FTP server is down 1 - FTP server is running');
+insert into help_items values (3,'http<,port>','Checks if HTTP (WEB) server is running and accepting connections	0 - HTTP server is down 1 - HTTP server is running');
+insert into help_items values (3,'imap<,port>','Checks if IMAP server is running and accepting connections	0 - IMAP server is down 1 - IMAP server is running');
+insert into help_items values (3,'nntp<,port>','Checks if NNTP server is running and accepting connections	0 - NNTP server is down 1 - NNTP server is running');
+insert into help_items values (3,'pop<,port>','Checks if POP server is running and accepting connections	0 - POP server is down 1 - POP server is running');
+insert into help_items values (3,'smtp<,port>','Checks if SMTP server is running and accepting connections	0 - SMTP server is down 1 - SMTP server is running');
+insert into help_items values (3,'ssh<,port>','Checks if SSH server is running and accepting connections	0 - SSH server is down 1 - SSH server is running');
+insert into help_items values (3,'tcp,port','Checks if TCP service is running and accepting connections on port	0 - the serivce on the por t is down 1 - the service is running');
+insert into help_items values (3,'ftp_perf<,port>','Checks if FTP server is running and accepting connections	0 - FTP server is down Otherwise, number of milliseconds spent connecting to FTP server');
+insert into help_items values (3,'http_perf<,port>','Checks if HTTP (WEB) server is running and accepting connections	0 - HTTP server is down Otherwise, number of milliseconds spent connecting to HTTP server');
+insert into help_items values (3,'imap_perf<,port>','Checks if IMAP server is running and accepting connections	0 - IMAP server is down Otherwise, number of milliseconds spent connecting to IMAP server');
+insert into help_items values (3,'nntp_perf<,port>','Checks if NNTP server is running and accepting connections	0 - NNTP server is down Otherwise, number of milliseconds spent connecting to NNTP server');
+insert into help_items values (3,'pop_perf<,port>','Checks if POP server is running and accepting connections	0 - POP server is down Otherwise, number of milliseconds spent connecting to POP server');
+insert into help_items values (3,'smtp_perf<,port>','Checks if SMTP server is running and accepting connections	0 - SMTP server is down Otherwise, number of milliseconds spent connecting to SMTP server');
+insert into help_items values (3,'ssh_perf<,port>','Checks if SSH server is running and accepting connections	0 - SSH server is down Otherwise, number of milliseconds spent connecting to SSH server');
+
+insert into help_items values (5,'zabbix[history]','Number of values stored in table HISTORY');
+insert into help_items values (5,'zabbix[history_str]','Number of values stored in table HISTORY_STR');
+insert into help_items values (5,'zabbix[items]','Number of items in ZABBIX database');
+insert into help_items values (5,'zabbix[items_unsupported]','Number of unsupported items in ZABBIX database');
+insert into help_items values (5,'zabbix[log]','Stores warning and error messages generated by ZABBIX server.');
+insert into help_items values (5,'zabbix[queue]','Number of items in the queue');
+insert into help_items values (5,'zabbix[trends]','Number of values stored in table TRENDS');
+insert into help_items values (5,'zabbix[triggers]','Number of triggers in ZABBIX database');
+
+insert into help_items values (8,'grpfunc(<Group>,<Key>,<func>,<param>)','Aggregate checks does not require any agent running on a host being monitored. ZABBIX server collects aggregate information by doing direct database queries. See ZABBIX Manual.');
+
+insert into help_items values(0,'agent.ping','Check the agent usability. Always return 1. Can be used as a TCP ping.');
+insert into help_items values(0,'agent.version','Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1');
+insert into help_items values(0,'kernel.maxfiles','Maximum number of opened file supported by OS.');
+insert into help_items values(0,'kernel.maxproc','Maximum number of processes supported by OS.');
+insert into help_items values(0,'net.if.collisions[if]','Out-of-window collision. Collisions count.');
+insert into help_items values(0,'net.if.in[if <,mode>]','Network interfice input statistic. Integer value. If mode is missing <b>bytes</b> is used.');
+insert into help_items values(0,'net.if.out[if <,mode>]','Network interfice output statistic. Integer value. If mode is missing <b>bytes</b> is used.');
+insert into help_items values(0,'net.tcp.dns[ip, zone]','Checks if DNS service is up. 0 - DNS is down, 1 - DNS is up.');
+insert into help_items values(0,'net.tcp.listen[port]','Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state.');
+insert into help_items values(0,'net.tcp.port[<ip>, port]','Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]');
+insert into help_items values(0,'net.tcp.service[service <,ip> <,port>]','Check if service server is running and accepting connections. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45].');
+insert into help_items values(0,'net.tcp.service.perf[service <,ip> <,port>]','Check performance of service server. 0 - service server is down, <sec> - number of seconds spent on connection to the service server. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used.');
+insert into help_items values(0,'proc.mem[<name> <,user> <,mode>]','Memory used of process with name name running under user <b>user</b>. Memory used by processes. Process name, user and mode is optional. If name or user is missing all processes will be calculated. If <b>mode</b> is missing <b>sum</b> is used.  Examples: proc.mem[,root]');
+insert into help_items values(0,'proc.num[<name> <,user> <,state>]','Number of processes with name <b>name</b> running under user <b>user</b> having state <b>state</b>.	Process name, user and state are optional. Example: proc.num[,root]');
+insert into help_items values(0,'system.cpu.intr','Device interrupts.');
+insert into help_items values(0,'system.cpu.load[<cpu> <,mode>]','CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing <b>all</b> is used.  If mode is missing <b>avg1</b> is used. Note that this is not percentage.');
+insert into help_items values(0,'system.cpu.switches','Context switches.');
+insert into help_items values(0,'system.cpu.util[<cpu> <,type> <,mode>]','CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing <b>all</b> is used.  If type is missing <b>user</b> is used. If mode is missing <b>avg1</b> is used.</b>');
+insert into help_items values(0,'system.hostname','Return host name. String value. Example of returned value: www.zabbix.com');
+insert into help_items values(0,'system.localtime','System local time. Time in seconds.');
+insert into help_items values(0,'system.swap.in[<swap> <,type>]','Swap in. If type is <b>count<b> - swapins is returned. If type is <b>pages</b> - pages swapped in is returned.	If swap is missing <b>all</b> is used.');
+insert into help_items values(0,'system.swap.out[<swap> <,type>]','Swap out. If type is <b>count</b> - swapouts is returned. If type is <b>pages</b> - pages swapped in is returned.  If swap is missing <b>all</b> is used.');
+insert into help_items values(0,'system.swap.size[<swap> <,mode>]','Swap space.	Number of bytes. If swap is missing <b>all</b> is used. If mode is missing <b>free</b> is used.');
+insert into help_items values(0,'system.uname','Returns detailed host information. String value');
+insert into help_items values(0,'system.uptime','System uptime in seconds.');
+insert into help_items values(0,'system.users.num','Number of users connected. Command <b>who</b> is used on agent side.');
+insert into help_items values(0,'vfs.dev.read[device <,type> <,mode>]','Device read statistics.');
+insert into help_items values(0,'vfs.dev.write[device <,type> <,mode>]','Device write statistics.');
+insert into help_items values(0,'vfs.file.cksum[file]','Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum.	Example: vfs.file.cksum[/etc/passwd]');
+insert into help_items values(0,'vfs.file.exists[file]','Check file existance. 0 - file does not exists, 1 - file exists');
+insert into help_items values(0,'vfs.file.md5sum[file]','Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/etc/zabbix/zabbix_agentd.conf]');
+insert into help_items values(0,'vfs.file.regexp[file, user]','');
+insert into help_items values(0,'vfs.file.regmatch[file, user]','');
+insert into help_items values(0,'vfs.file.size[file]','Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]');
+insert into help_items values(0,'vfs.file.time[file<, mode>]','File time information. Number of seconds.	The mode is optional. If mode is missing <b>modify</b> is used.');
+insert into help_items values(0,'vfs.fs.inode[fs <,mode>]','Number of inodes for a given volume. If mode is missing <b>total</b> is used.');
+insert into help_items values(0,'vfs.fs.size[fs <,mode>]','Calculate disk space for a given volume. Disk space in KB. If mode is missing <b>total</b> is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free].');
+insert into help_items values(0,'vm.memory.size[<mode>]','Amount of memory size in bytes. If mode is missing <b>total</b> is used.');
+
+--
 -- Dumping data for table `items`
 --
 
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 75601b88..f7351ebc 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -414,7 +414,7 @@
 		$btnSelect = new CButton('btn1',S_SELECT,
 			"return PopUp('popup.php?dstfrm=".$frmItem->GetName().
 			"&dstfld1=key&srctbl=help_items&srcfld1=key_','new_win',".
-			"'width=450,height=450,resizable=1,scrollbars=1');");
+			"'width=650,height=450,resizable=1,scrollbars=1');");
 		$btnSelect->SetAccessKey('T');
 
 		$frmItem->AddRow(S_KEY, array(new CTextBox("key",$key,40), $btnSelect));
diff --git a/frontends/php/popup.php b/frontends/php/popup.php
index ba8c4228..d79fa962 100644
--- a/frontends/php/popup.php
+++ b/frontends/php/popup.php
@@ -89,7 +89,16 @@
 		update_profile("web.popup.groupid",$groupid);
 		if($groupid == 0) unset($groupid);
 	}
-
+	if(in_array($srctbl,array("help_items")))
+	{
+		$itemtype = get_request("itemtype",get_profile("web.popup.itemtype",0));
+		$cmbTypes = new CComboBox("itemtype",$itemtype,"submit()");
+		$cmbTypes->AddItem(ITEM_TYPE_ZABBIX,S_ZABBIX_AGENT);
+		$cmbTypes->AddItem(ITEM_TYPE_SIMPLE,S_SIMPLE_CHECK);
+		$cmbTypes->AddItem(ITEM_TYPE_INTERNAL,S_ZABBIX_INTERNAL);
+		$cmbTypes->AddItem(ITEM_TYPE_AGGREGATE,S_ZABBIX_AGGREGATE);
+		$frmTitle->AddItem(array(S_TYPE,SPACE,$cmbTypes));
+	}
 	if(in_array($srctbl,array("triggers","logitems")))
 	{
 		$hostid = get_request("hostid",get_profile("web.popup.hostid",0));
@@ -183,7 +192,7 @@
 		$table = new CTableInfo(S_NO_ITEMS);
 		$table->SetHeader(array(S_KEY,S_DESCRIPTION));
 
-		$sql = "select key_,key_ from items limit 10";
+		$sql = "select * from help_items where itemtype=$itemtype order by key_";
 
 		$result = DBselect($sql);
 		while($row = DBfetch($result))
@@ -196,7 +205,7 @@
 
 			$table->addRow(array(
 				$name,
-				$row["key_"]
+				$row["description"]
 				));
 		}
 		$table->show();
diff --git a/upgrades/dbpatches/1.1beta9_to_1.1beta10/mysql/patch.sql b/upgrades/dbpatches/1.1beta9_to_1.1beta10/mysql/patch.sql
index 029e3441..b12925ea 100644
--- a/upgrades/dbpatches/1.1beta9_to_1.1beta10/mysql/patch.sql
+++ b/upgrades/dbpatches/1.1beta9_to_1.1beta10/mysql/patch.sql
@@ -56,3 +56,72 @@ CREATE TABLE help_items (
         description             varchar(255)    DEFAULT '' NOT NULL,
         PRIMARY KEY (itemtype, key_)
 ) type=InnoDB;
+
+
+insert into help_items values (3,'icmpping','Checks if server accessible by ICMP ping	0 - ICMP ping fails 1 - ICMP ping successful	One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds.');
+insert into help_items values (3,'icmppingsec','Return ICMP ping response time	Number of seconds Example: 0.02');
+insert into help_items values (3,'ftp<,port>','Checks if FTP server is running and accepting connections	0 - FTP server is down 1 - FTP server is running');
+insert into help_items values (3,'http<,port>','Checks if HTTP (WEB) server is running and accepting connections	0 - HTTP server is down 1 - HTTP server is running');
+insert into help_items values (3,'imap<,port>','Checks if IMAP server is running and accepting connections	0 - IMAP server is down 1 - IMAP server is running');
+insert into help_items values (3,'nntp<,port>','Checks if NNTP server is running and accepting connections	0 - NNTP server is down 1 - NNTP server is running');
+insert into help_items values (3,'pop<,port>','Checks if POP server is running and accepting connections	0 - POP server is down 1 - POP server is running');
+insert into help_items values (3,'smtp<,port>','Checks if SMTP server is running and accepting connections	0 - SMTP server is down 1 - SMTP server is running');
+insert into help_items values (3,'ssh<,port>','Checks if SSH server is running and accepting connections	0 - SSH server is down 1 - SSH server is running');
+insert into help_items values (3,'tcp,port','Checks if TCP service is running and accepting connections on port	0 - the serivce on the por t is down 1 - the service is running');
+insert into help_items values (3,'ftp_perf<,port>','Checks if FTP server is running and accepting connections	0 - FTP server is down Otherwise, number of milliseconds spent connecting to FTP server');
+insert into help_items values (3,'http_perf<,port>','Checks if HTTP (WEB) server is running and accepting connections	0 - HTTP server is down Otherwise, number of milliseconds spent connecting to HTTP server');
+insert into help_items values (3,'imap_perf<,port>','Checks if IMAP server is running and accepting connections	0 - IMAP server is down Otherwise, number of milliseconds spent connecting to IMAP server');
+insert into help_items values (3,'nntp_perf<,port>','Checks if NNTP server is running and accepting connections	0 - NNTP server is down Otherwise, number of milliseconds spent connecting to NNTP server');
+insert into help_items values (3,'pop_perf<,port>','Checks if POP server is running and accepting connections	0 - POP server is down Otherwise, number of milliseconds spent connecting to POP server');
+insert into help_items values (3,'smtp_perf<,port>','Checks if SMTP server is running and accepting connections	0 - SMTP server is down Otherwise, number of milliseconds spent connecting to SMTP server');
+insert into help_items values (3,'ssh_perf<,port>','Checks if SSH server is running and accepting connections	0 - SSH server is down Otherwise, number of milliseconds spent connecting to SSH server');
+
+insert into help_items values (5,'zabbix[history]','Number of values stored in table HISTORY');
+insert into help_items values (5,'zabbix[history_str]','Number of values stored in table HISTORY_STR');
+insert into help_items values (5,'zabbix[items]','Number of items in ZABBIX database');
+insert into help_items values (5,'zabbix[items_unsupported]','Number of unsupported items in ZABBIX database');
+insert into help_items values (5,'zabbix[log]','Stores warning and error messages generated by ZABBIX server.');
+insert into help_items values (5,'zabbix[queue]','Number of items in the queue');
+insert into help_items values (5,'zabbix[trends]','Number of values stored in table TRENDS');
+insert into help_items values (5,'zabbix[triggers]','Number of triggers in ZABBIX database');
+
+insert into help_items values (8,'grpfunc(<Group>,<Key>,<func>,<param>)','Aggregate checks does not require any agent running on a host being monitored. ZABBIX server collects aggregate information by doing direct database queries. See ZABBIX Manual.');
+
+insert into help_items values(0,'agent.ping','Check the agent usability. Always return 1. Can be used as a TCP ping.');
+insert into help_items values(0,'agent.version','Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1');
+insert into help_items values(0,'kernel.maxfiles','Maximum number of opened file supported by OS.');
+insert into help_items values(0,'kernel.maxproc','Maximum number of processes supported by OS.');
+insert into help_items values(0,'net.if.collisions[if]','Out-of-window collision. Collisions count.');
+insert into help_items values(0,'net.if.in[if <,mode>]','Network interfice input statistic. Integer value. If mode is missing <b>bytes</b> is used.');
+insert into help_items values(0,'net.if.out[if <,mode>]','Network interfice output statistic. Integer value. If mode is missing <b>bytes</b> is used.');
+insert into help_items values(0,'net.tcp.dns[ip, zone]','Checks if DNS service is up. 0 - DNS is down, 1 - DNS is up.');
+insert into help_items values(0,'net.tcp.listen[port]','Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state.');
+insert into help_items values(0,'net.tcp.port[<ip>, port]','Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]');
+insert into help_items values(0,'net.tcp.service[service <,ip> <,port>]','Check if service server is running and accepting connections. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45].');
+insert into help_items values(0,'net.tcp.service.perf[service <,ip> <,port>]','Check performance of service server. 0 - service server is down, <sec> - number of seconds spent on connection to the service server. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used.');
+insert into help_items values(0,'proc.mem[<name> <,user> <,mode>]','Memory used of process with name name running under user <b>user</b>. Memory used by processes. Process name, user and mode is optional. If name or user is missing all processes will be calculated. If <b>mode</b> is missing <b>sum</b> is used.  Examples: proc.mem[,root]');
+insert into help_items values(0,'proc.num[<name> <,user> <,state>]','Number of processes with name <b>name</b> running under user <b>user</b> having state <b>state</b>.	Process name, user and state are optional. Example: proc.num[,root]');
+insert into help_items values(0,'system.cpu.intr','Device interrupts.');
+insert into help_items values(0,'system.cpu.load[<cpu> <,mode>]','CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing <b>all</b> is used.  If mode is missing <b>avg1</b> is used. Note that this is not percentage.');
+insert into help_items values(0,'system.cpu.switches','Context switches.');
+insert into help_items values(0,'system.cpu.util[<cpu> <,type> <,mode>]','CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing <b>all</b> is used.  If type is missing <b>user</b> is used. If mode is missing <b>avg1</b> is used.</b>');
+insert into help_items values(0,'system.hostname','Return host name. String value. Example of returned value: www.zabbix.com');
+insert into help_items values(0,'system.localtime','System local time. Time in seconds.');
+insert into help_items values(0,'system.swap.in[<swap> <,type>]','Swap in. If type is <b>count<b> - swapins is returned. If type is <b>pages</b> - pages swapped in is returned.	If swap is missing <b>all</b> is used.');
+insert into help_items values(0,'system.swap.out[<swap> <,type>]','Swap out. If type is <b>count</b> - swapouts is returned. If type is <b>pages</b> - pages swapped in is returned.  If swap is missing <b>all</b> is used.');
+insert into help_items values(0,'system.swap.size[<swap> <,mode>]','Swap space.	Number of bytes. If swap is missing <b>all</b> is used. If mode is missing <b>free</b> is used.');
+insert into help_items values(0,'system.uname','Returns detailed host information. String value');
+insert into help_items values(0,'system.uptime','System uptime in seconds.');
+insert into help_items values(0,'system.users.num','Number of users connected. Command <b>who</b> is used on agent side.');
+insert into help_items values(0,'vfs.dev.read[device <,type> <,mode>]','Device read statistics.');
+insert into help_items values(0,'vfs.dev.write[device <,type> <,mode>]','Device write statistics.');
+insert into help_items values(0,'vfs.file.cksum[file]','Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum.	Example: vfs.file.cksum[/etc/passwd]');
+insert into help_items values(0,'vfs.file.exists[file]','Check file existance. 0 - file does not exists, 1 - file exists');
+insert into help_items values(0,'vfs.file.md5sum[file]','Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/etc/zabbix/zabbix_agentd.conf]');
+insert into help_items values(0,'vfs.file.regexp[file, user]','');
+insert into help_items values(0,'vfs.file.regmatch[file, user]','');
+insert into help_items values(0,'vfs.file.size[file]','Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]');
+insert into help_items values(0,'vfs.file.time[file<, mode>]','File time information. Number of seconds.	The mode is optional. If mode is missing <b>modify</b> is used.');
+insert into help_items values(0,'vfs.fs.inode[fs <,mode>]','Number of inodes for a given volume. If mode is missing <b>total</b> is used.');
+insert into help_items values(0,'vfs.fs.size[fs <,mode>]','Calculate disk space for a given volume. Disk space in KB. If mode is missing <b>total</b> is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free].');
+insert into help_items values(0,'vm.memory.size[<mode>]','Amount of memory size in bytes. If mode is missing <b>total</b> is used.');
diff --git a/upgrades/dbpatches/1.1beta9_to_1.1beta10/postgresql/patch.sql b/upgrades/dbpatches/1.1beta9_to_1.1beta10/postgresql/patch.sql
index 0dea3008..e6ca07e3 100644
--- a/upgrades/dbpatches/1.1beta9_to_1.1beta10/postgresql/patch.sql
+++ b/upgrades/dbpatches/1.1beta9_to_1.1beta10/postgresql/patch.sql
@@ -56,3 +56,72 @@ CREATE TABLE help_items (
         description     varchar(255)    DEFAULT '' NOT NULL,
         PRIMARY KEY     (itemtype, key_)
 );
+
+
+insert into help_items values (3,'icmpping','Checks if server accessible by ICMP ping	0 - ICMP ping fails 1 - ICMP ping successful	One of zabbix_server processes performs ICMP pings once per PingerFrequency seconds.');
+insert into help_items values (3,'icmppingsec','Return ICMP ping response time	Number of seconds Example: 0.02');
+insert into help_items values (3,'ftp<,port>','Checks if FTP server is running and accepting connections	0 - FTP server is down 1 - FTP server is running');
+insert into help_items values (3,'http<,port>','Checks if HTTP (WEB) server is running and accepting connections	0 - HTTP server is down 1 - HTTP server is running');
+insert into help_items values (3,'imap<,port>','Checks if IMAP server is running and accepting connections	0 - IMAP server is down 1 - IMAP server is running');
+insert into help_items values (3,'nntp<,port>','Checks if NNTP server is running and accepting connections	0 - NNTP server is down 1 - NNTP server is running');
+insert into help_items values (3,'pop<,port>','Checks if POP server is running and accepting connections	0 - POP server is down 1 - POP server is running');
+insert into help_items values (3,'smtp<,port>','Checks if SMTP server is running and accepting connections	0 - SMTP server is down 1 - SMTP server is running');
+insert into help_items values (3,'ssh<,port>','Checks if SSH server is running and accepting connections	0 - SSH server is down 1 - SSH server is running');
+insert into help_items values (3,'tcp,port','Checks if TCP service is running and accepting connections on port	0 - the serivce on the por t is down 1 - the service is running');
+insert into help_items values (3,'ftp_perf<,port>','Checks if FTP server is running and accepting connections	0 - FTP server is down Otherwise, number of milliseconds spent connecting to FTP server');
+insert into help_items values (3,'http_perf<,port>','Checks if HTTP (WEB) server is running and accepting connections	0 - HTTP server is down Otherwise, number of milliseconds spent connecting to HTTP server');
+insert into help_items values (3,'imap_perf<,port>','Checks if IMAP server is running and accepting connections	0 - IMAP server is down Otherwise, number of milliseconds spent connecting to IMAP server');
+insert into help_items values (3,'nntp_perf<,port>','Checks if NNTP server is running and accepting connections	0 - NNTP server is down Otherwise, number of milliseconds spent connecting to NNTP server');
+insert into help_items values (3,'pop_perf<,port>','Checks if POP server is running and accepting connections	0 - POP server is down Otherwise, number of milliseconds spent connecting to POP server');
+insert into help_items values (3,'smtp_perf<,port>','Checks if SMTP server is running and accepting connections	0 - SMTP server is down Otherwise, number of milliseconds spent connecting to SMTP server');
+insert into help_items values (3,'ssh_perf<,port>','Checks if SSH server is running and accepting connections	0 - SSH server is down Otherwise, number of milliseconds spent connecting to SSH server');
+
+insert into help_items values (5,'zabbix[history]','Number of values stored in table HISTORY');
+insert into help_items values (5,'zabbix[history_str]','Number of values stored in table HISTORY_STR');
+insert into help_items values (5,'zabbix[items]','Number of items in ZABBIX database');
+insert into help_items values (5,'zabbix[items_unsupported]','Number of unsupported items in ZABBIX database');
+insert into help_items values (5,'zabbix[log]','Stores warning and error messages generated by ZABBIX server.');
+insert into help_items values (5,'zabbix[queue]','Number of items in the queue');
+insert into help_items values (5,'zabbix[trends]','Number of values stored in table TRENDS');
+insert into help_items values (5,'zabbix[triggers]','Number of triggers in ZABBIX database');
+
+insert into help_items values (8,'grpfunc(<Group>,<Key>,<func>,<param>)','Aggregate checks does not require any agent running on a host being monitored. ZABBIX server collects aggregate information by doing direct database queries. See ZABBIX Manual.');
+
+insert into help_items values(0,'agent.ping','Check the agent usability. Always return 1. Can be used as a TCP ping.');
+insert into help_items values(0,'agent.version','Version of zabbix_agent(d) running on monitored host. String value. Example of returned value: 1.1');
+insert into help_items values(0,'kernel.maxfiles','Maximum number of opened file supported by OS.');
+insert into help_items values(0,'kernel.maxproc','Maximum number of processes supported by OS.');
+insert into help_items values(0,'net.if.collisions[if]','Out-of-window collision. Collisions count.');
+insert into help_items values(0,'net.if.in[if <,mode>]','Network interfice input statistic. Integer value. If mode is missing <b>bytes</b> is used.');
+insert into help_items values(0,'net.if.out[if <,mode>]','Network interfice output statistic. Integer value. If mode is missing <b>bytes</b> is used.');
+insert into help_items values(0,'net.tcp.dns[ip, zone]','Checks if DNS service is up. 0 - DNS is down, 1 - DNS is up.');
+insert into help_items values(0,'net.tcp.listen[port]','Checks if this port is in LISTEN state. 0 - it is not, 1 - it is in LISTEN state.');
+insert into help_items values(0,'net.tcp.port[<ip>, port]','Check, if it is possible to make TCP connection to the port number. 0 - cannot connect, 1 - can connect. IP address is optional. If ip is missing, 127.0.0.1 is used. Example: net.tcp.port[,80]');
+insert into help_items values(0,'net.tcp.service[service <,ip> <,port>]','Check if service server is running and accepting connections. 0 - service is down, 1 - service is running. If ip is missing 127.0.0.1 is used. If port number is missing, default service port is used. Example: net.tcp.service[ftp,,45].');
+insert into help_items values(0,'net.tcp.service.perf[service <,ip> <,port>]','Check performance of service server. 0 - service server is down, <sec> - number of seconds spent on connection to the service server. If ip is missing 127.0.0.1 is used.  If port number is missing, default service port is used.');
+insert into help_items values(0,'proc.mem[<name> <,user> <,mode>]','Memory used of process with name name running under user <b>user</b>. Memory used by processes. Process name, user and mode is optional. If name or user is missing all processes will be calculated. If <b>mode</b> is missing <b>sum</b> is used.  Examples: proc.mem[,root]');
+insert into help_items values(0,'proc.num[<name> <,user> <,state>]','Number of processes with name <b>name</b> running under user <b>user</b> having state <b>state</b>.	Process name, user and state are optional. Example: proc.num[,root]');
+insert into help_items values(0,'system.cpu.intr','Device interrupts.');
+insert into help_items values(0,'system.cpu.load[<cpu> <,mode>]','CPU(s) load. Processor load. The cpu and mode are optional. If cpu is missing <b>all</b> is used.  If mode is missing <b>avg1</b> is used. Note that this is not percentage.');
+insert into help_items values(0,'system.cpu.switches','Context switches.');
+insert into help_items values(0,'system.cpu.util[<cpu> <,type> <,mode>]','CPU(s) utilisation. Processor load in percents. The cpu, type and mode are optional. If cpu is missing <b>all</b> is used.  If type is missing <b>user</b> is used. If mode is missing <b>avg1</b> is used.</b>');
+insert into help_items values(0,'system.hostname','Return host name. String value. Example of returned value: www.zabbix.com');
+insert into help_items values(0,'system.localtime','System local time. Time in seconds.');
+insert into help_items values(0,'system.swap.in[<swap> <,type>]','Swap in. If type is <b>count<b> - swapins is returned. If type is <b>pages</b> - pages swapped in is returned.	If swap is missing <b>all</b> is used.');
+insert into help_items values(0,'system.swap.out[<swap> <,type>]','Swap out. If type is <b>count</b> - swapouts is returned. If type is <b>pages</b> - pages swapped in is returned.  If swap is missing <b>all</b> is used.');
+insert into help_items values(0,'system.swap.size[<swap> <,mode>]','Swap space.	Number of bytes. If swap is missing <b>all</b> is used. If mode is missing <b>free</b> is used.');
+insert into help_items values(0,'system.uname','Returns detailed host information. String value');
+insert into help_items values(0,'system.uptime','System uptime in seconds.');
+insert into help_items values(0,'system.users.num','Number of users connected. Command <b>who</b> is used on agent side.');
+insert into help_items values(0,'vfs.dev.read[device <,type> <,mode>]','Device read statistics.');
+insert into help_items values(0,'vfs.dev.write[device <,type> <,mode>]','Device write statistics.');
+insert into help_items values(0,'vfs.file.cksum[file]','Calculate check sum of a given file. Check sum of the file calculate by standard algorithm used by UNIX utility cksum.	Example: vfs.file.cksum[/etc/passwd]');
+insert into help_items values(0,'vfs.file.exists[file]','Check file existance. 0 - file does not exists, 1 - file exists');
+insert into help_items values(0,'vfs.file.md5sum[file]','Calculate MD5 check sum of a given file. String MD5 hash of the file. Can be used for files less than 64MB, unsupported otherwise. Example: vfs.file.md5sum[/etc/zabbix/zabbix_agentd.conf]');
+insert into help_items values(0,'vfs.file.regexp[file, user]','');
+insert into help_items values(0,'vfs.file.regmatch[file, user]','');
+insert into help_items values(0,'vfs.file.size[file]','Size of a given file. Size in bytes. File must have read permissions for user zabbix. Example: vfs.file.size[/var/log/syslog]');
+insert into help_items values(0,'vfs.file.time[file<, mode>]','File time information. Number of seconds.	The mode is optional. If mode is missing <b>modify</b> is used.');
+insert into help_items values(0,'vfs.fs.inode[fs <,mode>]','Number of inodes for a given volume. If mode is missing <b>total</b> is used.');
+insert into help_items values(0,'vfs.fs.size[fs <,mode>]','Calculate disk space for a given volume. Disk space in KB. If mode is missing <b>total</b> is used.  In case of mounted volume, unused disk space for local file system is returned. Example: vfs.fs.size[/tmp,free].');
+insert into help_items values(0,'vm.memory.size[<mode>]','Amount of memory size in bytes. If mode is missing <b>total</b> is used.');