diff options
Diffstat (limited to 'include/zbxserver.h')
| -rw-r--r-- | include/zbxserver.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/zbxserver.h b/include/zbxserver.h index 4db94678138..4f540cea9dc 100644 --- a/include/zbxserver.h +++ b/include/zbxserver.h @@ -24,6 +24,7 @@ #include "db.h" #include "dbcache.h" #include "zbxjson.h" +#include "zbxvariant.h" #define MACRO_TYPE_MESSAGE_NORMAL 0x00000001 #define MACRO_TYPE_MESSAGE_RECOVERY 0x00000002 @@ -59,11 +60,11 @@ #define STR_CONTAINS_MACROS(str) (NULL != strchr(str, '{')) -int get_N_functionid(const char *expression, int N_functionid, zbx_uint64_t *functionid, const char **end); -void get_functionids(zbx_vector_uint64_t *functionids, const char *expression); - int evaluate_function(char **value, DC_ITEM *item, const char *function, const char *parameter, const zbx_timespec_t *ts, char **error); +int evaluate_function2(zbx_variant_t *value, DC_ITEM *item, const char *function, const char *parameter, + const zbx_timespec_t *ts, char **error); + 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, @@ -76,15 +77,13 @@ int substitute_simple_macros_unmasked(const zbx_uint64_t *actionid, const DB_EVE char *error, int maxerrlen); void evaluate_expressions(zbx_vector_ptr_t *triggers); +void prepare_triggers(DC_TRIGGER **triggers, int triggers_num); void zbx_format_value(char *value, size_t max_len, zbx_uint64_t valuemapid, const char *units, unsigned char value_type); void zbx_determine_items_in_expressions(zbx_vector_ptr_t *trigger_order, const zbx_uint64_t *itemids, int item_num); -void get_trigger_expression_constant(const char *expression, const zbx_token_reference_t *reference, - char **constant); - /* lld macro context */ #define ZBX_MACRO_ANY (ZBX_TOKEN_LLD_MACRO | ZBX_TOKEN_LLD_FUNC_MACRO | ZBX_TOKEN_USER_MACRO) #define ZBX_MACRO_NUMERIC (ZBX_MACRO_ANY | ZBX_TOKEN_NUMERIC) @@ -111,4 +110,5 @@ void zbx_substitute_item_name_macros(DC_ITEM *dc_item, const char *name, char ** 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); int xml_xpath_check(const char *xpath, char *error, size_t errlen); + #endif |