diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-08-29 11:10:21 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-08-29 11:10:21 +0000 |
| commit | 7b0d3ae6b4f08828d39809682ca525bb9a392f70 (patch) | |
| tree | 73692c700f2dfcc3fdeb766dd2d163c6744f6b16 | |
| parent | 3653f1a561dccc45bf9823882cbfeeee117ea5ca (diff) | |
| download | zabbix-7b0d3ae6b4f08828d39809682ca525bb9a392f70.tar.gz zabbix-7b0d3ae6b4f08828d39809682ca525bb9a392f70.tar.xz zabbix-7b0d3ae6b4f08828d39809682ca525bb9a392f70.zip | |
ported r3229 (renamed macro variable) from 1.1.2
git-svn-id: svn://svn.zabbix.com/trunk@3233 97f52cf1-0a1b-0410-bd0e-c28be96e8082
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/zabbix_server/expression.c | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -2,7 +2,7 @@ Changes for 1.3: - improved definition of integer and float point types (Eugene) - fixed problem with ASN_IPADDRESS SNMP values (Eugene) - - added action email action variable '{SEVERITY}' (Eugene) + - added action email action variable '{TRIGGER.SEVERITY}' (Eugene) - added Brazilian Portuguese translation. Thanks to Marcelo Honorio. (Alexei) - fixed history cleaning (Eugene) - fixed Unknown when selcting trigger severity Disaster in action form (Alexei) diff --git a/src/zabbix_server/expression.c b/src/zabbix_server/expression.c index e66b09e4..0e483f5a 100644 --- a/src/zabbix_server/expression.c +++ b/src/zabbix_server/expression.c @@ -555,7 +555,7 @@ int evaluate(int *result,char *exp, char *error, int maxerrlen) * Author: Alexei Vladishev * * * * Comments: {DATE},{TIME},{HOSTNAME},{IPADDRESS},{STATUS}, * - * {TRIGGER.DESCRIPTION}, {TRIGGER.KEY}, {SEVERITY} * + * {TRIGGER.DESCRIPTION}, {TRIGGER.KEY}, {TRIGGER.SEVERITY} * * * ******************************************************************************/ void substitute_simple_macros(DB_TRIGGER *trigger, DB_ACTION *action, char *data) @@ -704,7 +704,7 @@ void substitute_simple_macros(DB_TRIGGER *trigger, DB_ACTION *action, char *data strncat(data, tmp, MAX_STRING_LEN); strncat(data, s+strlen("{STATUS}"), MAX_STRING_LEN); } - else if( (s = strstr(str,"{SEVERITY}")) != NULL ) + else if( (s = strstr(str,"{TRIGGER.SEVERITY}")) != NULL ) { s[0]=0; strcpy(data, str); @@ -715,10 +715,10 @@ void substitute_simple_macros(DB_TRIGGER *trigger, DB_ACTION *action, char *data else if(trigger->priority == 3) strncat(data, "Average", MAX_STRING_LEN); else if(trigger->priority == 4) strncat(data, "High", MAX_STRING_LEN); else if(trigger->priority == 5) strncat(data, "Disaster", MAX_STRING_LEN); - else strncat(data, "Uncnown", MAX_STRING_LEN); + else strncat(data, "Unknown", MAX_STRING_LEN); strncat(data, tmp, MAX_STRING_LEN); - strncat(data, s+strlen("{SEVERITY}"), MAX_STRING_LEN); + strncat(data, s+strlen("{TRIGGER.SEVERITY}"), MAX_STRING_LEN); } else { |