.......... [ZBXNEXT-6478] updated to the master branch; resolved conflicts in:

  - create/src/schema.tmpl
  - sass/img/icon-sprite.svg
  - sass/img_source/icons-sprite.ai
  - sass/stylesheets/sass/screen.scss
  - src/go/pkg/version/version.go
  - src/libs/zbxdbupgrade/dbupgrade_5030.c
  - ui/app/controllers/CControllerDashboardView.php
  - ui/app/controllers/CControllerProfileUpdate.php
  - ui/app/views/js/reports.auditlog.list.js.php
  - ui/app/views/monitoring.dashboard.view.php
  - ui/assets/img/icon-sprite.svg
  - 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/classes/api/services/CAuditLog.php
  - ui/include/classes/mvc/CRouter.php
  - ui/include/defines.inc.php
  - ui/js/menupopup.js

3 files changed, 18 insertions, 31 deletions

diff --git a/include/common.h b/include/common.h
index 0f0cb9b7982..a0ab881ddac 100644
--- a/include/common.h
+++ b/include/common.h
@@ -404,24 +404,6 @@ const char	*zbx_dservice_type_string(zbx_dservice_type_t service);
 #define EVENT_TYPE_TRIGGER_UNKNOWN		4
 /* #define EVENT_TYPE_TRIGGER_NORMAL		5	 deprecated */
 
