diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2021-12-03 14:02:41 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2021-12-03 14:02:41 +0300 |
| commit | d6e5f35f4ec47fe51655eb76fef399d5782360b1 (patch) | |
| tree | 39149c362264ec56a9d8c68bfa54170c09ef5e44 /include/common.h | |
| parent | 90889f1e48edcdd904e6233e6fc5452a45b99073 (diff) | |
| parent | aab41e634284fa954028e19f0945dc6d771a4667 (diff) | |
.......... [ZBXNEXT-2579] merged branch 'master' of ssh://git.zabbix.lan:7999/zbx/zabbix into feature/ZBXNEXT-2579-5.5
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/common.h b/include/common.h index fd0c0007880..76593df914c 100644 --- a/include/common.h +++ b/include/common.h @@ -721,6 +721,10 @@ const char *zbx_item_logtype_string(unsigned char logtype); #define ACTION_PAUSE_SUPPRESSED_FALSE 0 /* process escalation for suppressed events */ #define ACTION_PAUSE_SUPPRESSED_TRUE 1 /* pause escalation for suppressed events */ +/* action escalation canceled notification mode */ +#define ACTION_NOTIFY_IF_CANCELED_TRUE 1 /* notify about canceled escalations for action (default) */ +#define ACTION_NOTIFY_IF_CANCELED_FALSE 0 /* do not notify about canceled escalations for action */ + /* max number of retries for alerts */ #define ALERT_MAX_RETRIES 3 @@ -1786,4 +1790,6 @@ typedef enum } zbx_err_codes_t; +void zbx_md5buf2str(const md5_byte_t *md5, char *str); +int zbx_hex2bin(const unsigned char *p_hex, unsigned char *buf, int buf_len); #endif |