Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
Merge in ZBX/zabbix from feature/DEV-2329-6.3-a to master
* commit '8fe758308d46958ddee5fc3438054d7883ccfed0':
.......... [DEV-2329] fix
.......... [DEV-2329] fi
.......... [DEV-2329] fix
.......... [DEV-2329] fix
.......... [DEV-2329] fix
.......... [DEV-2329] fix
.......... [DEV-2329] added backup/restore annotation
.......... [DEV-2329] added backup/restore annotation
.......... [DEV-2329] reordered test
.......... [DEV-2329] added backup/restore annotation
.......... [DEV-2329] fix
.......... [DEV-2329] reverted unnecessary changes
.......... [DEV-2329] added data collection test
.......... [DEV-2329] added full implementation of proxy-server confsync test
.......... [DEV-2329] added full implementation of proxy-server confsync test
.......... [DEV-2329] implemented
.......... [DEV-2329] experimental impl
|
|
|
|
|
|
|
|
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)
|
|
message for autotest
|
|
vertical display to CCheckBoxList; removed CSeverityCheckBoxList
Merge in ZBX/zabbix from feature/ZBX-20320-5.5 to master
* commit 'c1db7713aa823e8881ac3ee051c59de4602ec237': (24 commits)
..F....... [ZBX-20320] changed user role checkbox list whole grid width to 540px
..F....... [ZBX-20320] changed back dashboard checkbox for user roles
.......... [ZBX-20320] fixed Selenium tests, removed checkbox list element mentioned in the linked task DEV-1859
..F....... [ZBX-20320] fixed coding style
..F....... [ZBX-20320] changed css style checkbox-list grid-template-columns to adjust to minmax size
..F....... [ZBX-20320] fixed code style
..F....... [ZBX-20320] fixed ids format created by CCheckBoxList
..F....... [ZBX-20320] fixed undefined name index error in serice additional rules
..F....... [ZBX-20320] fixed CCheckboxList in audit log filter
..F....... [ZBX-20320] fixed undefined index 'name' for CSeverity runtime error
..F....... [ZBX-20320] fixed userrole edit page disabled checkboxes for super admin
..F....... [ZBX-20320] changed setVertical function paramaeter to optional in CCheckBoxList
..F....... [ZBX-20320] fixed undefined index errors
..F....... [ZBX-20320] changed checkboxlist internal constant to ZBX_STYLE_CLASS
..F....... [ZBX-20320] made changes according to the comments in PR
..F....... [ZBX-20320] moved ZBX_STYLE_CHECKBOX_LIST and ZBX_STYLE_VERTICAL constants from defines file to internal CCheckboxList constants
..F....... [ZBX-20320] added id to user role UI elements so that checkboxes would work after merge
..F....... [ZBX-20320] implemented CCheckBoxList as a grid
..F....... [ZBX-20320] added to CheckBoxList setUncheckedValue option; fixed user roles unchecked values
.D........ [ZBX-20320] updated ChangeLog
...
|
|
* commit '34495a3c0dd27ed8dbce87068a258dfb9099da43':
.........T [ZBX-21588] optimized template k8s nodes by http
.........T [ZBX-21588] optimized template k8s nodes by http
.........T [ZBX-21588] optimized template k8s nodes by http
.........T [ZBX-21588] optimized template k8s nodes by http
|
|
|
|
|
|
|
|
|
|
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)
|
|
OS templates to 15m
* commit 'b9aa84c7ee693cadf2d9b51dc0e123f4137887d8':
.........T [ZBX-21620] fixed descriptions in OS templates
.........T [ZBX-21620] added discard with heartbeat
.........T [ZBX-21620] changed update interval for passwd checksum item in OS templates to 15m
|
|
Merge in ZBX/zabbix from feature/ZBX-21825-6.3 to master
* commit 'db421a90914101fc3da46b8041b65c7170d1b2ec':
........S. [ZBX-21825] improved history syncer performance
........S. [ZBX-21825] improved history syncer performance
|
|
* commit '12acdd4a81d76d894616592ae39ff403a0793fe3':
.........T [ZBXNEXT-6844] edited Cisco Meraki README.md
.........T [ZBXNEXT-6844] added Cisco Meraki template
|
|
|
|
|
|
CWidgetHelper.php, screen.scss
|
|
|
|
Merge in ZBX/zabbix from feature/ZBX-21785-6.2 to release/6.2
* commit 'e8e0c28e8a18bed22c02f8174930d4ef969d363d':
.......... [ZBX-21785] reverted testFormFilterProblems autotest changes
.......... [ZBX-21785] updated testPageReportsAudit and testFormFilterProblems autotest
..F....... [ZBX-21785] fixed Actions checkboxes in Audit log form filter
(cherry picked from commit 0f7d5fc5c7276afffcf12fde1d51463f85ae6b78)
|
|
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)
|
|
Merge in ZBX/zabbix from feature/ZBXNEXT-7903-6.3 to master
* commit 'dda499f21be5ba95131939d442ab7c5a9dc14008':
.........T [ZBXNEXT-7903] added templates for Azure PostgreSQL servers
|
|
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)
|
|
|
|
* commit '605f17ac9f2edba274c4c5ff24125dfbae3ddf58':
.........T [ZBXNEXT-7949] added a suffix "by" of template names
.........T [ZBXNEXT-7949] added a suffix "by" of template names
.........T [ZBXNEXT-7949] added a suffix "by" of template names
.........T [ZBXNEXT-7949] added a suffix "by" of template names
.........T [ZBXNEXT-7949] added a suffix "by" of template names
|
|
CONFIG_LOG_TYPE, CONFIG_LOG_FILE and CONFIG_LOG_FILE_SIZE
|
|
* commit 'f66bb5468894a77b4f2c73aa8f156456506a17af':
.........T [ZBX-20478] fixed script k8s cluster state
|
|
Merge in ZBX/zabbix from feature/DEV-2135-6.3-1 to master
* commit '39d00691a0a0af2b4de3dfc33a2509e773478f8e':
.......... [DEV-2135] fixed PR warnings
.......... [DEV-2135] removed unnecessary typedef
.......... [DEV-2135] fixed some coding stype issues
.......... [DEV-2135] fixed commit hooks
.......... [DEV-2135] refactored dbcache part 1
|
|
ssh://git.zabbix.com:7999/zbx/zabbix into feature/DEV-2135-6.3-1
|
|
|
|
|
|
|
|
and media types
|
|
|
|
|