diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-06-15 08:14:33 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-06-15 08:14:33 +0000 |
| commit | 5603bd407a6fc337ca523ac7f372588f3c645162 (patch) | |
| tree | f3f805e628822b2752e7fd7d45e33a3e353f4a1e /src | |
| parent | 6bd4c47f147f4ad1f48303abc09607ce1b457c4b (diff) | |
| download | zabbix-5603bd407a6fc337ca523ac7f372588f3c645162.tar.gz zabbix-5603bd407a6fc337ca523ac7f372588f3c645162.tar.xz zabbix-5603bd407a6fc337ca523ac7f372588f3c645162.zip | |
- [DEV-185] added support of zabbix[uptime] and zabbix[boottime] (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@5768 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
| -rw-r--r-- | src/zabbix_server/poller/checks_internal.c | 16 | ||||
| -rw-r--r-- | src/zabbix_server/poller/checks_internal.h | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/zabbix_server/poller/checks_internal.c b/src/zabbix_server/poller/checks_internal.c index 763b4bd2..1fcea01e 100644 --- a/src/zabbix_server/poller/checks_internal.c +++ b/src/zabbix_server/poller/checks_internal.c @@ -113,6 +113,22 @@ int get_value_internal(DB_ITEM *item, AGENT_RESULT *result) i = DBget_queue_count(); SET_UI64_RESULT(result, i); } + else if (0 == strcmp(tmp, "uptime")) /* zabbix["uptime"] */ + { + if (1 != nparams) + goto not_supported; + + i = time(NULL)-CONFIG_SERVER_STARTUP_TIME; + SET_UI64_RESULT(result, i); + } + else if (0 == strcmp(tmp, "boottime")) /* zabbix["boottime"] */ + { + if (1 != nparams) + goto not_supported; + + i = CONFIG_SERVER_STARTUP_TIME; + SET_UI64_RESULT(result, i); + } else if (0 == strcmp(tmp, "proxy")) /* zabbix["proxy",<hostname>,"lastaccess"] */ { if (3 != nparams) diff --git a/src/zabbix_server/poller/checks_internal.h b/src/zabbix_server/poller/checks_internal.h index da2bdf75..d6fb30fb 100644 --- a/src/zabbix_server/poller/checks_internal.h +++ b/src/zabbix_server/poller/checks_internal.h @@ -25,6 +25,7 @@ #include "log.h" #include "sysinfo.h" +extern int CONFIG_SERVER_STARTUP_TIME; extern int get_value_internal(DB_ITEM *item, AGENT_RESULT *result); #endif |