Age | Commit message (Collapse) | Author |
|
|
|
|
|
ssh://git.zabbix.lan:7999/zbx/zabbix into feature/ZBXNEXT-6923-5.5
|
|
cherry-picked from 938d0afc139eb45eb6d8dfab67a0f57f45e35eee
conflicts:
tests/libs/zbxserver/Makefile.am
|
|
|
|
or when LTO is used
|
|
|
|
|
|
and LLD)
|
|
|
|
conflicts in:
- create/src/schema.tmpl
- include/db.h
- include/zbxhistory.h
- src/libs/zbxdbupgrade/dbupgrade_5030.c
- src/libs/zbxhistory/history.c
- ui/include/defines.inc.php
|
|
|
|
ssh://git.zabbix.lan:7999/zbx/zabbix into feature/ZBXNEXT-6452-5.3
|
|
Merge in ZBX/zabbix from feature/DEV-1639-5.0 to release/5.0
* commit '50df03c3cfe89dcb755b734159cf364532f5d00d':
.......... [DEV-1639] added component to changelog entry
........S. [DEV-1639] fixed warning
........S. [DEV-1639] fixed item update during valuecache read lock, fixed item removal with disabled value cache
........S. [DEV-1639] moved time() call outside loop/lock when updating statistics
........S. [DEV-1639] fixed possibility of item being removed by housekeeper when item is added and data has not been yet retrieved
........S. [DEV-1639] changed write lock to read lock when retrieving value cache statistics
........S. [DEV-1639] fixed item removal from value cache on data retrieval failure
........S. [DEV-1639] fixed value cache item cleanup on data retrieval failure
........S. [DEV-1639] added value cache rwlock to diaginfo stats
........S. [DEV-1639] fixed indentation
........S. [DEV-1639] added const
.......... [ZBXNEXT-6497] added changelog entry
........S. [DEV-1639] removed valuecache item state
........S. [DEV-1639] added read/write locks to value cache
(cherry picked from commit 36ad10a84cba20853fd9e2d82ca14298e688b07a)
|
|
|
|
|
|
|
|
|
|
|
|
expression syntax
(trigger recalculation, macro resolving, etc - all places that parsed
trigger expression to extract functionids).
|
|
to avoid cyclic dependencies
|
|
|
|
tests_run.pl
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
functions, added test cases
|
|
test cases
|
|
|
|
|
|
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)
|
|
* commit '8c0131ee5461a78df53082ac7c47cc4424bc744a': (29 commits)
.......... [ZBXNEXT-3205] fixed unit test extend
.......... [ZBXNEXT-3205] added unit test
..F....... [ZBXNEXT-3205] fixed code style
..F....... [ZBXNEXT-3205] fixed macro sorting
A.F....... [ZBXNEXT-3205] fixed global macro incorrect check
..F....... [ZBXNEXT-3205] fixed code style
..F....... [ZBXNEXT-3205] fixed code style
..F....... [ZBXNEXT-3205] fixed macro ordering
..F....... [ZBXNEXT-3205] fixed code style
..F....... [ZBXNEXT-3205] fixed code style
..F....... [ZBXNEXT-3205] fixed code style
..F....... [ZBXNEXT-3205] fixed code style
A.F....... [ZBXNEXT-3205] fixed code style; fixed macro order
A......... [ZBXNEXT-3205] fixed code style
A......... [ZBXNEXT-3205] fixed incorrect macro compare
.......PS. [ZBXNEXT-3205] removed redundant code
.......PS. [ZBXNEXT-3205] style fix
.......PS. [ZBXNEXT-3205] style fix
.......PS. [ZBXNEXT-3205] fixed crash on macro removal
.......PS. [ZBXNEXT-3205] style fix
...
|
|
(cherry picked from commit fe50c591d19db5ee990a680ee7bc9b7eb224999b)
|
|
|
|
|
|
parsers
|
|
|
|
|
|
|
|
|
|
|
|
substitute_lld_macros function
|
|
|
|
|