.......... [ZBXNEXT-6687] updated to latest from master; resolved conflicts in:

- create/src/schema.tmpl
- src/libs/zbxdbupgrade/dbupgrade_5050.c
- ui/assets/styles/blue-theme.css
- ui/assets/styles/dark-theme.css
- ui/assets/styles/hc-dark.css
- ui/assets/styles/hc-light.css
- ui/include/defines.inc.php

8 files changed, 51 insertions, 21 deletions

diff --git a/create/bin/export_data.sh b/create/bin/export_data.sh
index c6a3ea46e62..5b7d3a1d369 100755
--- a/create/bin/export_data.sh
+++ b/create/bin/export_data.sh
@@ -14,7 +14,7 @@ schema=$basedir/../src/schema.tmpl
 
 echo "--
 -- Zabbix
--- Copyright (C) 2001-2021 Zabbix SIA
+-- Copyright (C) 2001-2022 Zabbix SIA
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
diff --git a/create/bin/gen_data.pl b/create/bin/gen_data.pl
index f3ad943cf91..ed9e307b234 100755
--- a/create/bin/gen_data.pl
+++ b/create/bin/gen_data.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 #
 # Zabbix
-# Copyright (C) 2001-2021 Zabbix SIA
+# Copyright (C) 2001-2022 Zabbix SIA
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
diff --git a/create/bin/gen_schema.pl b/create/bin/gen_schema.pl
index f20f4d324aa..f4939ae4e10 100755
--- a/create/bin/gen_schema.pl
+++ b/create/bin/gen_schema.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 #
 # Zabbix
