diff options
| author | Andrejs Kozlovs <andrejs.kozlovs@zabbix.com> | 2021-01-14 08:36:24 +0300 |
|---|---|---|
| committer | Andrejs Kozlovs <andrejs.kozlovs@zabbix.com> | 2021-01-14 08:36:24 +0300 |
| commit | 691cffeb5e50ac48d9f1c53cb9021b52c8556d89 (patch) | |
| tree | eb8e6257e3d2e827994e94ba196a98bc140ddb3d /include/zbxjson.h | |
| parent | 4dbcd7b71737c62213b19e121cc8cf1edc7eb630 (diff) | |
| parent | 10623996b1c0468b48c56a1ee3abc1cf810b6a87 (diff) | |
A.F....PS. [ZBXNEXT-5518] update from branch 'master' of https://git.zabbix.com/scm/zbx/zabbix into feature/ZBXNEXT-5518-5.3
Diffstat (limited to 'include/zbxjson.h')
| -rw-r--r-- | include/zbxjson.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/include/zbxjson.h b/include/zbxjson.h index 87db8a0a662..9e4284390cb 100644 --- a/include/zbxjson.h +++ b/include/zbxjson.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2020 Zabbix SIA +** Copyright (C) 2001-2021 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -56,18 +56,12 @@ #define ZBX_PROTO_TAG_SCRIPTID "scriptid" #define ZBX_PROTO_TAG_HOSTID "hostid" #define ZBX_PROTO_TAG_AVAILABLE "available" -#define ZBX_PROTO_TAG_SNMP_AVAILABLE "snmp_available" -#define ZBX_PROTO_TAG_IPMI_AVAILABLE "ipmi_available" -#define ZBX_PROTO_TAG_JMX_AVAILABLE "jmx_available" #define ZBX_PROTO_TAG_ERROR "error" -#define ZBX_PROTO_TAG_SNMP_ERROR "snmp_error" -#define ZBX_PROTO_TAG_IPMI_ERROR "ipmi_error" -#define ZBX_PROTO_TAG_JMX_ERROR "jmx_error" #define ZBX_PROTO_TAG_USERNAME "username" #define ZBX_PROTO_TAG_PASSWORD "password" #define ZBX_PROTO_TAG_SID "sid" #define ZBX_PROTO_TAG_VERSION "version" -#define ZBX_PROTO_TAG_HOST_AVAILABILITY "host availability" +#define ZBX_PROTO_TAG_INTERFACE_AVAILABILITY "interface availability" #define ZBX_PROTO_TAG_HISTORY_DATA "history data" #define ZBX_PROTO_TAG_DISCOVERY_DATA "discovery data" #define ZBX_PROTO_TAG_AUTOREGISTRATION "auto registration" @@ -163,13 +157,10 @@ #define ZBX_PROTO_TAG_SSL_KEY_PASSWORD "ssl_key_password" #define ZBX_PROTO_TAG_MAINTENANCE_STATUS "maintenance_status" #define ZBX_PROTO_TAG_MAINTENANCE_TYPE "maintenance_type" -#define ZBX_PROTO_TAG_SNMP_AVAILABLE "snmp_available" -#define ZBX_PROTO_TAG_IPMI_AVAILABLE "ipmi_available" #define ZBX_PROTO_TAG_IPMI_AUTHTYPE "ipmi_authtype" #define ZBX_PROTO_TAG_IPMI_PRIVILEGE "ipmi_privilege" #define ZBX_PROTO_TAG_IPMI_USERNAME "ipmi_username" #define ZBX_PROTO_TAG_IPMI_PASSWORD "ipmi_password" -#define ZBX_PROTO_TAG_JMX_AVAILABLE "jmx_available" #define ZBX_PROTO_TAG_DATA_TYPE "datatype" #define ZBX_PROTO_TAG_PROXY_DELAY "proxy_delay" #define ZBX_PROTO_TAG_EXPRESSIONS "expressions" |