diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | create/data/data.sql | 12 | ||||
| -rw-r--r-- | create/schema/schema.sql | 2 | ||||
| -rw-r--r-- | include/common.h | 3 | ||||
| -rw-r--r-- | upgrades/dbpatches/1.3/mysql/patch/media_type.sql | 4 |
5 files changed, 14 insertions, 8 deletions
@@ -1,5 +1,6 @@ Changes for 1.3.3: + - added media_type.username, media_type.passwd (Alexei) - added hosts.dns. Host name is for informational purposes only. (Alexei) - new command line parameters for zabbix_sender (Andrey) - added support of system.boottime (Andrey) diff --git a/create/data/data.sql b/create/data/data.sql index f53c1b18..eac0f302 100644 --- a/create/data/data.sql +++ b/create/data/data.sql @@ -27,7 +27,7 @@ INSERT INTO config VALUES (1,365,365,600,'1-5,00:00-24:00'); -- Dumping data for table `media_type` -- -INSERT INTO media_type VALUES (1,0,'Email','localhost','localhost','zabbix@localhost','',''); +INSERT INTO media_type VALUES (1,0,'Email','localhost','localhost','zabbix@localhost','','','',''); -- -- Dumping data for table `users` @@ -61,11 +61,11 @@ INSERT INTO rights VALUES (3,2,'Default permission','R',0); -- Dumping data for table `hosts` -- -INSERT INTO hosts VALUES (10001,'Unix_t',0,'',10050,3,0,'',0,0); -INSERT INTO hosts VALUES (10002,'Windows_t',0,'',10050,3,0,'',0,0); -INSERT INTO hosts VALUES (10004,'Standalone_t',0,'',10050,3,0,'',0,0); -INSERT INTO hosts VALUES (10003,'MySQL_t',0,'',10050,3,0,'',0,0); -INSERT INTO hosts VALUES (10007,'SNMP_t',0,'',161,3,0,'',0,0); +INSERT INTO hosts VALUES (10001,'Unix_t','Unix_t',0,'',10050,3,0,'',0,0); +INSERT INTO hosts VALUES (10002,'Windows_t','Windows_t',0,'',10050,3,0,'',0,0); +INSERT INTO hosts VALUES (10004,'Standalone_t','Standalone_t',0,'',10050,3,0,'',0,0); +INSERT INTO hosts VALUES (10003,'MySQL_t','MySQL_t',0,'',10050,3,0,'',0,0); +INSERT INTO hosts VALUES (10007,'SNMP_t','SNMP_t',0,'',161,3,0,'',0,0); -- -- Dumping data for table `groups` diff --git a/create/schema/schema.sql b/create/schema/schema.sql index 2d8edbb3..b2923e75 100644 --- a/create/schema/schema.sql +++ b/create/schema/schema.sql @@ -451,6 +451,8 @@ FIELD |smtp_helo |t_varchar(255) |'' |NOT NULL |ZBX_SYNC FIELD |smtp_email |t_varchar(255) |'' |NOT NULL |ZBX_SYNC FIELD |exec_path |t_varchar(255) |'' |NOT NULL |ZBX_SYNC FIELD |gsm_modem |t_varchar(255) |'' |NOT NULL |ZBX_SYNC +FIELD |username |t_varchar(255) |'' |NOT NULL |ZBX_SYNC +FIELD |passwd |t_varchar(255) |'' |NOT NULL |ZBX_SYNC TABLE|profiles|profileid|ZBX_SYNC FIELD |profileid |t_id |'0' |NOT NULL |ZBX_SYNC diff --git a/include/common.h b/include/common.h index 832eaea8..041d3a21 100644 --- a/include/common.h +++ b/include/common.h @@ -190,7 +190,8 @@ typedef enum { ALERT_TYPE_EMAIL = 0, ALERT_TYPE_EXEC, - ALERT_TYPE_SMS + ALERT_TYPE_SMS, + ALERT_TYPE_JABBER } zbx_alert_type_t; /* Alert statuses */ diff --git a/upgrades/dbpatches/1.3/mysql/patch/media_type.sql b/upgrades/dbpatches/1.3/mysql/patch/media_type.sql index d2804a43..09b55dec 100644 --- a/upgrades/dbpatches/1.3/mysql/patch/media_type.sql +++ b/upgrades/dbpatches/1.3/mysql/patch/media_type.sql @@ -7,9 +7,11 @@ CREATE TABLE media_type_tmp ( smtp_email varchar(255) DEFAULT '' NOT NULL, exec_path varchar(255) DEFAULT '' NOT NULL, gsm_modem varchar(255) DEFAULT '' NOT NULL, + username varchar(255) DEFAULT '' NOT NULL, + passwd varchar(255) DEFAULT '' NOT NULL, PRIMARY KEY (mediatypeid) ) ENGINE=InnoDB; -insert into media_type_tmp select * from media_type; +insert into media_type_tmp select mediatypeid,type,description,smtp_server,smtp_helo,smtp_email,exec_path,gsm_modem,'','' from media_type; drop table media_type; alter table media_type_tmp rename media_type; |