diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2020-07-16 10:28:35 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2020-07-16 10:31:39 +0300 |
| commit | 3a352fb54d26feae762f2ebb1041aedbe5995d5e (patch) | |
| tree | 9c53375d78c4990d2620eadf2ca89e2062c01b43 /include/zbxserver.h | |
| parent | 8b905d174eee85f86b1a296d8ee840083061c68d (diff) | |
........S. [ZBXNEXT-6042] optimized trigger, calculated item processing by resolving user macros during configuration cache synchronization
* commit 'ae4645be5080ef59cfd0267bc960d99197f77ed3':
.D........ [ZBXNEXT-6042] updated changelog entry
........S. [ZBXNEXT-6042] fixed use of uninitialised variable
........S. [ZBXNEXT-6042] removed unused function
.......PS. [ZBXNEXT-6042] removed redundant initialization
.......... [ZBXNEXT-6042] added dc_expand_user_macros_in_calcitem() function test suite
.......... [ZBXNEXT-6042] renamed test suite to match the renamed function
.......... [ZBXNEXT-6042] moved user macro mocks to separae configcache mocking library
.......... [ZBXNEXT-6042] merged global and host macro mock code and moved to separate file
.......... [ZBXNEXT-6042] add first test cases for dc_expand_user_macros_in_func_params() function
........S. [ZBXNEXT-6042] added user macro resolving in calculated item formulas during configuration cache sync
........S. [ZBXNEXT-6042] fixed internal/external (dc_/zbx_dc_) configuration cache function naming and expression macro expanding without chache locking when polling calculated items
........S. [ZBXNEXT-6042] fixed user macro resolving in simple macro function parameters
.D........ [ZBXNEXT-6042] added changelog entry
........S. [ZBXNEXT-6042] removed macro resolving in user parameters during trigger processing because function parameter user macros are already resolved during conifguration cache sync
........S. [ZBXNEXT-6042] added function parameter user macro resolving during configuration cache sync
(cherry picked from commit 7bd5435bd09ac8ef954fc1c913b61d70dffc81b2)
Diffstat (limited to 'include/zbxserver.h')
| -rw-r--r-- | include/zbxserver.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/zbxserver.h b/include/zbxserver.h index f05ff721123..8eeed877e4e 100644 --- a/include/zbxserver.h +++ b/include/zbxserver.h @@ -54,7 +54,7 @@ #define STR_CONTAINS_MACROS(str) (NULL != strchr(str, '{')) -char *zbx_dc_expand_user_macros_in_expression(const char *text, zbx_uint64_t *hostids, int hostids_num); +char *dc_expand_user_macros_in_expression(const char *text, zbx_uint64_t *hostids, int hostids_num); 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); |