diff options
| author | Miks Kronkalns <miks.kronkalns@zabbix.com> | 2021-04-07 14:24:10 +0300 |
|---|---|---|
| committer | Miks Kronkalns <miks.kronkalns@zabbix.com> | 2021-04-07 14:24:10 +0300 |
| commit | 81c00cdcceb9251623ee4c249f815983357e580f (patch) | |
| tree | a5dd1e9d0c39987bbf2c02b6ee034f27b7dcfd4d /include/zbxjson.h | |
| parent | 6e11afe5b7cb700a41b6c3ac7e3c803048a7a6d9 (diff) | |
| parent | 028835860931ffab16ce9354c8dec156e0b6707f (diff) | |
.......... [ZBXNEXT-2976] updated to latest from master; Resolved conflicts in:
create/src/schema.tmpl
create/src/templates.tmpl
include/zbxjson.h
src/libs/zbxdbupgrade/dbupgrade_5030.c
templates/app/elasticsearch_http/template_app_elasticsearch_http.yaml
templates/app/haproxy_agent/template_app_haproxy_agent.yaml
templates/app/haproxy_http/template_app_haproxy_http.yaml
templates/app/jenkins/template_app_jenkins.yaml
templates/app/rabbitmq_agent/template_app_rabbitmq_agent.yaml
templates/app/rabbitmq_http/template_app_rabbitmq_http.yaml
templates/db/mssql_odbc/template_db_mssql_odbc.yaml
templates/db/postgresql/template_db_postgresql.yaml
templates/db/postgresql_agent2/template_db_postgresql_agent2.yaml
templates/module/host_resources_snmp/template_module_host_resources_snmp.yaml
templates/module/interfaces_simple_snmp/template_module_interfaces_simple_snmp.yaml
templates/module/interfaces_snmp/template_module_interfaces_snmp.yaml
templates/module/interfaces_win_snmp/template_module_interfaces_win_snmp.yaml
templates/net/mellanox_snmp/template_net_mellanox_snmp.yaml
templates/os/linux/template_os_linux.yaml
templates/os/linux_active/template_os_linux_active.yaml
templates/os/linux_prom/template_os_linux_prom.yaml
templates/os/windows_agent/template_os_windows_agent.yaml
templates/os/windows_agent_active/template_os_windows_agent_active.yaml
templates/tel/asterisk_http/template_tel_asterisk_http.yaml
ui/app/controllers/CControllerProfileUpdate.php
ui/app/views/js/reports.auditlog.list.js.php
ui/app/views/monitoring.dashboard.view.php
ui/include/classes/api/managers/CItemPrototypeManager.php
ui/include/classes/api/services/CHost.php
ui/include/classes/api/services/CHostGeneral.php
ui/include/classes/export/CConfigurationExportBuilder.php
ui/include/classes/import/converters/C52ImportConverter.php
ui/include/classes/screens/CScreenBase.php
ui/include/classes/screens/CScreenDataOverview.php
ui/include/classes/screens/CScreenTriggersOverview.php
ui/include/defines.inc.php
ui/include/views/monitoring.screen.constructor.edit.php
ui/js/init.js
ui/screenedit.php
ui/tests/api_json/testAuditLog.php
ui/tests/api_json/xml/testDeleteMissingForLinkedTemplateApplication.xml
Diffstat (limited to 'include/zbxjson.h')
| -rw-r--r-- | include/zbxjson.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/zbxjson.h b/include/zbxjson.h index 3157cd480b5..e066d0a2bff 100644 --- a/include/zbxjson.h +++ b/include/zbxjson.h @@ -166,6 +166,7 @@ #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" #define ZBX_PROTO_VALUE_SUCCESS "success" @@ -198,6 +199,9 @@ #define ZBX_PROTO_VALUE_PREPROCESSING_TEST "preprocessing.test" #define ZBX_PROTO_VALUE_EXPRESSIONS_EVALUATE "expressions.evaluate" +#define ZBX_PROTO_VALUE_PROXY_UPLOAD_ENABLED "enabled" +#define ZBX_PROTO_VALUE_PROXY_UPLOAD_DISABLED "disabled" + typedef enum { ZBX_JSON_TYPE_UNKNOWN = 0, |