diff options
| author | Aleksejs Sestakovs <aleksejs.sestakovs@zabbix.com> | 2022-02-18 13:39:48 +0300 |
|---|---|---|
| committer | Aleksejs Sestakovs <aleksejs.sestakovs@zabbix.com> | 2022-02-18 13:41:01 +0300 |
| commit | 82419f0030ea3e4df89dcdfc99521769c87c3284 (patch) | |
| tree | 0dd7c480ea6a5fb9890122dc8b60d67f0b914424 /include/zbxserver.h | |
| parent | ec093975fa8f1fd231b07b94d38e8465cf0ae54e (diff) | |
........S. [ZBX-20334] fixed macro support in aggregate functions
* commit 'd5d34fad82afa6eae4b4e01d006e544835441361':
........S. [ZBX-20334] fixed coding style
........S. [ZBX-20334] fixed macro support in aggregate functions
(cherry picked from commit d186fc753cb4b50389baaf4335f40050d2204d09)
Diffstat (limited to 'include/zbxserver.h')
| -rw-r--r-- | include/zbxserver.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/zbxserver.h b/include/zbxserver.h index b317e212a40..db0d65fa8df 100644 --- a/include/zbxserver.h +++ b/include/zbxserver.h @@ -55,6 +55,7 @@ #define MACRO_TYPE_SCRIPT_NORMAL 0x08000000 #define MACRO_TYPE_SCRIPT_RECOVERY 0x10000000 #define MACRO_TYPE_REPORT 0x20000000 +#define MACRO_TYPE_QUERY_FILTER 0x40000000 #define MACRO_EXPAND_NO 0 #define MACRO_EXPAND_YES 1 @@ -115,6 +116,7 @@ zbx_expression_eval_t; void zbx_expression_eval_init(zbx_expression_eval_t *eval, int mode, zbx_eval_context_t *ctx); void zbx_expression_eval_clear(zbx_expression_eval_t *eval); void zbx_expression_eval_resolve_item_hosts(zbx_expression_eval_t *eval, const DC_ITEM *item); +void zbx_expression_eval_resolve_filter_macros(zbx_expression_eval_t *eval, const DC_ITEM *item); void zbx_expression_eval_resolve_trigger_hosts(zbx_expression_eval_t *eval, const DB_TRIGGER *trigger); int zbx_expression_eval_execute(zbx_expression_eval_t *eval, const zbx_timespec_t *ts, zbx_variant_t *value, char **error); |