diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-04-27 13:19:15 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-04-27 13:19:15 +0000 |
| commit | 0482c7707b3cbbafe8a6b8197b49e92b44f67f23 (patch) | |
| tree | d91fcc997d1d020a3a5b927f6b4fa475b23f5d4f /frontends/php/include | |
| parent | f81b0191e3b97b65e30d02889a1fed9b9e73870e (diff) | |
- added 'received value' condition type for actions (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@4069 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/actions.inc.php | 16 | ||||
| -rw-r--r-- | frontends/php/include/defines.inc.php | 1 | ||||
| -rw-r--r-- | frontends/php/include/forms.inc.php | 3 | ||||
| -rw-r--r-- | frontends/php/include/locales/en_gb.inc.php | 1 |
4 files changed, 20 insertions, 1 deletions
diff --git a/frontends/php/include/actions.inc.php b/frontends/php/include/actions.inc.php index 1a783696..81f5799b 100644 --- a/frontends/php/include/actions.inc.php +++ b/frontends/php/include/actions.inc.php @@ -324,6 +324,7 @@ include_once 'include/discovery.inc.php'; $str_type[CONDITION_TYPE_DSERVICE_PORT] = S_SERVICE_PORT; $str_type[CONDITION_TYPE_DSTATUS] = S_DISCOVERY_STATUS; $str_type[CONDITION_TYPE_DUPTIME] = S_UPTIME_DOWNTIME; + $str_type[CONDITION_TYPE_DVALUE] = S_RECEIVED_VALUE; if(isset($str_type[$conditiontype])) return $str_type[$conditiontype]; @@ -373,6 +374,9 @@ include_once 'include/discovery.inc.php'; case CONDITION_TYPE_DUPTIME: $str_val = $value; break; + case CONDITION_TYPE_DVALUE: + $str_val = $value; + break; default: return S_UNKNOWN; break; @@ -476,7 +480,8 @@ include_once 'include/discovery.inc.php'; CONDITION_TYPE_DSERVICE_TYPE, CONDITION_TYPE_DSERVICE_PORT, CONDITION_TYPE_DSTATUS, - CONDITION_TYPE_DUPTIME + CONDITION_TYPE_DUPTIME, + CONDITION_TYPE_DVALUE ); if(isset($conditions[$eventsource])) @@ -574,6 +579,14 @@ include_once 'include/discovery.inc.php'; CONDITION_OPERATOR_MORE_EQUAL, CONDITION_OPERATOR_LESS_EQUAL ); + $operators[CONDITION_TYPE_DVALUE] = array( + CONDITION_OPERATOR_EQUAL, + CONDITION_OPERATOR_NOT_EQUAL, + CONDITION_OPERATOR_MORE_EQUAL, + CONDITION_OPERATOR_LESS_EQUAL, + CONDITION_OPERATOR_LIKE, + CONDITION_OPERATOR_NOT_LIKE + ); if(isset($operators[$conditiontype])) return $operators[$conditiontype]; @@ -657,6 +670,7 @@ include_once 'include/discovery.inc.php'; case CONDITION_TYPE_TRIGGER_VALUE: case CONDITION_TYPE_TRIGGER_SEVERITY: case CONDITION_TYPE_DUPTIME: + case CONDITION_TYPE_DVALUE: break; default: error(S_INCORRECT_CONDITION_TYPE); diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php index b7324fea..a2f0a75a 100644 --- a/frontends/php/include/defines.inc.php +++ b/frontends/php/include/defines.inc.php @@ -112,6 +112,7 @@ define('CONDITION_TYPE_DSERVICE_PORT', 9); define('CONDITION_TYPE_DSTATUS', 10); define('CONDITION_TYPE_DUPTIME', 11); + define('CONDITION_TYPE_DVALUE', 12); define('CONDITION_OPERATOR_EQUAL', 0); define('CONDITION_OPERATOR_NOT_EQUAL', 1); diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php index 2466a531..1adb7679 100644 --- a/frontends/php/include/forms.inc.php +++ b/frontends/php/include/forms.inc.php @@ -2979,6 +2979,9 @@ include_once 'include/discovery.inc.php'; case CONDITION_TYPE_DUPTIME: $rowCondition[] = new CNumericBox('new_condition[value]','600',15); break; + case CONDITION_TYPE_DVALUE: + $rowCondition[] = new CTextBox('new_condition[value]', "", 40); + break; } $frmAction->AddRow(S_NEW_CONDITION, array( diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php index 9e69d4ed..ec21e102 100644 --- a/frontends/php/include/locales/en_gb.inc.php +++ b/frontends/php/include/locales/en_gb.inc.php @@ -37,6 +37,7 @@ 'S_SERVICE_TYPE'=> 'Service type', 'S_SERVICE_PORT'=> 'Service port', 'S_DISCOVERY_STATUS'=> 'Discovery status', + 'S_RECEIVED_VALUE'=> 'Received value', 'S_UPTIME_DOWNTIME'=> 'Uptime/Downtime', |