.......... [ZBXNEXT-6452] merged branch 'master' of ssh://git.zabbix.lan:7999/zbx/zabbix into feature/ZBXNEXT-6452-5.3

5 files changed, 6 insertions, 20 deletions

diff --git a/include/common.h b/include/common.h
index d600b148960..477f7581a12 100644
--- a/include/common.h
+++ b/include/common.h
@@ -360,7 +360,7 @@ const char	*zbx_dservice_type_string(zbx_dservice_type_t service);
 #define CONDITION_TYPE_DVALUE			12
 #define CONDITION_TYPE_HOST_TEMPLATE		13
 #define CONDITION_TYPE_EVENT_ACKNOWLEDGED	14
-#define CONDITION_TYPE_APPLICATION		15
+/* #define CONDITION_TYPE_APPLICATION		15	deprecated */
 #define CONDITION_TYPE_SUPPRESSED		16
 #define CONDITION_TYPE_DRULE			18
 #define CONDITION_TYPE_DCHECK			19
@@ -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,
diff --git a/include/db.h b/include/db.h
index 57e52657ace..8c96b2b602e 100644
--- a/include/db.h
+++ b/include/db.h
@@ -180,6 +180,8 @@ struct	_DC_TRIGGER;
 #define ITEM_PARAMETER_NAME_LEN		255
 #define ITEM_PARAMETER_VALUE_LEN	2048
 
+#define ITEM_TAG_FIELD_LEN		255
+
 #define HISTORY_STR_VALUE_LEN		255
 #define HISTORY_TEXT_VALUE_LEN		65535
 #define HISTORY_LOG_VALUE_LEN		65535
diff --git a/include/dbcache.h b/include/dbcache.h
index d0bbf3ce57d..d5af39b9fe8 100644
--- a/include/dbcache.h
+++ b/include/dbcache.h
@@ -967,6 +967,7 @@ int	zbx_lld_macro_value_by_name(const struct zbx_json_parse *jp_row, const zbx_v
 		const char *macro, char **value);
 int	zbx_lld_macro_paths_compare(const void *d1, const void *d2);
 
+void	zbx_dc_get_item_tags(zbx_uint64_t itemid, zbx_vector_ptr_t *item_tags);
 void	zbx_dc_get_item_tags_by_functionids(const zbx_uint64_t *functionids, size_t functionids_num,
 		zbx_vector_ptr_t *item_tags);
 void	zbx_dc_get_item_tags(zbx_uint64_t itemid, zbx_vector_ptr_t *item_tags);
diff --git a/include/mutexs.h b/include/mutexs.h
index 756ec363086..38df8629be7 100644
--- a/include/mutexs.h
+++ b/include/mutexs.h
@@ -57,6 +57,7 @@ zbx_mutex_name_t;
 typedef enum
 {
 	ZBX_RWLOCK_CONFIG = 0,
+	ZBX_RWLOCK_VALUECACHE,
 	ZBX_RWLOCK_COUNT,
 }
 zbx_rwlock_name_t;
diff --git a/include/zbxjson.h b/include/zbxjson.h
index cb570c47eed..e066d0a2bff 100644
--- a/include/zbxjson.h
+++ b/include/zbxjson.h
@@ -82,7 +82,6 @@
 #define ZBX_PROTO_TAG_NAME			"name"
 #define ZBX_PROTO_TAG_HOSTS			"hosts"
 #define ZBX_PROTO_TAG_GROUPS			"groups"
-#define ZBX_PROTO_TAG_APPLICATIONS		"applications"
 #define ZBX_PROTO_TAG_TAGS			"tags"
 #define ZBX_PROTO_TAG_TAG			"tag"
 #define ZBX_PROTO_TAG_PROBLEM_EVENTID		"p_eventid"
@@ -166,6 +165,7 @@
 #define ZBX_PROTO_TAG_EXPRESSIONS		"expressions"
 #define ZBX_PROTO_TAG_EXPRESSION		"expression"
 #define ZBX_PROTO_TAG_CLIENTIP			"clientip"
+#define ZBX_PROTO_TAG_ITEM_TAGS			"item_tags"
 #define ZBX_PROTO_TAG_PROXY_UPLOAD		"upload"
 
 #define ZBX_PROTO_VALUE_FAILED		"failed"