A...I..... [ZBXNEXT-6411] updated to latest from master; resolved conflicts in:

#	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

1 files changed, 35 insertions, 8 deletions

diff --git a/sass/stylesheets/sass/screen.scss b/sass/stylesheets/sass/screen.scss
index fb6cf5b5313..f44fce475e5 100644
--- a/sass/stylesheets/sass/screen.scss
+++ b/sass/stylesheets/sass/screen.scss
@@ -1339,6 +1339,21 @@ form {
 		@extend tfoot;
 	}
 
+	td {
+		position: relative;
+
+		&.td-drag-icon {
+			padding: 0 11px 0 0;
+			vertical-align: middle;
+		}
+
+		.drag-icon {
+			position: absolute;
+			top: 5px;
+			margin-right: 5px;
+		}
+	}
+
 	.table-forms-td-left {
 		display: table-cell;
 		padding: 5px 0;
@@ -1370,14 +1385,7 @@ form {
 			position: relative;
 
 			&.td-drag-icon {
-				padding: 0 11px 0 0;
-				vertical-align: middle;
-			}
-
-			.drag-icon {
-				position: absolute;
-				top: 5px;
-				margin-right: 5px;
+				padding-right: 11px;
 			}
 
 			&.center {
@@ -5006,6 +5014,10 @@ svg {
 	display: none;
 }
 
+.visibility-hidden {
+	visibility: hidden;
+}
+
 .checkbox-list {
 	li {
 		overflow: hidden;
@@ -6484,6 +6496,21 @@ z-select,
 	}
 }
 
+.mappings-table {
+	display: grid;
+	grid-template-columns: auto auto minmax(auto, 100%);
+
+	& > div {
+		text-align: left;
+	}
+
+	// For every 3th starting from 2nd child.
+	& > div:nth-child(3n + 2) {
+		text-align: center;
+		padding: 0 10px;
+	}
+}
+
 .valuemap-checkbox {
 	margin-top: 10px;
 }