diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2021-04-12 15:36:45 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2021-04-12 15:37:20 +0300 |
| commit | b3d03b8df55767fc41c66a07b6db0a7054497bdd (patch) | |
| tree | 9ef8b29546258e9d2ca17af9acbdbad8032e5671 /include/zbxserver.h | |
| parent | 54398cf5ee892f5dfce1b01f85963c6daac2cfa9 (diff) | |
........S. [ZBXNEXT-6451] copied libzxbeval from the calculated item branch, added macro expression evaluation
Diffstat (limited to 'include/zbxserver.h')
| -rw-r--r-- | include/zbxserver.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/zbxserver.h b/include/zbxserver.h index 4f540cea9dc..1c6509b02cd 100644 --- a/include/zbxserver.h +++ b/include/zbxserver.h @@ -50,10 +50,9 @@ #define MACRO_TYPE_ALLOWED_HOSTS 0x00800000 #define MACRO_TYPE_ITEM_TAG 0x01000000 #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_TYPE_SCRIPT_PARAMS_FIELD 0x04000000 +#define MACRO_TYPE_SCRIPT_NORMAL 0x08000000 +#define MACRO_TYPE_SCRIPT_RECOVERY 0x10000000 #define MACRO_EXPAND_NO 0 #define MACRO_EXPAND_YES 1 @@ -65,6 +64,7 @@ int evaluate_function(char **value, DC_ITEM *item, const char *function, const c int evaluate_function2(zbx_variant_t *value, DC_ITEM *item, const char *function, const char *parameter, const zbx_timespec_t *ts, char **error); +int zbx_is_trigger_function(const char *name, size_t len); 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, |