diff options
author | Andris Zeila <andris.zeila@zabbix.com> | 2014-08-14 10:39:10 +0400 |
---|---|---|
committer | Andris Zeila <andris.zeila@zabbix.com> | 2014-08-14 10:39:10 +0400 |
commit | d93f4497a0ecc179444fb7cd09b1b220d65da977 (patch) | |
tree | acff4f3586ba302148273f906d8d30f0a76d3487 /include/sysinfo.h | |
parent | 57063cbeeb8d6142cab7ab479ae5f3f1a81e6e47 (diff) | |
parent | 6e5aae1ea11ae1c4e28a29fc9ccbdd56ee3a1840 (diff) |
.......... [ZBX-8455] merged from upstream
Diffstat (limited to 'include/sysinfo.h')
-rw-r--r-- | include/sysinfo.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sysinfo.h b/include/sysinfo.h index 5f900558c8e..4d48cda4d05 100644 --- a/include/sysinfo.h +++ b/include/sysinfo.h @@ -193,7 +193,7 @@ void free_result(AGENT_RESULT *result); void init_request(AGENT_REQUEST *request); void free_request(AGENT_REQUEST *request); -int parse_item_key(char *cmd, AGENT_REQUEST *request); +int parse_item_key(const char *itemkey, AGENT_REQUEST *request); zbx_log_t *add_log_result(AGENT_RESULT *result, const char *value); void set_log_result_empty(AGENT_RESULT *result); @@ -227,6 +227,7 @@ int SYSTEM_CPU_INTR(AGENT_REQUEST *request, AGENT_RESULT *result); int SYSTEM_CPU_LOAD(AGENT_REQUEST *request, AGENT_RESULT *result); int SYSTEM_CPU_UTIL(AGENT_REQUEST *request, AGENT_RESULT *result); int SYSTEM_CPU_NUM(AGENT_REQUEST *request, AGENT_RESULT *result); +int SYSTEM_CPU_DISCOVERY(AGENT_REQUEST *request, AGENT_RESULT *result); int SYSTEM_HOSTNAME(AGENT_REQUEST *request, AGENT_RESULT *result); int SYSTEM_HW_CHASSIS(AGENT_REQUEST *request, AGENT_RESULT *result); int SYSTEM_HW_CPU(AGENT_REQUEST *request, AGENT_RESULT *result); |