-# Copyright (C) 2001-2021 Zabbix SIA
+# Copyright (C) 2001-2022 Zabbix SIA
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -46,7 +46,7 @@ my %c = (
 
 $c{"before"} = "/*
 ** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
+** Copyright (C) 2001-2022 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/create/bin/gen_top_passwords.php b/create/bin/gen_top_passwords.php
index 2eaa2e0e125..3a0f919f930 100644
--- a/create/bin/gen_top_passwords.php
+++ b/create/bin/gen_top_passwords.php
@@ -1,7 +1,7 @@
 <?php
 /*
 ** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
+** Copyright (C) 2001-2022 Zabbix SIA
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
diff --git a/create/src/dashboards.tmpl b/create/src/dashboards.tmpl
index 2f1bb2ca884..9e92bcc573f 100644
--- a/create/src/dashboards.tmpl
+++ b/create/src/dashboards.tmpl
@@ -1,6 +1,6 @@
 --
 -- Zabbix
--- Copyright (C) 2001-2021 Zabbix SIA
+-- Copyright (C) 2001-2022 Zabbix SIA
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
diff --git a/create/src/data.tmpl b/create/src/data.tmpl
index 0fb27f8acbd..7f6bdb4faf8 100644
--- a/create/src/data.tmpl
+++ b/create/src/data.tmpl
@@ -1,6 +1,6 @@
 --
 -- Zabbix
--- Copyright (C) 2001-2021 Zabbix SIA
+-- Copyright (C) 2001-2022 Zabbix SIA
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
diff --git a/create/src/schema.tmpl b/create/src/schema.tmpl
index a6090dd2f75..eba52590ac5 100644
--- a/create/src/schema.tmpl
+++ b/create/src/schema.tmpl
@@ -1,6 +1,6 @@
 --
 -- Zabbix
--- Copyright (C) 2001-2021 Zabbix SIA
+-- Copyright (C) 2001-2022 Zabbix SIA
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -760,12 +760,13 @@ FIELD		|serviceid	|t_id		|	|NOT NULL	|0
 FIELD		|name		|t_varchar(128)	|''	|NOT NULL	|0
 FIELD		|status		|t_integer	|'-1'	|NOT NULL	|0
 FIELD		|algorithm	|t_integer	|'0'	|NOT NULL	|0
-FIELD		|showsla	|t_integer	|'0'	|NOT NULL	|0
-FIELD		|goodsla	|t_double	|'99.9'	|NOT NULL	|0
 FIELD		|sortorder	|t_integer	|'0'	|NOT NULL	|0
 FIELD		|weight		|t_integer	|'0'	|NOT NULL	|0
 FIELD		|propagation_rule|t_integer	|'0'	|NOT NULL	|0
 FIELD		|propagation_value|t_integer	|'0'	|NOT NULL	|0
+FIELD		|description	|t_shorttext	|''	|NOT NULL	|0
+FIELD		|uuid		|t_varchar(32)	|''	|NOT NULL	|0
+FIELD		|created_at	|t_integer	|'0'	|NOT NULL	|0
 
 TABLE|services_links|linkid|ZBX_DATA
 FIELD		|linkid		|t_id		|	|NOT NULL	|0
@@ -774,15 +775,6 @@ FIELD		|servicedownid	|t_id		|	|NOT NULL	|0			|2|services	|serviceid
 INDEX		|1		|servicedownid
 UNIQUE		|2		|serviceupid,servicedownid
 
-TABLE|services_times|timeid|ZBX_DATA
-FIELD		|timeid		|t_id		|	|NOT NULL	|0
-FIELD		|serviceid	|t_id		|	|NOT NULL	|0			|1|services
-FIELD		|type		|t_integer	|'0'	|NOT NULL	|0
-FIELD		|ts_from	|t_integer	|'0'	|NOT NULL	|0
-FIELD		|ts_to		|t_integer	|'0'	|NOT NULL	|0
-FIELD		|note		|t_varchar(255)	|''	|NOT NULL	|0
-INDEX		|1		|serviceid,type,ts_from,ts_to
-
 TABLE|icon_map|iconmapid|ZBX_DATA
 FIELD		|iconmapid	|t_id		|	|NOT NULL	|0
 FIELD		|name		|t_varchar(64)	|''	|NOT NULL	|0
@@ -1618,12 +1610,16 @@ FIELD		|value_hostid	|t_id		|	|NULL		|0			|3|hosts	|hostid
 FIELD		|value_itemid	|t_id		|	|NULL		|0			|4|items	|itemid
 FIELD		|value_graphid	|t_id		|	|NULL		|0			|5|graphs	|graphid
 FIELD		|value_sysmapid	|t_id		|	|NULL		|0			|6|sysmaps	|sysmapid
+FIELD		|value_serviceid|t_id		|	|NULL		|0			|7|services	|serviceid
+FIELD		|value_slaid	|t_id		|	|NULL		|0			|8|sla		|slaid
 INDEX		|1		|widgetid
 INDEX		|2		|value_groupid
 INDEX		|3		|value_hostid
 INDEX		|4		|value_itemid
 INDEX		|5		|value_graphid
 INDEX		|6		|value_sysmapid
+INDEX		|7		|value_serviceid
+INDEX		|8		|value_slaid
 
 TABLE|task_check_now|taskid|0
 FIELD		|taskid		|t_id		|	|NOT NULL	|0			|1|task
@@ -1902,9 +1898,43 @@ FIELD		|ha_sessionid	|t_cuid		|''	|NOT NULL	|0
 UNIQUE		|1		|name
 INDEX		|2		|status,lastaccess
 
+TABLE|sla|slaid|ZBX_DATA
+FIELD		|slaid		|t_id		|	|NOT NULL	|0
+FIELD		|name		|t_varchar(255)	|''	|NOT NULL	|0
+FIELD		|period		|t_integer	|'0'	|NOT NULL	|0
+FIELD		|slo		|t_double	|'99.9'	|NOT NULL	|0
+FIELD		|effective_date	|t_integer	|'0'	|NOT NULL	|0
+FIELD		|timezone	|t_varchar(50)	|'UTC'	|NOT NULL	|ZBX_NODATA
+FIELD		|status		|t_integer	|'1'	|NOT NULL	|0
+FIELD		|description	|t_shorttext	|''	|NOT NULL	|0
+UNIQUE		|1		|name
+
+TABLE|sla_schedule|sla_scheduleid|ZBX_DATA
+FIELD		|sla_scheduleid	|t_id		|	|NOT NULL	|0
+FIELD		|slaid		|t_id		|	|NOT NULL	|0		|1|sla|slaid
+FIELD		|period_from	|t_integer	|'0'	|NOT NULL	|0
+FIELD		|period_to	|t_integer	|'0'	|NOT NULL	|0
+INDEX		|1		|slaid
+
+TABLE|sla_excluded_downtime|sla_excluded_downtimeid|ZBX_DATA
+FIELD		|sla_excluded_downtimeid|t_id		|	|NOT NULL	|0
+FIELD		|slaid			|t_id		|	|NOT NULL	|0	|1|sla|slaid
+FIELD		|name			|t_varchar(255)	|''	|NOT NULL	|0
+FIELD		|period_from		|t_integer	|'0'	|NOT NULL	|0
+FIELD		|period_to		|t_integer	|'0'	|NOT NULL	|0
+INDEX		|1			|slaid
+
+TABLE|sla_service_tag|sla_service_tagid|0
+FIELD		|sla_service_tagid	|t_id		|	|NOT NULL	|0
+FIELD		|slaid			|t_id		|	|NOT NULL	|0	|1|sla|slaid
+FIELD		|tag			|t_varchar(255)	|''	|NOT NULL	|0
+FIELD		|operator		|t_integer	|'0'	|NOT NULL	|0
+FIELD		|value			|t_varchar(255)	|''	|NOT NULL	|0
+INDEX		|1			|slaid
+
 TABLE|dbversion|dbversionid|
 FIELD		|dbversionid	|t_id		|	|NOT NULL	|0
 FIELD		|mandatory	|t_integer	|'0'	|NOT NULL	|
 FIELD		|optional	|t_integer	|'0'	|NOT NULL	|
 
-ROW		|1		|5050115	|5050115
+ROW		|1		|5050142	|5050142
diff --git a/create/src/templates.tmpl b/create/src/templates.tmpl
index 39b50300cd7..c2c1cb936f8 100644
--- a/create/src/templates.tmpl
+++ b/create/src/templates.tmpl
@@ -1,6 +1,6 @@
 --
 -- Zabbix
--- Copyright (C) 2001-2021 Zabbix SIA
+-- Copyright (C) 2001-2022 Zabbix SIA
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by