diff options
| author | Miks Kronkalns <miks.kronkalns@zabbix.com> | 2021-12-02 11:09:09 +0300 |
|---|---|---|
| committer | Sergey Simonenko <sergey.simonenko@zabbix.com> | 2021-12-02 11:09:09 +0300 |
| commit | aab41e634284fa954028e19f0945dc6d771a4667 (patch) | |
| tree | 44dd2b1fe27fb10bcce0c2734580f40b0bca16e9 /create | |
| parent | 4038a2734e64fd66406db1281bb415298c45a8d4 (diff) | |
| parent | 26dcc0b43620fc086bef92acbf4d73166f8f1684 (diff) | |
A.F.....S. [ZBXNEXT-6250] added option to opt-out of "escalation canceled" messages
* commit '26dcc0b43620fc086bef92acbf4d73166f8f1684':
..F....... [ZBXNEXT-6250] minor code refactoring
.......... [ZBXNEXT-6250] added new notify_if_canceled field to data.tmpl
........S. [ZBXNEXT-6250] removed redundant blank line
.......... [ZBXNEXT-6250] typo fix
.......... [ZBXNEXT-6250] typo fix
.......... [ZBXNEXT-6250] updated integration tests
........S. [ZBXNEXT-6250] changed log message string (AmE)
.D........ [ZBXNEXT-6250] fixed changelog
ADF....... [ZBXNEXT-6250] implemented escallation cancellation frontend and API part
........S. [ZBX-20177] updated constant names (server part)
........S. [ZBXNEXT-6250] changed field name
........S. [ZBXNEXT-6250] initial commit
Diffstat (limited to 'create')
| -rw-r--r-- | create/src/data.tmpl | 12 | ||||
| -rw-r--r-- | create/src/schema.tmpl | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/create/src/data.tmpl b/create/src/data.tmpl index 36c3a440eb4..0fb27f8acbd 100644 --- a/create/src/data.tmpl +++ b/create/src/data.tmpl @@ -827,12 +827,12 @@ ROW |2 |Traceroute |/usr/bin/traceroute {HOST.CONN} ROW |3 |Detect operating system|sudo /usr/bin/nmap -O {HOST.CONN} |2 |7 |NULL | | |0 |2 |2 | |0 | | | | | | TABLE |actions -FIELDS|actionid|name |eventsource|evaltype|status|esc_period|formula|pause_suppressed| -ROW |2 |Auto discovery. Linux servers. |1 |0 |1 |0 | |1 | -ROW |3 |Report problems to Zabbix administrators |0 |0 |1 |1h | |1 | -ROW |4 |Report not supported items |3 |0 |1 |1h | |1 | -ROW |5 |Report not supported low level discovery rules|3 |0 |1 |1h | |1 | -ROW |6 |Report unknown triggers |3 |0 |1 |1h | |1 | +FIELDS|actionid|name |eventsource|evaltype|status|esc_period|formula|pause_suppressed|notify_if_canceled| +ROW |2 |Auto discovery. Linux servers. |1 |0 |1 |0 | |1 |1 | +ROW |3 |Report problems to Zabbix administrators |0 |0 |1 |1h | |1 |1 | +ROW |4 |Report not supported items |3 |0 |1 |1h | |1 |1 | +ROW |5 |Report not supported low level discovery rules|3 |0 |1 |1h | |1 |1 | +ROW |6 |Report unknown triggers |3 |0 |1 |1h | |1 |1 | TABLE |operations FIELDS|operationid|actionid|operationtype|esc_period|esc_step_from|esc_step_to|evaltype|recovery| diff --git a/create/src/schema.tmpl b/create/src/schema.tmpl index 901adab5f02..2c8db70c5a7 100644 --- a/create/src/schema.tmpl +++ b/create/src/schema.tmpl @@ -390,6 +390,7 @@ FIELD |status |t_integer |'0' |NOT NULL |0 FIELD |esc_period |t_varchar(255) |'1h' |NOT NULL |0 FIELD |formula |t_varchar(255) |'' |NOT NULL |0 FIELD |pause_suppressed|t_integer |'1' |NOT NULL |0 +FIELD |notify_if_canceled|t_integer |'1' |NOT NULL |0 INDEX |1 |eventsource,status UNIQUE |2 |name @@ -1905,4 +1906,4 @@ TABLE|dbversion|dbversionid| FIELD |dbversionid |t_id | |NOT NULL |0 FIELD |mandatory |t_integer |'0' |NOT NULL | FIELD |optional |t_integer |'0' |NOT NULL | -ROW |1 |5050111 |5050111 +ROW |1 |5050112 |5050112 |