diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-08-30 08:50:30 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-08-30 08:50:30 +0000 |
| commit | 57d2c7c6f9ff0b2ea5a5c12bc62f3c0014e7507b (patch) | |
| tree | c7e79e22ecf965eb9bcb24ccc6353e1af3873990 /src | |
| parent | 71a100254b626b45ed75005ac218c3dda1260a8b (diff) | |
| download | zabbix-57d2c7c6f9ff0b2ea5a5c12bc62f3c0014e7507b.tar.gz zabbix-57d2c7c6f9ff0b2ea5a5c12bc62f3c0014e7507b.tar.xz zabbix-57d2c7c6f9ff0b2ea5a5c12bc62f3c0014e7507b.zip | |
ported r3240:3246 ('<=' for trigger severity & '+' for trigger) from 1.1.2
git-svn-id: svn://svn.zabbix.com/trunk@3247 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
| -rw-r--r-- | src/zabbix_server/actions.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/zabbix_server/actions.c b/src/zabbix_server/actions.c index 535ac3bd..4fd9221d 100644 --- a/src/zabbix_server/actions.c +++ b/src/zabbix_server/actions.c @@ -529,6 +529,13 @@ static int check_action_condition(DB_TRIGGER *trigger,int alarmid,int new_trigge ret = SUCCEED; } } + else if(condition->operator == CONDITION_OPERATOR_LESS_EQUAL) + { + if(trigger->priority <= atoi(condition->value)) + { + ret = SUCCEED; + } + } else { zabbix_log( LOG_LEVEL_ERR, "Unsupported operator [%d] for condition id [%d]", condition->operator, condition->conditionid); |