--- ./src/libs/zbxserver/expression.c 2011-10-13 11:38:42.000000000 -0400 +++ ./src/libs/zbxserver/expression.c 2011-10-13 12:01:08.000000000 -0400 @@ -1476,6 +1476,7 @@ #define MVAR_EVENT_AGE "{EVENT.AGE}" #define MVAR_EVENT_ACK_STATUS "{EVENT.ACK.STATUS}" #define MVAR_EVENT_ACK_HISTORY "{EVENT.ACK.HISTORY}" +#define MVAR_ESC_ORIGIN_EVENT_ID "{ESC.ORIGIN.EVENT.ID}" #define MVAR_ESC_HISTORY "{ESC.HISTORY}" #define MVAR_HOSTNAME "{HOSTNAME}" #define MVAR_PROXY_NAME "{PROXY.NAME}" @@ -1835,6 +1836,8 @@ replace_to = zbx_strdup(replace_to, event->acknowledged ? "Yes" : "No"); else if (0 == strcmp(m, MVAR_EVENT_ACK_HISTORY)) ret = get_event_ack_history(event, &replace_to); + else if (0 == strcmp(m, MVAR_ESC_ORIGIN_EVENT_ID)) + replace_to = zbx_dsprintf(replace_to, "%d", (int)(escalation != NULL ? escalation->eventid : event->eventid)); else if (0 == strcmp(m, MVAR_ESC_HISTORY)) ret = get_escalation_history(event, escalation, &replace_to); else if (0 == strcmp(m, MVAR_TRIGGER_SEVERITY))