diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2021-01-27 01:50:34 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2021-01-27 01:55:43 +0300 |
| commit | ffc0868ad96ffef7cbe1156c25f65d36388a6bfe (patch) | |
| tree | b03857921b67494a119b65a60b95e6a7ea66a0bc /include/dbcache.h | |
| parent | 477f6cf0ec943b422d571b256d4fb45160bb7744 (diff) | |
........S. [ZBXNEXT-6451] updated trigger expression processing to use new expression syntax
(trigger recalculation, macro resolving, etc - all places that parsed
trigger expression to extract functionids).
Diffstat (limited to 'include/dbcache.h')
| -rw-r--r-- | include/dbcache.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/dbcache.h b/include/dbcache.h index e9c07adf576..b67930b2487 100644 --- a/include/dbcache.h +++ b/include/dbcache.h @@ -230,9 +230,6 @@ typedef struct _DC_TRIGGER { zbx_uint64_t triggerid; char *description; - char *expression_orig; - char *recovery_expression_orig; - /* temporary values, allocated during processing and freed right after */ char *expression; char *recovery_expression; @@ -750,7 +747,6 @@ void DCget_autoregistration_psk(char *psk_identity_buf, size_t psk_identity_buf_ #define ZBX_MACRO_SECRET_MASK "******" void DCget_user_macro(const zbx_uint64_t *hostids, int hostids_num, const char *macro, char **replace_to); -char *DCexpression_expand_user_macros(const char *expression); char *zbx_dc_expand_func_params_user_macros(zbx_uint64_t hostid, const char *params); int DCinterface_activate(zbx_uint64_t interfaceid, const zbx_timespec_t *ts, zbx_agent_availability_t *in, @@ -990,10 +986,10 @@ typedef struct { zbx_uint64_t objectid; zbx_uint64_t triggerid; - zbx_function_type_t type; + zbx_uint32_t type; zbx_time_unit_t trend_base; unsigned char lock; /* 1 if the timer has locked trigger, 0 otherwise */ - int revision; /* function revision */ + int revision; /* revision */ zbx_timespec_t eval_ts; /* the history time for which trigger must be recalculated */ zbx_timespec_t exec_ts; /* real time when the timer must be executed */ const char *parameter; /* function parameters (for trend functions) */ @@ -1012,4 +1008,6 @@ void zbx_db_trigger_queue_unlock(void); void zbx_get_host_interfaces_availability(zbx_uint64_t hostid, zbx_agent_availability_t *agents); +void zbx_dc_eval_expand_user_macros(zbx_eval_context_t *ctx); + #endif |