Age | Commit message (Collapse) | Author |
|
reports cookies
|
|
resolved conflicts in:
# ui/include/defines.inc.php
|
|
|
|
|
|
|
|
in Oracle by ODBC and by agent2 template
|
|
|
|
|
|
|
|
|
|
Merge in ZBX/zabbix from feature/ZBX-20350-5.5 to master
* commit '63c3e8cde9dcb5b208d1e3a87e4b4120fd056094':
A.F....... [ZBX-20350] changed hash algo for encrypted cookies
|
|
|
|
* commit 'f8898fe177f82c15bc4b7c11c2a0f8c699fcca14':
...G...... [ZBX-20164] fixed agent2 crash caused by wmi metrics
(cherry picked from commit 36359117f857f78937d6501446d883b3c440e073)
(cherry picked from commit 5220e72e3ed006f7f2ab82c56d7757d5f97f5db3)
|
|
|
|
|
|
|
|
|
|
* commit '3a4d5c277ce9e7d34155d8aca9dcd2bf2068ef64':
........S. [ZBX-20249] fixed escalator query failure on Oracle
|
|
* commit '3862c62bb880076ecd8a593fe27064a1323074fd':
........S. [ZBX-19351] fixed event correlation query failure on Oracle
|
|
latest guidelines
|
|
conflicts:
tests/libs/zbxprometheus/zbx_prometheus_pattern.yaml
|
|
|
|
|
|
|
|
|
|
|
|
|
|
preprocessing in templates Etcd, Vault, Linux
* commit '4b02e0f7a16839a02fd8dda5b5b733459c79d528':
.........T [ZBXNEXT-7112] added new fields in PROMETHEUS_PATTERN preprocessing in templates Etcd, Vault, Linux
|
|
preprocessing in templates Etcd, Vault, Linux
|
|
inventory field processing and initial view hintbox text in geomap widget
Merge in ZBX/zabbix from feature/ZBX-20270-5.5 to master
* commit 'a0ad566e96cb09a3ee49b78275603a1d9b3707ed':
.......... [ZBX-20270] updated unit tests
..F....... [ZBX-20270] added newline in hintbox
A.F....... [ZBX-20270] changed usage of max zoom level in geomap widget
..F....... [ZBX-20270] reverted unneeded change
A.F....... [ZBX-20270] fixed inifinite loader and zoomlevel validation
.D........ [ZBX-20270] fixed changelog
..F....... [ZBX-20270] fixed coding style
..F....... [ZBX-20270] removed code duplicate
.D........ [ZBX-20270] added changelog
..F....... [ZBX-20270] reworked hintbox for widget configuration labels
..F....... [ZBX-20270] fixed invenoty lat/lng field validation before putting host marker on the map
..F....... [ZBX-20270] fixed inline css
..F....... [ZBX-20270] fixed initial view field hintbox
..F....... [ZBX-20270] fixed xss vulnerability in geomap host popup
A.F....... [ZBX-20270] fixed max zoom validation
|
|
|
|
- ui/include/classes/widgets/views/widget.geomap.form.view.php
|
|
prototypes, lld rules, host prototypes, when user with type "Admin" was edited them on template which is linked to non-permitted for him templates or hosts
* commit '5640806cd4bf7cae9210ed62d412f7dd52c90c18':
A......... [ZBX-20238] fixed PHP runtime errors while updating a web scenarion linked to not accessible templates or hosts
A......... [ZBX-20328] fixed incomplete inheritance of items, item prototypes, lld rules, host prototypes, when user with type "Admin" was edited them on template which is linked to non-permitted for him templates or hosts
|
|
|
|
prototypes, lld rules, host prototypes, when user with type "Admin" was edited them on template which is linked to non-permitted for him templates or hosts
|
|
Merge in ZBX/zabbix from feature/ZBX-20232-5.5 to master
* commit '15c11166d877ccbbd0d17e918f352922ddab65a3':
.D........ [ZBX-20232] added changelog entry
........S. [ZBX-20232] remove standalone nodes when starting in HA mode and vice versa
|
|
* commit 'bc549ebc8b2b9ce434a4802db9e858899e3575df':
.......PS. [ZBXNEXT-7100] added new LLD macro HV.NETNAME
(cherry picked from commit 1fea76b578adab188d3e42974872014fbdeb68c6)
(cherry picked from commit 7b1db3289bfd9f7e43bf1b3e7f360f817873ea20)
|
|
* commit '92c34bb1255380eda2326d31dc8650c1fc9dcc29':
.........T [ZBX-20113] fixed dots in zabbix doc url in vmware template
.........T [ZBX-20113] fixed various typos in vmware template
.........T [ZBX-20113] fixed items value map for VMware template
|
|
{ITEM.STATE.ERROR},{LLDRULE.STATE.ERROR},{TRIGGER.STATE.ERROR} macros to indicate error messages in internal monitoring alerts
|
|
|
|
|
|
conflicts
|
|
|
|
|
|
histogram_quantile() if bucket[+inf] = 0
* commit '9f4af3c05db1b1e50a5a4e9465c2dc2f8c72d12d':
.......PS. [ZBX-20311] added cmocka tests for -1 case
.......PS. [ZBX-20311] returned the value -1 in case the rate[inf] = 0
|
|
|
|
preprocessing step, added bulk preprocessing for dependent items
Merge in ZBX/zabbix from feature/ZBXNEXT-7049-5.5 to master
* commit '75c064d6406c637267ae80a16a0a94750755baff': (55 commits)
.D........ [ZBXNEXT-7049] added changelog entry
........S. [ZBXNEXT-7049] fixed warnings
.......... [ZBXNEXT-7049] added one more value check
.......... [ZBXNEXT-7049] added default values check
.......... [ZBXNEXT-7049] added scenario for cheking prometheus fields
........S. [ZBXNEXT-7049] improved prometheus parsing error messages
........S. [ZBXNEXT-7049] reverted 'no space before metric value' message to include the leftover data
........S. [ZBXNEXT-7049] improved prometheus parsing error messages
........S. [ZBXNEXT-7049] don't copy cached values when preprocessing dependent items
..F....... [ZBXNEXT-7049] fixed preprocessing pattern function beeing editable, when inherited
........S. [ZBXNEXT-7049] removed redundant code
.......... [ZBXNEXT-7049] fixed prometeus step parameters part 2
........S. [ZBXNEXT-7049] fixed indentation
........S. [ZBXNEXT-7049] fixed indentation
.......... [ZBXNEXT-7049] fixed prometeus step parameters
.......... [ZBXNEXT-7049] fixed prometeus data, added new cases, fixed trailing spaces scenario
.......... [ZBXNEXT-7049] fixed prometeus parameter in data
.......... [ZBXNEXT-7049] fixed prometeus parameter step locator
........S. [ZBXNEXT-7049] fixed memory leak in prometheus cache
........S. [ZBXNEXT-7049] fixed prometheus pattern validation in LLD
...
|
|
|
|
|
|
|