diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-08-04 13:08:36 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-08-04 13:08:36 +0000 |
| commit | 62fb63386a74c097ca7b92c982f0067399827f8c (patch) | |
| tree | 6e8a18c5a7c1e65be8971edfc4baf02f15fc559c /src | |
| parent | c6fa7b4cd021ecb777bc674f21dd4c8badc1033e (diff) | |
| download | zabbix-62fb63386a74c097ca7b92c982f0067399827f8c.tar.gz zabbix-62fb63386a74c097ca7b92c982f0067399827f8c.tar.xz zabbix-62fb63386a74c097ca7b92c982f0067399827f8c.zip | |
- added support of macro {TRIGGER.COMMENT} (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@3099 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/zbxdbhigh/db.c | 3 | ||||
| -rw-r--r-- | src/zabbix_server/expression.c | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/libs/zbxdbhigh/db.c b/src/libs/zbxdbhigh/db.c index 453b07b6..bc89ff1a 100644 --- a/src/libs/zbxdbhigh/db.c +++ b/src/libs/zbxdbhigh/db.c @@ -838,12 +838,13 @@ void update_triggers_status_to_unknown(int hostid,int clock,char *reason) zabbix_log(LOG_LEVEL_DEBUG,"In update_triggers_status_to_unknown()"); /* zbx_snprintf(sql,sizeof(sql),"select distinct t.triggerid from hosts h,items i,triggers t,functions f where f.triggerid=t.triggerid and f.itemid=i.itemid and h.hostid=i.hostid and h.hostid=%d and i.key_<>'%s'",hostid,SERVER_STATUS_KEY);*/ - result = DBselect("select distinct t.triggerid,t.value from hosts h,items i,triggers t,functions f where f.triggerid=t.triggerid and f.itemid=i.itemid and h.hostid=i.hostid and h.hostid=%d and i.key_ not in ('%s','%s','%s')",hostid,SERVER_STATUS_KEY, SERVER_ICMPPING_KEY, SERVER_ICMPPINGSEC_KEY); + result = DBselect("select distinct t.triggerid,t.value,t.comments from hosts h,items i,triggers t,functions f where f.triggerid=t.triggerid and f.itemid=i.itemid and h.hostid=i.hostid and h.hostid=%d and i.key_ not in ('%s','%s','%s')",hostid,SERVER_STATUS_KEY, SERVER_ICMPPING_KEY, SERVER_ICMPPINGSEC_KEY); while((row=DBfetch(result))) { trigger.triggerid=atoi(row[0]); trigger.value=atoi(row[1]); + strscpy(trigger.comments, row[2]); DBupdate_trigger_value(&trigger,TRIGGER_VALUE_UNKNOWN,clock,reason); } diff --git a/src/zabbix_server/expression.c b/src/zabbix_server/expression.c index bafa05bd..d477a1c9 100644 --- a/src/zabbix_server/expression.c +++ b/src/zabbix_server/expression.c @@ -585,6 +585,13 @@ void substitute_simple_macros(DB_TRIGGER *trigger, DB_ACTION *action, char *data strncat(data, trigger->description, MAX_STRING_LEN); strncat(data, s+strlen("{TRIGGER.NAME}"), MAX_STRING_LEN); } + else if( (s = strstr(str,"{TRIGGER.COMMENT}")) != NULL ) + { + s[0]=0; + strcpy(data, str); + strncat(data, trigger->comments, MAX_STRING_LEN); + strncat(data, s+strlen("{TRIGGER.COMMENT}"), MAX_STRING_LEN); + } else if( (s = strstr(str,"{HOSTNAME}")) != NULL ) { /* zbx_snprintf(sql,sizeof(sql),"select distinct t.description,h.host from triggers t, functions f,items i, hosts h where t.triggerid=%d and f.triggerid=t.triggerid and f.itemid=i.itemid and h.hostid=i.hostid", trigger->triggerid);*/ |