diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-03-21 14:44:38 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-03-21 14:44:38 +0000 |
| commit | 07ea4eb6c1927b132fc294271841066c11ab2955 (patch) | |
| tree | 05a082481c5e15b9faa047878a75e503e0b1ba15 /include | |
| parent | d76992f73658df06227395e4a79c4366294efebe (diff) | |
- developed remote commads execution on specific actions (Eugene)
- added "URL" module for screens (Eugene)
- fix some bugs
- clean code
git-svn-id: svn://svn.zabbix.com/trunk@2703 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 7 | ||||
| -rw-r--r-- | include/db.h | 2 | ||||
| -rw-r--r-- | include/sysinfo.h | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/include/common.h b/include/common.h index f4c1bfdf..a9831a20 100644 --- a/include/common.h +++ b/include/common.h @@ -22,8 +22,6 @@ #include "sysinc.h" - - #if defined(WIN32) # pragma warning (disable: 4100) @@ -252,6 +250,10 @@ #define ACTION_STATUS_ACTIVE 0 #define ACTION_STATUS_DISABLED 1 +/* Action type */ +#define ACTION_TYPE_MESSAGE 0 +#define ACTION_TYPE_COMMAND 1 + /* Algorithms for service status calculation */ #define SERVICE_ALGORITHM_NONE 0 #define SERVICE_ALGORITHM_MAX 1 @@ -400,4 +402,5 @@ char *zbx_regexp_match(const char *string, const char *pattern, int *len); int cmp_double(double a,double b); int SYSTEM_LOCALTIME(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result); + #endif diff --git a/include/db.h b/include/db.h index 9f7aff73..8118719e 100644 --- a/include/db.h +++ b/include/db.h @@ -255,6 +255,7 @@ DB_TRIGGER DB_ACTION { int actionid; + int actiontype; int userid; int delay; int lastcheck; @@ -263,6 +264,7 @@ DB_ACTION char message[MAX_STRING_LEN]; int maxrepeats; int repeatdelay; + char scripts[MAX_STRING_LEN]; }; DB_CONDITION diff --git a/include/sysinfo.h b/include/sysinfo.h index 36fc2680..6787e3be 100644 --- a/include/sysinfo.h +++ b/include/sysinfo.h @@ -108,6 +108,7 @@ int CHECK_SERVICE(const char *cmd, const char *param, unsigned flags, AGENT_RESU int CHECK_SERVICE_PERF(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result); int CHECK_PORT(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result); int CHECK_DNS(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result); +int RUN_COMMAND(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result); /* internal system functions */ int EXECUTE(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result); |