diff options
| author | Andrejs Griščenko <andrejs.griscenko@zabbix.com> | 2021-04-15 17:36:07 +0300 |
|---|---|---|
| committer | Andrejs Griščenko <andrejs.griscenko@zabbix.com> | 2021-04-15 17:36:07 +0300 |
| commit | decfd09b2b1f1e70fcccbeebb8b10cc54204b7d9 (patch) | |
| tree | 04f761d57384bfc5bf93d6c341a6f81f582007e9 /include | |
| parent | a5888b38fb7cdf0126aae8f09e988227834967f6 (diff) | |
| parent | 3c11d9b6b7e5c546e52fc388c3c728f2cf3e88b6 (diff) | |
.......... [ZBXNEXT-6478] updated to the master branch; resolved conflicts in:
- create/src/schema.tmpl
- src/libs/zbxdbupgrade/dbupgrade_5030.c
- ui/app/views/popup.generic.php
- ui/include/classes/mvc/CRouter.php
- ui/include/defines.inc.php
- ui/include/schema.inc.php
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 2 | ||||
| -rw-r--r-- | include/db.h | 2 | ||||
| -rw-r--r-- | include/dbcache.h | 1 | ||||
| -rw-r--r-- | include/mutexs.h | 1 | ||||
| -rw-r--r-- | include/zbxjson.h | 2 |
5 files changed, 6 insertions, 2 deletions
diff --git a/include/common.h b/include/common.h index a0ab881ddac..3be5219b596 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 diff --git a/include/db.h b/include/db.h index ba48bb92ceb..cbed36b4b8d 100644 --- a/include/db.h +++ b/include/db.h @@ -179,6 +179,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 1e66f16bee1..6f252b4fd44 100644 --- a/include/dbcache.h +++ b/include/dbcache.h @@ -964,6 +964,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); 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 dec630a1a27..1a3971e02be 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_TAG_DASHBOARDID "dashboardid" #define ZBX_PROTO_TAG_USERID "userid" |