- added directory upgrades/dbpatches/1.0alpha9_to_1.0alpha10/

 - removed parameters net[listen_21],net[listen_22],net[listen_25],net[listen_110],
   net[listen_143]
 - added parameters check_service[ftp],check_service[smtp],check_service[ssh],check_service[pop],
   check_service[nntp],check_service[imap]


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

1 files changed, 8 insertions, 4 deletions

diff --git a/create/data/data.sql b/create/data/data.sql
index b4743bfc..b87ac908 100644
--- a/create/data/data.sql
+++ b/create/data/data.sql
@@ -96,9 +96,9 @@ insert into items_template (itemtemplateid,description,key_,delay)
 --insert into items_template (itemtemplateid,description,key_,delay)
 --	values (38,'The number of context switches per second','system[switches]', 30);
 insert into items_template (itemtemplateid,description,key_,delay)
-	values (39,'Email (SMTP) server is running','net[listen_25]', 60);
+	values (39,'Email (SMTP) server is running','check_service[smtp]', 60);
 insert into items_template (itemtemplateid,description,key_,delay)
-	values (40,'FTP server is running','net[listen_21]', 60);
+	values (40,'FTP server is running','check_service[ftp]', 60);
 insert into items_template (itemtemplateid,description,key_,delay)
 	values (41,'SSH server is running','check_service[ssh]', 60);
 insert into items_template (itemtemplateid,description,key_,delay)
@@ -106,9 +106,9 @@ insert into items_template (itemtemplateid,description,key_,delay)
 insert into items_template (itemtemplateid,description,key_,delay)
 	values (43,'WEB server is running','net[listen_80]', 60);
 insert into items_template (itemtemplateid,description,key_,delay)
-	values (44,'POP3 server is running','net[listen_110]', 60);
+	values (44,'POP3 server is running','check_service[pop]', 60);
 insert into items_template (itemtemplateid,description,key_,delay)
-	values (45,'IMAP server is running','net[listen_143]', 60);
+	values (45,'IMAP server is running','check_service[imap]', 60);
 insert into items_template (itemtemplateid,description,key_,delay)
 	values (46,'Checksum of /usr/sbin/sshd','cksum[/usr/sbin/sshd]', 600);
 insert into items_template (itemtemplateid,description,key_,delay)
@@ -125,6 +125,8 @@ insert into items_template (itemtemplateid,description,key_,delay)
 	values (52,'Number of block read from disks','io[disk_rblk]', 30);
 insert into items_template (itemtemplateid,description,key_,delay)
 	values (53,'Number of block written to disks','io[disk_wblk]', 30);
+insert into items_template (itemtemplateid,description,key_,delay)
+	values (54,'News (NNTP) server is running','check_service[nntp]', 60);
 
 --
 -- Data for table triggers_template
@@ -194,3 +196,5 @@ insert into triggers_template (triggertemplateid,itemtemplateid,description,expr
 	values (47,47,'/usr/bin/ssh has been changed on server %s','{:.diff(0)}>0');
 insert into triggers_template (triggertemplateid,itemtemplateid,description,expression)
 	values (48,48,'/etc/services has been changed on server %s','{:.diff(0)}>0');
+insert into triggers_template (triggertemplateid,itemtemplateid,description,expression)
+	values (54,54,'News (NNTP) server is down on %s','{:.last(0)}<1');