diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-03-06 11:43:10 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-03-06 11:43:10 +0000 |
| commit | 9ef27a42a050c16a0e76757507d922b5798eb2ef (patch) | |
| tree | caa5f7cc29923f62fc9a408c6143f370c2c83804 /include | |
| parent | 9fcb201d990fc2305ce26a8f36a92a7227e27d0a (diff) | |
| download | zabbix-9ef27a42a050c16a0e76757507d922b5798eb2ef.tar.gz zabbix-9ef27a42a050c16a0e76757507d922b5798eb2ef.tar.xz zabbix-9ef27a42a050c16a0e76757507d922b5798eb2ef.zip | |
- added actions.evaltype (Alexei)
- added support of all AND, all OR and AND/OR action conditions (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@3870 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 8 | ||||
| -rw-r--r-- | include/db.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/common.h b/include/common.h index 64f8e7bc..dadc78e1 100644 --- a/include/common.h +++ b/include/common.h @@ -155,6 +155,14 @@ typedef enum /* Condition types */ typedef enum { + ACTION_EVAL_TYPE_AND_OR = 0, + ACTION_EVAL_TYPE_AND, + ACTION_EVAL_TYPE_OR, +} zbx_action_eval_type_t; + +/* Condition types */ +typedef enum +{ CONDITION_TYPE_HOST_GROUP = 0, CONDITION_TYPE_HOST, CONDITION_TYPE_TRIGGER, diff --git a/include/db.h b/include/db.h index 178ac91a..990cae7d 100644 --- a/include/db.h +++ b/include/db.h @@ -271,6 +271,7 @@ DB_ACTION { zbx_uint64_t actionid; int actiontype; + int evaltype; zbx_uint64_t userid; /* int delay;*/ int lastcheck; |