diff options
| author | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2020-03-26 11:58:32 +0300 |
|---|---|---|
| committer | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2020-03-26 11:58:32 +0300 |
| commit | b9050ebb556cb82d4c354e7382e6bc6dafbcd5c0 (patch) | |
| tree | 35ef2153aabbcc927e6ab9f8644ae4d677f94f82 /include/zbxserver.h | |
| parent | 72ce77333e82652c146fbdfe9aa44665cc54afad (diff) | |
| parent | 5f73a8536a9c639ef1b30f6cca1eef0f968328ce (diff) | |
........S. [ZBXNEXT-1961] merge with master, fixed conflict in dbsync.c
Diffstat (limited to 'include/zbxserver.h')
| -rw-r--r-- | include/zbxserver.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/zbxserver.h b/include/zbxserver.h index 36b605b7d7b..8a3b291b48a 100644 --- a/include/zbxserver.h +++ b/include/zbxserver.h @@ -65,6 +65,10 @@ int substitute_simple_macros(zbx_uint64_t *actionid, const DB_EVENT *event, cons 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, 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, char **data, int macro_type, char *error, int maxerrlen); + void evaluate_expressions(zbx_vector_ptr_t *triggers); void zbx_format_value(char *value, size_t max_len, zbx_uint64_t valuemapid, @@ -87,11 +91,16 @@ int substitute_lld_macros(char **data, const struct zbx_json_parse *jp_row, cons int flags, char *error, size_t max_error_len); int substitute_key_macros(char **data, zbx_uint64_t *hostid, DC_ITEM *dc_item, const struct zbx_json_parse *jp_row, const zbx_vector_ptr_t *lld_macro_paths, int macro_type, char *error, size_t mexerrlen); +int substitute_key_macros_unmasked(char **data, zbx_uint64_t *hostid, DC_ITEM *dc_item, + const struct zbx_json_parse *jp_row, const zbx_vector_ptr_t *lld_macro_paths, int macro_type, + char *error, size_t mexerrlen); int substitute_function_lld_param(const char *e, size_t len, unsigned char key_in_param, char **exp, size_t *exp_alloc, size_t *exp_offset, const struct zbx_json_parse *jp_row, const zbx_vector_ptr_t *lld_macro_paths, char *error, size_t max_error_len); int substitute_macros_xml(char **data, const DC_ITEM *item, const struct zbx_json_parse *jp_row, const zbx_vector_ptr_t *lld_macro_paths, char *error, int maxerrlen); +int substitute_macros_xml_unmasked(char **data, const DC_ITEM *item, const struct zbx_json_parse *jp_row, + const zbx_vector_ptr_t *lld_macro_paths, char *error, int maxerrlen); int zbx_substitute_item_name_macros(DC_ITEM *dc_item, const char *name, char **replace_to); int substitute_macros_in_json_pairs(char **data, const struct zbx_json_parse *jp_row, const zbx_vector_ptr_t *lld_macro_paths, char *error, int maxerrlen); |