summaryrefslogtreecommitdiffstats
path: root/src/zabbix_server/poller
diff options
context:
space:
mode:
authorhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2005-06-20 08:17:12 +0000
committerhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2005-06-20 08:17:12 +0000
commit01cd848a925015679ea237651e6291cd44129858 (patch)
tree4327bfc443b9aff048f93b9d12ae3ad2de15533a /src/zabbix_server/poller
parent06e27fe2d16497bb5021d9ed61b15a2d67b5d75e (diff)
downloadzabbix-01cd848a925015679ea237651e6291cd44129858.tar.gz
zabbix-01cd848a925015679ea237651e6291cd44129858.tar.xz
zabbix-01cd848a925015679ea237651e6291cd44129858.zip
- added column escalation_log.actiontype (Alexei)
- time related function 'nodata','date','dayofweek','time','now' will be periodically updated (Alexei) - update of functions optimised. Do not update if same value. (Alexei) git-svn-id: svn://svn.zabbix.com/trunk@1880 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/zabbix_server/poller')
-rw-r--r--src/zabbix_server/poller/checks_agent.c20
-rw-r--r--src/zabbix_server/poller/checks_internal.c17
2 files changed, 37 insertions, 0 deletions
diff --git a/src/zabbix_server/poller/checks_agent.c b/src/zabbix_server/poller/checks_agent.c
index d279e1e4..4d9b91de 100644
--- a/src/zabbix_server/poller/checks_agent.c
+++ b/src/zabbix_server/poller/checks_agent.c
@@ -19,6 +19,26 @@
#include "checks_agent.h"
+/******************************************************************************
+ * *
+ * Function: get_value_agent *
+ * *
+ * Purpose: retrieve data from ZABBIX agent *
+ * *
+ * Parameters: item - item we are interested in *
+ * *
+ * Return value: SUCCEED - data succesfully retrieved and stored in result *
+ * and result_str (as string) *
+ * NETWORK_ERROR - network related error occured *
+ * NOTSUPPORTED - item not supported by the agent *
+ * AGENT_ERROR - uncritical error on agent side occured *
+ * FAIL - otherwise *
+ * *
+ * Author: Alexei Vladishev *
+ * *
+ * Comments: error will contain error message *
+ * *
+ ******************************************************************************/
int get_value_agent(double *result,char *result_str,DB_ITEM *item,char *error,int max_error_len)
{
int s;
diff --git a/src/zabbix_server/poller/checks_internal.c b/src/zabbix_server/poller/checks_internal.c
index a76a6f35..e3122812 100644
--- a/src/zabbix_server/poller/checks_internal.c
+++ b/src/zabbix_server/poller/checks_internal.c
@@ -20,6 +20,23 @@
#include "common.h"
#include "checks_internal.h"
+/******************************************************************************
+ * *
+ * Function: get_value_internal *
+ * *
+ * Purpose: retrieve data from ZABBIX server (internally supported intems) *
+ * *
+ * Parameters: item - item we are interested in *
+ * *
+ * Return value: SUCCEED - data succesfully retrieved and stored in result *
+ * and result_str (as string) *
+ * NOTSUPPORTED - requested item is not supported *
+ * *
+ * Author: Alexei Vladishev *
+ * *
+ * Comments: *
+ * *
+ ******************************************************************************/
int get_value_internal(double *result,char *result_str,DB_ITEM *item,char *error,int max_error_len)
{
if(strcmp(item->key,"zabbix[triggers]")==0)