diff options
| author | Miks Kronkalns <miks.kronkalns@zabbix.com> | 2021-01-24 18:12:05 +0300 |
|---|---|---|
| committer | Miks Kronkalns <miks.kronkalns@zabbix.com> | 2021-01-24 18:12:05 +0300 |
| commit | 2d563809e72f21d5305bbf3e3b7227465e4377a3 (patch) | |
| tree | a0d182b645b433d02784164b6069872c73857923 /include/zbxjson.h | |
| parent | a9b3c2a1425105dfcdee33921d8287fc4ca82537 (diff) | |
| parent | 8342039dda2250611e86354467e7bb0b1245081e (diff) | |
.......... [ZBXNEXT-2976] merged feature/ZBXNEXT-2976-5.3 into development branch created from current master
Resolved conflicts in:
- create/src/schema.tmpl
- src/libs/zbxdbupgrade/dbupgrade_5030.c
- 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 9e4284390cb..3157cd480b5 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_VALUE_FAILED "failed" #define ZBX_PROTO_VALUE_SUCCESS "success" |