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/zbxjson.h | |
| 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/zbxjson.h')
| -rw-r--r-- | include/zbxjson.h | 2 |
1 files changed, 1 insertions, 1 deletions
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" |