- zabbix_suckerd housekeeping process to disconnect from

 DB when unactive (Alexei)
 - support for check_service[http] (Alexei)
 - drop column config.password_required (Alexei)
 - drop column users.groupid (Alexei)
 - drop table groups (Alexei)
 - added parameter DBConnectOnEach for zabbix_trapperd (Alexei)


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

2 files changed, 17 insertions, 0 deletions

diff --git a/upgrades/dbpatches/1.0beta2_to_1.0beta3/mysql/patch.sql b/upgrades/dbpatches/1.0beta2_to_1.0beta3/mysql/patch.sql
index 786052ec..7c41ce34 100644
--- a/upgrades/dbpatches/1.0beta2_to_1.0beta3/mysql/patch.sql
+++ b/upgrades/dbpatches/1.0beta2_to_1.0beta3/mysql/patch.sql
@@ -13,9 +13,17 @@ CREATE TABLE history_str (
   PRIMARY KEY (itemid,clock)
 );
 
+drop table groups;
+alter table users drop groupid;
+alter table config drop password_required;
+
 insert into items_template (itemtemplateid,description,key_,delay,value_type)
         values (65,'Host name','system[hostname]', 1800, 1);
 insert into items_template (itemtemplateid,description,key_,delay,value_type)
         values (66,'Host information','system[uname]', 1800, 1);
 insert into items_template (itemtemplateid,description,key_,delay,value_type)
         values (67,'Version of zabbix_agent(d) running','version[zabbix_agent]', 3600, 1);
+insert into items_template (itemtemplateid,description,key_,delay,value_type)
+        values (68,'WEB (HTTP) server is running','check_service[http]', 60, 0);insert into triggers_template (triggertemplateid,itemtemplateid,description,expr
+ession)
+        values (68,68,'WEB (HTTP) server is down on %s','{:.last(0)}<1');
diff --git a/upgrades/dbpatches/1.0beta2_to_1.0beta3/postgresql/patch.sql b/upgrades/dbpatches/1.0beta2_to_1.0beta3/postgresql/patch.sql
index b3fc9c59..87453faa 100644
--- a/upgrades/dbpatches/1.0beta2_to_1.0beta3/postgresql/patch.sql
+++ b/upgrades/dbpatches/1.0beta2_to_1.0beta3/postgresql/patch.sql
@@ -14,9 +14,18 @@ CREATE TABLE history_str (
   FOREIGN KEY (itemid) REFERENCES items
 );
 
+drop table groups;
+alter table users drop groupid;
+alter table config drop password_required;
+
 insert into items_template (itemtemplateid,description,key_,delay,value_type)
         values (65,'Host name','system[hostname]', 1800, 1);
 insert into items_template (itemtemplateid,description,key_,delay,value_type)
         values (66,'Host information','system[uname]', 1800, 1);
 insert into items_template (itemtemplateid,description,key_,delay,value_type)
         values (67,'Version of zabbix_agent(d) running','version[zabbix_agent]',3600, 1);
+insert into items_template (itemtemplateid,description,key_,delay,value_type)
+        values (68,'WEB (HTTP) server is running','check_service[http]', 60, 0);
+insert into triggers_template (triggertemplateid,itemtemplateid,description,expr
+ession)
+        values (68,68,'WEB (HTTP) server is down on %s','{:.last(0)}<1');