Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2021-05-10.......... [ZBXNEXT-6411] removed conversion of SNMPv1 template suffix for ↵Alex Kalimulin
seeds; updated templates.tmpl
2021-05-10A...I..... [ZBXNEXT-6411] updated to latest from master; resolved conflicts in:Alexander Shubin
# create/src/schema.tmpl # src/libs/zbxdbupgrade/dbupgrade_5030.c # templates/app/activemq_jmx/template_app_activemq_jmx.yaml # templates/app/apache_agent/template_app_apache_agent.yaml # templates/app/apache_http/template_app_apache_http.yaml # templates/app/aranet/aranet_cloud.yaml # templates/app/ceph_agent2/template_app_ceph_agent2.yaml # templates/app/docker/template_app_docker.yaml # templates/app/elasticsearch_http/template_app_elasticsearch_http.yaml # templates/app/etcd_http/template_app_etcd_http.yaml # templates/app/exchange/template_app_exchange.yaml # templates/app/exchange_active/template_app_exchange_active.yaml # templates/app/generic_java_jmx/template_app_generic_java_jmx.yaml # templates/app/gitlab_http/template_app_gitlab_http.yaml # templates/app/hadoop_http/template_app_hadoop_http.yaml # templates/app/haproxy_agent/template_app_haproxy_agent.yaml # templates/app/haproxy_http/template_app_haproxy_http.yaml # templates/app/iis_agent/template_app_iis_agent.yaml # templates/app/iis_agent_active/template_app_iis_agent_active.yaml # templates/app/jenkins/template_app_jenkins.yaml # templates/app/kafka_jmx/template_app_kafka_jmx.yaml # templates/app/memcached/template_app_memcached.yaml # templates/app/nginx_agent/template_app_nginx_agent.yaml # templates/app/nginx_http/template_app_nginx_http.yaml # templates/app/php-fpm_agent/template_app_php-fpm_agent.yaml # templates/app/php-fpm_http/template_app_php-fpm_http.yaml # templates/app/rabbitmq_agent/template_app_rabbitmq_agent.yaml # templates/app/rabbitmq_http/template_app_rabbitmq_http.yaml # templates/app/sharepoint_http/template_app_sharepoint_http.yaml # templates/app/squid_snmp/template_app_squid_snmp.yaml # templates/app/tomcat_jmx/template_app_tomcat_jmx.yaml # templates/app/vault_http/template_app_vault.yaml # templates/app/vmware/template_app_vmware.yaml # templates/app/vmware_fqdn/template_app_vmware_fqdn.yaml # templates/app/wildfly_domain_jmx/template_app_wildfly_domain_jmx.yaml # templates/app/wildfly_server_jmx/template_app_wildfly_server_jmx.yaml # templates/app/zookeeper_http/template_app_zookeeper_http.yaml # templates/cctv/hikvision/template_cctv_hikvision_camera.yaml # templates/classic/template_app_ftp_service.yaml # templates/classic/template_app_http_service.yaml # templates/classic/template_app_https_service.yaml # templates/classic/template_app_imap_service.yaml # templates/classic/template_app_ldap_service.yaml # templates/classic/template_app_nntp_service.yaml # templates/classic/template_app_ntp_service.yaml # templates/classic/template_app_pop_service.yaml # templates/classic/template_app_remote_zabbix_proxy.yaml # templates/classic/template_app_remote_zabbix_server.yaml # templates/classic/template_app_smtp_service.yaml # templates/classic/template_app_ssh_service.yaml # templates/classic/template_app_telnet_service.yaml # templates/classic/template_app_zabbix_proxy.yaml # templates/classic/template_app_zabbix_server.yaml # templates/classic/template_os_aix.yaml # templates/classic/template_os_freebsd.yaml # templates/classic/template_os_hp-ux.yaml # templates/classic/template_os_mac_os_x.yaml # templates/classic/template_os_openbsd.yaml # templates/classic/template_os_solaris.yaml # templates/classic/template_server_intel_sr1530_ipmi.yaml # templates/classic/template_server_intel_sr1630_ipmi.yaml # templates/db/cassandra_jmx/template_db_cassandra_jmx.yaml # templates/db/clickhouse_http/template_db_clickhouse_http.yaml # templates/db/ignite_jmx/template_db_ignite_jmx.yaml # templates/db/mongodb/template_db_mongodb.yaml # templates/db/mongodb_cluster/template_db_mongodb_cluster.yaml # templates/db/mssql_odbc/template_db_mssql_odbc.yaml # templates/db/mysql_agent/template_db_mysql_agent.yaml # templates/db/mysql_agent2/template_db_mysql_agent2.yaml # templates/db/mysql_odbc/template_db_mysql_odbc.yaml # templates/db/oracle_agent2/template_db_oracle_agent2.yaml # templates/db/oracle_odbc/template_db_oracle_odbc.yaml # templates/db/postgresql/template_db_postgresql.yaml # templates/db/postgresql_agent2/template_db_postgresql_agent2.yaml # templates/db/redis/template_db_redis.yaml # templates/db/tidb_http/tidb_pd_http/template_db_tidb_pd_http.yaml # templates/db/tidb_http/tidb_tidb_http/template_db_tidb_tidb_http.yaml # templates/db/tidb_http/tidb_tikv_http/template_db_tidb_tikv_http.yaml # templates/module/00icmp_ping/00template_module_icmp_ping.yaml # templates/module/ether_like_snmp/template_module_ether_like_snmp.yaml # templates/module/generic_snmp_snmp/template_module_generic_snmp_snmp.yaml # templates/module/host_resources_snmp/template_module_host_resources_snmp.yaml # templates/module/interfaces_simple_snmp/template_module_interfaces_simple_snmp.yaml # templates/module/interfaces_snmp/template_module_interfaces_snmp.yaml # templates/module/interfaces_win_snmp/template_module_interfaces_win_snmp.yaml # templates/module/smart_agent2/template_module_smart_agent2.yaml # templates/module/smart_agent2_active/template_module_smart_agent2_active.yaml # templates/module/zabbix_agent/template_module_zabbix_agent.yaml # templates/net/alcatel_timetra_snmp/template_net_alcatel_timetra_snmp.yaml # templates/net/arista_snmp/template_net_arista_snmp.yaml # templates/net/brocade_fc_sw_snmp/template_net_brocade_fc_sw_snmp.yaml # templates/net/brocade_foundry_sw_snmp/template_net_brocade_foundry_sw_snmp.yaml # templates/net/cisco_catalyst_3750/cisco_catalyst_3750_24fs_snmp/template_net_cisco_catalyst_3750_24fs_snmp.yaml # templates/net/cisco_catalyst_3750/cisco_catalyst_3750_24ps_snmp/template_net_cisco_catalyst_3750_24ps_snmp.yaml # templates/net/cisco_catalyst_3750/cisco_catalyst_3750_24ts_snmp/template_net_cisco_catalyst_3750_24ts_snmp.yaml # templates/net/cisco_catalyst_3750/cisco_catalyst_3750_48ps_snmp/template_net_cisco_catalyst_3750_48ps_snmp.yaml # templates/net/cisco_catalyst_3750/cisco_catalyst_3750_48ts_snmp/template_net_cisco_catalyst_3750_48ts_snmp.yaml # templates/net/cisco_snmp/template_net_cisco_snmp.yaml # templates/net/dell_force_s_series_snmp/template_net_dell_force_s_series_snmp.yaml # templates/net/dlink_des7200_snmp/template_net_dlink_des7200_snmp.yaml # templates/net/dlink_des_snmp/template_net_dlink_des_snmp.yaml # templates/net/extreme_snmp/template_net_extreme_snmp.yaml # templates/net/hp_hh3c_snmp/template_net_hp_hh3c_snmp.yaml # templates/net/hp_hpn_snmp/template_net_hp_hpn_snmp.yaml # templates/net/huawei_snmp/template_net_huawei_snmp.yaml # templates/net/intel_qlogic_infiniband_snmp/template_net_intel_qlogic_infiniband_snmp.yaml # templates/net/juniper_snmp/template_net_juniper_snmp.yaml # templates/net/mellanox_snmp/template_net_mellanox_snmp.yaml # templates/net/mikrotik_snmp/template_net_mikrotik_snmp.yaml # templates/net/morningstar_snmp/prostar_mppt_snmp/prostar_mppt_snmp.yaml # templates/net/morningstar_snmp/prostar_pwm_snmp/prostar_pwm_snmp.yaml # templates/net/morningstar_snmp/sunsaver_mppt_snmp/sunsaver_mppt_snmp.yaml # templates/net/morningstar_snmp/suresine_snmp/suresine_snmp.yaml # templates/net/morningstar_snmp/tristar_mppt_600V_snmp/tristar_mppt_600V_snmp.yaml # templates/net/morningstar_snmp/tristar_mppt_snmp/tristar_mppt_snmp.yaml # templates/net/morningstar_snmp/tristar_pwm_snmp/tristar_pwm_snmp.yaml # templates/net/netgear_snmp/template_net_netgear_snmp.yaml # templates/net/qtech_snmp/template_net_qtech_snmp.yaml # templates/net/tplink_snmp/template_net_tplink_snmp.yaml # templates/net/ubiquiti_airos_snmp/template_net_ubiquiti_airos_snmp.yaml # templates/os/linux/template_os_linux.yaml # templates/os/linux_active/template_os_linux_active.yaml # templates/os/linux_prom/template_os_linux_prom.yaml # templates/os/linux_snmp_snmp/template_os_linux_snmp_snmp.yaml # templates/os/windows_agent/template_os_windows_agent.yaml # templates/os/windows_agent_active/template_os_windows_agent_active.yaml # templates/power/apc/apc_ups_galaxy_3500_snmp/template_power_apc_ups_galaxy_3500_snmp.yaml # templates/power/apc/apc_ups_smart_2200_rm_snmp/template_power_apc_ups_smart_2200_rm_snmp.yaml # templates/power/apc/apc_ups_smart_3000_xlm_snmp/template_power_apc_ups_smart_3000_xlm_snmp.yaml # templates/power/apc/apc_ups_smart_rt_1000_rm_xl_snmp/template_power_apc_ups_smart_rt_1000_rm_xl_snmp.yaml # templates/power/apc/apc_ups_smart_rt_1000_xl_snmp/template_power_apc_ups_smart_rt_1000_xl_snmp.yaml # templates/power/apc/apc_ups_smart_srt_5000_snmp/template_power_apc_ups_smart_srt_5000_snmp.yaml # templates/power/apc/apc_ups_smart_srt_8000_snmp/template_power_apc_ups_smart_srt_8000_snmp.yaml # templates/power/apc/apc_ups_snmp/template_power_apc_ups_snmp.yaml # templates/power/apc/apc_ups_symmetra_lx_snmp/template_power_apc_ups_symmetra_lx_snmp.yaml # templates/power/apc/apc_ups_symmetra_rm_snmp/template_power_apc_ups_symmetra_rm_snmp.yaml # templates/power/apc/apc_ups_symmetra_rx_snmp/template_power_apc_ups_symmetra_rx_snmp.yaml # templates/san/huawei_5300v5_snmp/template_san_huawei_5300v5_snmp.yaml # templates/san/netapp_aff_a700_http/template_san_netapp_aff_a700_http.yaml # templates/san/netapp_fas3220_snmp/template_san_netapp_fas3220_snmp.yaml # templates/server/chassis_ipmi/template_server_chassis_ipmi.yaml # templates/server/cisco_ucs_snmp/template_server_cisco_ucs_snmp.yaml # templates/server/dell_idrac_snmp/template_server_dell_idrac_snmp.yaml # templates/server/hp_ilo_snmp/template_server_hp_ilo_snmp.yaml # templates/server/ibm_imm_snmp/template_server_ibm_imm_snmp.yaml # templates/server/supermicro_aten_snmp/template_server_supermicro_aten_snmp.yaml # templates/tel/asterisk_http/template_tel_asterisk_http.yaml # ui/include/classes/api/services/CValueMap.php # ui/include/classes/validators/CApiInputValidator.php # ui/include/defines.inc.php # ui/tests/unit/include/classes/validators/CApiInputValidatorTest.php
2021-05-10A.F.I...S. [ZBXNEXT-6411] updated to latest master; resolved conflicts in :Alexander Shubin
# create/src/schema.tmpl # create/src/templates.tmpl - ours for now # include/zbxserver.h # src/libs/zbxdbcache/dbconfig.c # src/libs/zbxdbupgrade/dbupgrade_5030.c # src/libs/zbxserver/expression.c # ui/include/classes/import/CImportDataAdapter.php # ui/include/classes/import/CConfigurationImport.php # ui/include/classes/import/CConfigurationImportcompare.php # ui/include/classes/import/importers/CTemplateImporter.php # ui/include/classes/import/converters/C52ImportConverter.php # ui/include/defines.inc.php # ui/tests/unit/include/classes/import/CImportDataAdapterTest.php # ui/tests/unit/include/classes/import/converters/C52ImportConverterTest.php
2021-05-10........S. [ZBXNEXT-6452] reworked syntax of generated sql 'false' condition ↵Andris Zeila
to match frontend
2021-05-10........S. [ZBXNEXT-6452] fixed typoAndris Zeila
2021-05-10........S. [ZBXNEXT-6452] fixed aggregate check sql query with OracleAndris Zeila
2021-05-08A.F.....S. [ZBXNEXT-6544] added new set of mathematical, aggregate and ↵Andrejs Verza
string functions for trigger expressions * commit '7e35f9722b2a2535a23b2b92f8fc836ae396539b': (69 commits) ..F....... [ZBXNEXT-6544,ZBXNEXT-6561] added ChangeLog ..F....... [ZBXNEXT-6544,ZBXNEXT-6561] fixed function grouping in trigger expression condition popup ..F....... [ZBXNEXT-6544,ZBXNEXT-6561] fixed output type definition for math functions ..F....... [ZBXNEXT-6544,ZBXNEXT-6561] improved coding style ..F....... [ZBXNEXT-6544,ZBXNEXT-6561] fixed input-output data definition for history functions ..F....... [ZBXNEXT-6561] updated the list of functions for testing trigger expression ..F....... [ZBXNEXT-6544,ZBXNEXT-6561] updated unit tests for CHistFunctionValidator ..F....... [ZBXNEXT-6544,ZBXNEXT-6561] fixed constant enumeration ..F....... [ZBXNEXT-6561] made "Chars" parameter optional for trim functions; added "Values" parameter for in() function ........S. [ZBXNEXT-6544] fixed missing countunique in zbx_is_trigger_function ..F....... [ZBXNEXT-6544,ZBXNEXT-6561] fixed partial expression (condition) validation ..F....... [ZBXNEXT-6561] fixed e(), pi() and rand() disappear from the list of functions on item change ..F....... [ZBXNEXT-6561] fixed changing item in condition popup always resets function to last(); fixed first function is selected in condition popup when editing trigger expression using expression constructor A.F....... [ZBXNEXT-6544,ZBXNEXT-6561] updated math function parsing and validation A.F....... [ZBXNEXT-6544,ZBXNEXT-6561] updated history function validation .......... [ZBXNEXT-6454] reverted commit to wrong branch A.F....... [ZBXNEXT-6454] updated history function validation ..F....... [ZBXNEXT-6561] fixed parameters for in() and between(); added quoting for some parameters of new string functions ..F....... [ZBXNEXT-6561] added temporary stubs ........S. [ZBXNEXT-6544] fixed merge consequences ...
2021-05-08........S. [ZBXNEXT-114] updated from branch 'master'Michael Veksler
2021-05-08........S. [ZBXNEXT-6544] solved conflicat, merged master to feature branchDmitrijs Goloscapovs
2021-05-08....I...S. [ZBXNEXT-6292] fixed exclude event and problem tag generation ↵Michael Veksler
from upgrade patch
2021-05-08........S. [ZBXNEXT-114] updated from branch 'master'Michael Veksler
2021-05-08........S. [ZBXNEXT-6544] fixed missing countunique in zbx_is_trigger_functionDmitrijs Goloscapovs
2021-05-08...G...... [ZBX-19209] fixed panic on empty entries for proc.cpu.util for ↵Eriks Sneiders
Zabbix agent 2 * commit '44c399c6e788e43f57b203fd26d2145467ae7218': .......... [ZBX-19209] added change log ...G...... [ZBX-19209] fix panic on empty entries for proc.cpu.util for Zabbix agent 2 (cherry picked from commit 353fad6e4653a28e9a1cbc67e09281e017e48c9d)
2021-05-08....I...S. [DEV-1892] added primary key for trigger_queue tableDmitrijs Goloscapovs
Merge in ZBX/zabbix from feature/DEV-1892-5.3-F to master * commit '83845d405f0e8dc9fc1eddfdade4f095d1808f19': ....I...S. [DEV-1892] added primary key for trigger_queue table
2021-05-08........S. [ZBXNEXT-6452] fixed timer queue leaking triggersAndris Zeila
Merge in ZBX/zabbix from feature/ZBXNEXT-6452-5.3 to master * commit 'b721229ef17af5008fe018d74f245bedd277bfbd': ........S. [ZBXNEXT-6452] fixed trigger queue update
2021-05-08....I...S. [DEV-1892] added primary key for trigger_queue tableDmitrijs Goloscapovs
2021-05-08........S. [ZBXNEXT-6452] fixed trigger queue updateAndris Zeila
2021-05-08....I...S. [ZBXNEXT-6452] fixed dist archive and issues detected by coverityAndris Zeila
Merge in ZBX/zabbix from feature/ZBXNEXT-6452-5.3 to master * commit 'c24beeeaf8a2128a9fdf67843c54089fb2d1d7e1': ....I..... [ZBXNEXT-6452] fixed reporting of broken key in aggregated checks ........S. [ZBXNEXT-6452] removed redundant check ........S. [ZBXNEXT-6452] added check for broken item key in item query ....I..... [ZBXNEXT-6452] added check to safeguard against broken item keys when converting aggregate checks ........S. [ZBXNEXT-6452] added check for empty serialized expression/recovery expression when updating items of removed triggers ........S. [ZBXNEXT-6452] fixed bitand parameter validation .......... [ZBXNEXT-6452] increased the maximum number of table fields for new config table fields ........S. [ZBXNEXT-6452] fixed comments ....I..... [ZBXNEXT-6452] added header to makefile so it's included in dist archive
2021-05-08....I..... [ZBXNEXT-6452] fixed reporting of broken key in aggregated checksVladislavs Sokurenko
2021-05-08....I...S. [ZBXNEXT-6292] excluded event and problem tag generation from ↵Aleksejs Sestakovs
upgrade patch
2021-05-08........S. [ZBXNEXT-6452] removed redundant checkAndris Zeila
2021-05-08........S. [ZBXNEXT-6452] added check for broken item key in item queryAndris Zeila
2021-05-08....I..... [ZBXNEXT-6452] added check to safeguard against broken item keys ↵Andris Zeila
when converting aggregate checks
2021-05-08........S. [ZBXNEXT-6452] added check for empty serialized ↵Andris Zeila
expression/recovery expression when updating items of removed triggers
2021-05-08........S. [ZBXNEXT-6452] fixed bitand parameter validationAndris Zeila
2021-05-08........S. [ZBXNEXT-6452] fixed commentsAndris Zeila
2021-05-08....I..... [ZBXNEXT-6452] added header to makefile so it's included in dist ↵Andris Zeila
archive
2021-05-08........S. [ZBXNEXT-114] updated from branch 'master'Michael Veksler
2021-05-08........S. [ZBX-19321] fixed missing event tags in case of multiple problemsDmitrijs Goloscapovs
Merge in ZBX/zabbix from feature/ZBX-19321-5.3 to master * commit '96f76575f9c010772235b4be2cb4ad792e131ae0': ........S. [ZBX-19321] fixed eventid comparison ........S. [ZBX-19321] revert fixed missing event tags in case of multiple problems ........S. [ZBX-19321] fixed missing event tags in case of multiple problems
2021-05-08.......P.. [ZBX-19241] stopped proxy from overwriting local lastlogsize and ↵Dmitrijs Goloscapovs
mtime (cherry picked from commit b7b9b2c686df318d128b75be9c23f5bb9c61d4ae)
2021-05-07.......... [ZBXNEXT-6451,ZBXNEXT-6455] updated to the latest master; fixed ↵Alexander Vladishev
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
2021-05-07.......... [ZBXNEXT-6544] updated to the latest from ↵Andrejs Griščenko
'feature/ZBXNEXT-6452-5.3'; resolved conflicts in: - ui/include/classes/validators/CMathFunctionValidator.php
2021-05-07........S. [DEV-1836] updated to the latest masterArtjoms Rimdjonoks
2021-05-07........S. [ZBXNEXT-6452] fixed item query filter expression validationAndris Zeila
2021-05-07........S. [ZBXNEXT-114] removed unnecessary debug printAlex Kalimulin
2021-05-07.......... [ZBXNEXT-6452] fixed makefileAndris Zeila
2021-05-07........S. [ZBXNEXT-6544] fixed merge consequencesDmitrijs Goloscapovs
2021-05-07........S. [ZBXNEXT-6544] fixed warning for const ptrDmitrijs Goloscapovs
2021-05-07........S. [ZBXNEXT-6544] fixed merge conflict (from 6547)Dmitrijs Goloscapovs
2021-05-07........S. [ZBXNEXT-6544] fixed merge conflictDmitrijs Goloscapovs
2021-05-07.......... [ZBXNEXT-6546] Merge branch 'feature/ZBXNEXT-6452-5.3' into ↵Dmitrijs Goloscapovs
feature/ZBXNEXT-6546-5.3
2021-05-07........S. [ZBX-19321] fixed eventid comparisonDmitrijs Goloscapovs
2021-05-07........S. [ZBX-19321] revert fixed missing event tags in case of multiple ↵Dmitrijs Goloscapovs
problems
2021-05-07........S. [ZBXNEXT-4910] added severity in problem real-time export protocolMichael Veksler
* commit '1390bf150d86cea1f065030b312d0116e7778b2a': ........S. [ZBXNEXT-4910] added severity in problem real-time export protocol (cherry picked from commit a1cee382de0d41ac32c1e32e4fdba3e57ea428a4) (cherry picked from commit 09b36c85f36cc209083f7ef4b6c147cf2ea6dad4)
2021-05-07...G...... [ZBX-19063] fixed Zabbix agent 2 windows service log message on ↵Eriks Sneiders
unsupported command * commit '3818a10744c27326c5c70c9178f01a50d6666c77': .......... [ZBX-19063] added change log ...G...... [ZBX-19063] fixed typo .......... [ZBX-19063] fixed Zabbix agent 2 windows service log message on unsupported command (cherry picked from commit 41b7ca0b145380cd944dc838e2525ae8cf9b6329)
2021-05-06........S. [ZBXNEXT-114] refactored range check, dbupgrade patch; tweaked ↵Alex Kalimulin
tests, style
2021-05-06...G...... [ZBX-19099] fixed Zabbix agent 2 windows services plugin second ↵Eriks Sneiders
parameter * commit 'e43bdddb05693dc0e56d096f1b7e1c19d91ce750': ...G...... [ZBX-19099] fixed Zabbix agent 2 windows services plugin second parameter (cherry picked from commit 7e79e026fe12fd628fa47c982edc1d2ff3449df1)
2021-05-06........S. [ZBX-19321] fixed missing event tags in case of multiple problemsDmitrijs Goloscapovs
2021-05-06.......... [ZBXNEXT-6451,ZBXNEXT-6455] updated to the latest master branch ↵Andrejs Verza
(no conflicts)
2021-05-06........S. [ZBXNEXT-6465] reverted empty lineMichael Veksler
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-06 08:40:47 +0300