diff options
| -rw-r--r-- | create/data/data.sql | 12 | ||||
| -rw-r--r-- | create/schema/schema.sql | 4 | ||||
| -rw-r--r-- | src/zabbix_server/escalator/escalator.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/create/data/data.sql b/create/data/data.sql index 2f985a8e..adac6fc3 100644 --- a/create/data/data.sql +++ b/create/data/data.sql @@ -6353,8 +6353,8 @@ INSERT INTO items_applications VALUES (2299,154,18452); -- Dumping data for table `actions` -- -INSERT INTO actions VALUES (2,'Auto discovery. Linux servers.',1,0,1); -INSERT INTO actions VALUES (3,'Auto discovery. Windows servers.',1,0,1); +INSERT INTO actions VALUES (2,'Auto discovery. Linux servers.',1,0,1,0,'','',0,'',''); +INSERT INTO actions VALUES (3,'Auto discovery. Windows servers.',1,0,1,0,'','',0,'',''); -- -- Dumping data for table `conditions` @@ -6371,10 +6371,10 @@ INSERT INTO conditions VALUES (7,3,12,2,'Windows'); -- Dumping data for table `operations` -- -INSERT INTO operations VALUES (3,2,6,0,10001,'',''); -INSERT INTO operations VALUES (4,2,4,0,2,'',''); -INSERT INTO operations VALUES (5,3,4,0,3,'',''); -INSERT INTO operations VALUES (6,3,6,0,10002,'',''); +INSERT INTO operations VALUES (3,2,6,0,10001,'','',0,1,1,0,0); +INSERT INTO operations VALUES (4,2,4,0,2,'','',0,1,1,0,0); +INSERT INTO operations VALUES (5,3,4,0,3,'','',0,1,1,0,0); +INSERT INTO operations VALUES (6,3,6,0,10002,'','',0,1,1,0,0); -- -- Dumping data for table `drules` diff --git a/create/schema/schema.sql b/create/schema/schema.sql index 88227b62..20ae76d0 100644 --- a/create/schema/schema.sql +++ b/create/schema/schema.sql @@ -321,8 +321,8 @@ FIELD |eventsource |t_integer |'0' |NOT NULL |ZBX_SYNC FIELD |evaltype |t_integer |'0' |NOT NULL |ZBX_SYNC FIELD |status |t_integer |'0' |NOT NULL |ZBX_SYNC FIELD |esc_period |t_integer |'0' |NOT NULL |ZBX_SYNC -FIELD |shortdata |t_varchar(255) |'' |NOT NULL |ZBX_SYNC -FIELD |longdata |t_blob |'' |NOT NULL |ZBX_SYNC +FIELD |def_shortdata |t_varchar(255) |'' |NOT NULL |ZBX_SYNC +FIELD |def_longdata |t_blob |'' |NOT NULL |ZBX_SYNC FIELD |recovery_msg |t_integer |'0' |NOT NULL |ZBX_SYNC FIELD |r_shortdata |t_varchar(255) |'' |NOT NULL |ZBX_SYNC FIELD |r_longdata |t_blob |'' |NOT NULL |ZBX_SYNC diff --git a/src/zabbix_server/escalator/escalator.c b/src/zabbix_server/escalator/escalator.c index b2663f86..1272f2e1 100644 --- a/src/zabbix_server/escalator/escalator.c +++ b/src/zabbix_server/escalator/escalator.c @@ -469,7 +469,7 @@ static void execute_escalation(DB_ESCALATION *escalation, DB_EVENT *event) switch (escalation->status) { case ESCALATION_STATUS_ACTIVE: - result = DBselect("select actionid,eventsource,esc_period,shortdata,longdata" + result = DBselect("select actionid,eventsource,esc_period,def_shortdata,def_longdata" " from actions where actionid=" ZBX_FS_UI64, escalation->actionid); break; |