Age | Commit message (Collapse) | Author |
|
|
|
changed interface copying during template linking to use similar logic as API
Merge in ZBX/zabbix from feature/ZBX-19813-6.2 to release/6.2
* commit '8f28ff9f636f929c86776fefdf65f5cf2ae3dc78':
........S. [ZBX-19813] improved interface update during LLD linking and changed interface copying during template linking to use similar logic as API
(cherry picked from commit de192ff23245b89d6d6d76a503d8a4ae71726b48)
|
|
5.0 or 5.2
Merge in ZBX/zabbix from feature/ZBX-21869-6.0 to release/6.0
* commit '843424eb3d9585ac5c00c899697b4ec2b19f9a41':
.......... [ZBX-21869] changed trigger_queue handling when upgrading from 5.0 or 5.2
(cherry picked from commit 70be0421244eaf107478833d1466fc17e8f041bb)
|
|
|
|
|
|
scenario step request
Merge from development branch feature/ZBX-21765-6.0
* commit '7c48f2897854c693cb6b887fffc6feb109cf305c':
.D........ [ZBX-21765] add ChangeLog entry
........S. [ZBX-21765] do not send Accept-Encoding HTTP header in a web scenario step by default
(cherry picked from commit 0071e0310cfce8ef54791d754f363f599a059a28)
(cherry picked from commit 9dd5db1ee86d37848669057413753f6ec2186393)
|
|
"timeout" option -t
Merge from development branch feature/ZBX-21715-5.0
* commit '626c1865af4ec548e23f4546c3526f8f695b30c1':
.D........ [ZBX-21715] "improve" ChangeLog entry
.D........ [ZBX-21715] add ChangeLog entry
.......... [ZBX-21715] zabbix_js: fix crash when parsing short version of "timeout" option -t
(cherry picked from commit 987ff5b9cdc5aaf21de744c843e78da785e660f1)
(cherry picked from commit 07d9ae36732e63cb851c7b0cc4c97d287d3c1d4f)
(cherry picked from commit 5c40c1b46d215cd3968c4145ce6a26ac9387dde7)
|
|
expressions
Merge in ZBX/zabbix from feature/ZBX-21616-6.3 to master
* commit '1873100855685ae887206895a1e119b93d9905fe':
........S. [ZBX-21616] renamed define
........S. [ZBX-21616] fixed function description comment
........S. [ZBX-21616] got rid of ZBX_FALLTROUGH
.......... [ZBX-21616] code style fix
........S. [ZBX-21616] fixed offseet calculation when replacing condition ids with values
........S. [ZBX-21616] added more optimizations to LLD filter processing
........S. [ZBX-21616] optimized
.......... [ZBX-21616] added changelog
.......... [ZBX-21616] added changelog
........S. [ZBX-21616] refactored and reimplemented parsing logics
........S. [ZBX-21616] fixed error due to non-existent macros in custom expressions
|
|
|
|
(cherry picked from commit 8aac0f7b3ed2d906f6612a3e94ef71b66999d4fc)
|
|
item parameters removal
* commit '0362810fddc3a412fc08a3cf9c2bb3e3d1db178f':
.......PS. [ZBX-21786] fixed 'invalid timeout' error occurring after script item parameters removal
(cherry picked from commit a4afd0a56adc59628728b210b8faeb1258ed888a)
(cherry picked from commit 17ff81f9b4d32f8b667faedf4077119e70859e62)
|
|
* commit '81216cd29ba24d93e012a7de75fb17204b93d218':
.......PS. [ZBX-21655] fixed possible memory leak
(cherry picked from commit cc875b3736ce564d99e43b8618155f669fd6c8a2)
|
|
|
|
systems with zero total inodes count
* commit '6a8963b239523b89b0c8b01e8f418c4497dbf4d3':
...G...... [ZBX-21823] fixed agent2 vfs.fs.size to correspond to agentd
.D........ [ZBX-21823] added changelog
...G...... [ZBX-21823] fixed vfs.fs.get to include file systems with zero inodes count; fixed vfs.fs.inode[,pfree/pused] to not become not supported if inodes total count is zero
(cherry picked from commit 32f78a0c1b1e39814cc83962d81d86a061272438)
(cherry picked from commit b1d418bf3a2934e4c45ba949c1c9d4356286df7e)
(cherry picked from commit 46ec18edcc541f1e2b2d35ee1d62d78754a1bc6e)
|
|
primary keys for tables
Merge in ZBX/zabbix from feature/ZBX-21869-6.0 to release/6.0
* commit '94ed6d554f2faea1576437cea95b18e94e7b9976':
.D........ [ZBX-21869] added changelog entry
.......... [ZBX-21869] added primary key to the initial trigger_queue table creation patch
(cherry picked from commit fc92ce1021f3f3760b8e651ab423bf070a1f5057)
|
|
|
|
CONFIG_LOG_TYPE, CONFIG_LOG_FILE and CONFIG_LOG_FILE_SIZE
|
|
ssh://git.zabbix.com:7999/zbx/zabbix into feature/DEV-2135-6.3-1
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# ui/include/classes/api/services/CConfiguration.php
# ui/include/classes/core/ZBase.php
# ui/include/classes/import/converters/C62ImportConverter.php
|
|
# ui/app/views/monitoring.latest.view.php
# ui/tests/include/web/elements/CWidgetElement.php
|
|
|
|
|
|
|
|
|
|
same datastore multiple times
* commit 'ed03a7e2a083f9b49e35f9819455fb7fd7165da5':
.......PS. [ZBX-21655] fixed unnecessary ret initialization
.......PS. [ZBX-21655] added zbx_iso8601_utc to git ignore list
.......PS. [ZBX-21655] fixed merge artifacts
.......PS. [ZBX-21655] prepared for merge with ZBXNEXT-6401
.D........ [ZBX-21655] fixed changelog entry
.......PS. [ZBX-21655] fixed minor coding style
.D........ [ZBX-21655] fixed changelog entry
.......PS. [ZBX-21655] reworked pr collection
.......PS. [ZBX-21655] fixed cluster alarms xpath
.......PS. [ZBX-21655] minor soap logging improvement
.......PS. [ZBX-21655] minor refactoring
........S. [ZBX-21655] removed unnecessary variable
........S. [ZBX-21655] fixed vmware datastore discovery to not return the same datastore multiple times
(cherry picked from commit e28fc1a0ea2448474880be9a01495b0b1143fb73)
|
|
|
|
ssh://git.zabbix.com:7999/zbx/zabbix into feature/ZBXNEXT-8040-6.3
|
|
|
|
|
|
'user' parameter is set
* commit 'b7d9aa8f55a762be81ff30cc4d5e8aaf4353a189':
...G...... [ZBX-21689] fixed proc.num to not crash agent on Windows when 'user' parameter is set
(cherry picked from commit 558bfb0df11adad54c550734bd57e9cd8649386c)
|
|
|
|
|
|
|
|
* commit '4b1a5e04bc24e5fdcf5d602120321bd539d20f8b':
...G...... [DEV-2302] specified unused arguments in zbxwinservice library
...G...... [DEV-2302] refactored minor adjustments in zbxwin32 library
...G...... [DEV-2302] added zbx_ prefix to zbxwin32 macros
...G...... [DEV-2302] removed include dublication
...G...... [DEV-2302] fixed unused function warning
...G...... [DEV-2302] refactored macros in zbxwin32 library
...G...... [DEV-2302] removed external references from zbxwin32 and zbxwinservice libraries
...G...... [DEV-2302] extracted zbxwinservice from zbxwin32
...G...... [DEV-2302] refactored zbxwin32 library
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
CONFIG_LOG_TYPE, CONFIG_LOG_FILE and CONFIG_LOG_FILE_SIZE
|
|
|
|
|