diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2021-03-23 16:07:34 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2021-03-23 16:07:34 +0300 |
| commit | a2c088a337983a28ff2795fdab564a32a4f074b2 (patch) | |
| tree | 9daee62f8d5948ff2b9ed6a1bd3ca7f53d433f44 /include/zbxserver.h | |
| parent | caaa2e2d3e3cb23e87e45efc80300841ea9bb41a (diff) | |
| parent | ab4ff98c51cc23b2390aeba9a4cf0e797ed9154d (diff) | |
.......... [ZBXNEXT-6451] merged branch 'master' of ssh://git.zabbix.lan:7999/zbx/zabbix into feature/ZBXNEXT-6451-5.3
Diffstat (limited to 'include/zbxserver.h')
| -rw-r--r-- | include/zbxserver.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/include/zbxserver.h b/include/zbxserver.h index 4cd35535b11..4f540cea9dc 100644 --- a/include/zbxserver.h +++ b/include/zbxserver.h @@ -52,6 +52,8 @@ #define MACRO_TYPE_EVENT_NAME 0x02000000 /* event name in trigger configuration */ #define MACRO_TYPE_EXPRESSION 0x04000000 /* macros in expression macro */ #define MACRO_TYPE_SCRIPT_PARAMS_FIELD 0x08000000 +#define MACRO_TYPE_SCRIPT_NORMAL 0x10000000 +#define MACRO_TYPE_SCRIPT_RECOVERY 0x20000000 #define MACRO_EXPAND_NO 0 #define MACRO_EXPAND_YES 1 @@ -64,15 +66,15 @@ int evaluate_function2(zbx_variant_t *value, DC_ITEM *item, const char *function const zbx_timespec_t *ts, char **error); -int substitute_simple_macros(zbx_uint64_t *actionid, const DB_EVENT *event, const DB_EVENT *r_event, - zbx_uint64_t *userid, const zbx_uint64_t *hostid, const DC_HOST *dc_host, const DC_ITEM *dc_item, - DB_ALERT *alert, const DB_ACKNOWLEDGE *ack, const char *tz, char **data, int macro_type, char *error, - int maxerrlen); +int substitute_simple_macros(const zbx_uint64_t *actionid, const DB_EVENT *event, const DB_EVENT *r_event, + const zbx_uint64_t *userid, const zbx_uint64_t *hostid, const DC_HOST *dc_host, const DC_ITEM *dc_item, + const DB_ALERT *alert, const DB_ACKNOWLEDGE *ack, const char *tz, char **data, int macro_type, + char *error, int maxerrlen); -int substitute_simple_macros_unmasked(zbx_uint64_t *actionid, const DB_EVENT *event, const DB_EVENT *r_event, - zbx_uint64_t *userid, const zbx_uint64_t *hostid, const DC_HOST *dc_host, const DC_ITEM *dc_item, - DB_ALERT *alert, const DB_ACKNOWLEDGE *ack, const char *tz, char **data, int macro_type, char *error, - int maxerrlen); +int substitute_simple_macros_unmasked(const zbx_uint64_t *actionid, const DB_EVENT *event, const DB_EVENT *r_event, + const zbx_uint64_t *userid, const zbx_uint64_t *hostid, const DC_HOST *dc_host, const DC_ITEM *dc_item, + const DB_ALERT *alert, const DB_ACKNOWLEDGE *ack, const char *tz, char **data, int macro_type, + char *error, int maxerrlen); void evaluate_expressions(zbx_vector_ptr_t *triggers); void prepare_triggers(DC_TRIGGER **triggers, int triggers_num); |