-#define SCREEN_RESOURCE_GRAPH			0
-#define SCREEN_RESOURCE_SIMPLE_GRAPH		1
-#define SCREEN_RESOURCE_MAP			2
-#define SCREEN_RESOURCE_PLAIN_TEXT		3
-#define SCREEN_RESOURCE_HOST_INFO		4
-#define SCREEN_RESOURCE_TRIGGER_INFO		5
-#define SCREEN_RESOURCE_SERVER_INFO		6
-#define SCREEN_RESOURCE_CLOCK			7
-#define SCREEN_RESOURCE_SCREEN			8
-#define SCREEN_RESOURCE_TRIGGER_OVERVIEW	9
-#define SCREEN_RESOURCE_DATA_OVERVIEW		10
-#define SCREEN_RESOURCE_URL			11
-#define SCREEN_RESOURCE_ACTIONS			12
-#define SCREEN_RESOURCE_EVENTS			13
-#define SCREEN_RESOURCE_HOSTGROUP_TRIGGERS	14
-#define SCREEN_RESOURCE_SYSTEM_STATUS		15
-#define SCREEN_RESOURCE_HOST_TRIGGERS		16
-
 typedef enum
 {
 	SYSMAP_ELEMENT_TYPE_HOST = 0,
@@ -857,9 +839,12 @@ zbx_script_t;
 #define ZBX_SCRIPT_TYPE_IPMI		1
 #define ZBX_SCRIPT_TYPE_SSH		2
 #define ZBX_SCRIPT_TYPE_TELNET		3
-#define ZBX_SCRIPT_TYPE_GLOBAL_SCRIPT	4
 #define ZBX_SCRIPT_TYPE_WEBHOOK		5
 
+#define ZBX_SCRIPT_SCOPE_ACTION	1
+#define ZBX_SCRIPT_SCOPE_HOST	2
+#define ZBX_SCRIPT_SCOPE_EVENT	4
+
 #define ZBX_SCRIPT_EXECUTE_ON_AGENT	0
 #define ZBX_SCRIPT_EXECUTE_ON_SERVER	1
 #define ZBX_SCRIPT_EXECUTE_ON_PROXY	2	/* fall back to execution on server if target not monitored by proxy */
@@ -921,8 +906,8 @@ while (0)
 														\
 do														\
 {														\
-	zbx_error("ERROR [file and function: <%s,%s>, revision:%s] Something impossible has just happened.",    \
-			__FILE__, __func__, ZABBIX_REVISION);							\
+	zbx_error("ERROR [file and function: <%s,%s>, revision:%s, line:%d] Something impossible has just"	\
+			" happened.", __FILE__, __func__, ZABBIX_REVISION, __LINE__);				\
 	zbx_backtrace();											\
 }														\
 while (0)
diff --git a/include/version.h b/include/version.h
index c15eaf7e34a..e7cf328aeac 100644
--- a/include/version.h
+++ b/include/version.h
@@ -24,7 +24,7 @@
 #define ZBX_STR(str)	ZBX_STR2(str)
 
 #define APPLICATION_NAME	"Zabbix Agent"
-#define ZABBIX_REVDATE		"1 March 2021"
+#define ZABBIX_REVDATE		"22 March 2021"
 #define ZABBIX_VERSION_MAJOR	5
 #define ZABBIX_VERSION_MINOR	4
 #define ZABBIX_VERSION_PATCH	0
@@ -36,7 +36,7 @@
 #		define ZABBIX_VERSION_RC_NUM	{ZABBIX_RC_NUM}
 #	endif
 #endif
-#define ZABBIX_VERSION_RC	"beta2"
+#define ZABBIX_VERSION_RC	"rc1"
 #define ZABBIX_VERSION		ZBX_STR(ZABBIX_VERSION_MAJOR) "." ZBX_STR(ZABBIX_VERSION_MINOR) "." \
 				ZBX_STR(ZABBIX_VERSION_PATCH) ZABBIX_VERSION_RC
 #define ZABBIX_REVISION		ZBX_STR(ZABBIX_VERSION_REVISION)
diff --git a/include/zbxserver.h b/include/zbxserver.h
index 33e350977e9..4db94678138 100644
--- a/include/zbxserver.h
+++ b/include/zbxserver.h
@@ -51,6 +51,8 @@
 #define MACRO_TYPE_EVENT_NAME		0x02000000	/* event name in trigger configuration */
 #define MACRO_TYPE_EXPRESSION		0x04000000	/* macros in expression macro */
 #define MACRO_TYPE_SCRIPT_PARAMS_FIELD	0x08000000
+#define MACRO_TYPE_SCRIPT_NORMAL	0x10000000
+#define MACRO_TYPE_SCRIPT_RECOVERY	0x20000000
 
 #define MACRO_EXPAND_NO			0
 #define MACRO_EXPAND_YES		1
@@ -63,15 +65,15 @@ void	get_functionids(zbx_vector_uint64_t *functionids, const char *expression);
 int	evaluate_function(char **value, DC_ITEM *item, const char *function, const char *parameter,
 		const zbx_timespec_t *ts, char **error);
 
-int	substitute_simple_macros(zbx_uint64_t *actionid, const DB_EVENT *event, const DB_EVENT *r_event,
-		zbx_uint64_t *userid, const zbx_uint64_t *hostid, const DC_HOST *dc_host, const DC_ITEM *dc_item,
-		DB_ALERT *alert, const DB_ACKNOWLEDGE *ack, const char *tz, char **data, int macro_type, char *error,
-		int maxerrlen);
+int	substitute_simple_macros(const zbx_uint64_t *actionid, const DB_EVENT *event, const DB_EVENT *r_event,
+		const zbx_uint64_t *userid, const zbx_uint64_t *hostid, const DC_HOST *dc_host, const DC_ITEM *dc_item,
+		const DB_ALERT *alert, const DB_ACKNOWLEDGE *ack, const char *tz, char **data, int macro_type,
+		char *error, int maxerrlen);
 
-int	substitute_simple_macros_unmasked(zbx_uint64_t *actionid, const DB_EVENT *event, const DB_EVENT *r_event,
-		zbx_uint64_t *userid, const zbx_uint64_t *hostid, const DC_HOST *dc_host, const DC_ITEM *dc_item,
-		DB_ALERT *alert, const DB_ACKNOWLEDGE *ack, const char *tz, char **data, int macro_type, char *error,
-		int maxerrlen);
+int	substitute_simple_macros_unmasked(const zbx_uint64_t *actionid, const DB_EVENT *event, const DB_EVENT *r_event,
+		const zbx_uint64_t *userid, const zbx_uint64_t *hostid, const DC_HOST *dc_host, const DC_ITEM *dc_item,
+		const DB_ALERT *alert, const DB_ACKNOWLEDGE *ack, const char *tz, char **data, int macro_type,
+		char *error, int maxerrlen);
 
 void	evaluate_expressions(zbx_vector_ptr_t *triggers);