From 21e2adb441a409319ad25aad5b6d5b526d134fb7 Mon Sep 17 00:00:00 2001 From: Andris Mednis Date: Mon, 25 Jan 2021 23:58:59 +0200 Subject: ........S. [ZBXNEXT-6368] improved const-correctness of substitute_simple_macros(), substitute_simple_macros_unmasked() and substitute_simple_macros_impl() prototypes --- include/zbxserver.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'include/zbxserver.h') diff --git a/include/zbxserver.h b/include/zbxserver.h index 33e350977e9..cac8541f6f8 100644 --- a/include/zbxserver.h +++ b/include/zbxserver.h @@ -63,15 +63,15 @@ void get_functionids(zbx_vector_uint64_t *functionids, const char *expression); int evaluate_function(char **value, DC_ITEM *item, const char *function, const char *parameter, const zbx_timespec_t *ts, char **error); -int substitute_simple_macros(zbx_uint64_t *actionid, const DB_EVENT *event, const DB_EVENT *r_event, - zbx_uint64_t *userid, const zbx_uint64_t *hostid, const DC_HOST *dc_host, const DC_ITEM *dc_item, - DB_ALERT *alert, const DB_ACKNOWLEDGE *ack, const char *tz, char **data, int macro_type, char *error, - int maxerrlen); +int substitute_simple_macros(const zbx_uint64_t *actionid, const DB_EVENT *event, const DB_EVENT *r_event, + const zbx_uint64_t *userid, const zbx_uint64_t *hostid, const DC_HOST *dc_host, const DC_ITEM *dc_item, + const DB_ALERT *alert, const DB_ACKNOWLEDGE *ack, const char *tz, char **data, int macro_type, + char *error, int maxerrlen); -int substitute_simple_macros_unmasked(zbx_uint64_t *actionid, const DB_EVENT *event, const DB_EVENT *r_event, - zbx_uint64_t *userid, const zbx_uint64_t *hostid, const DC_HOST *dc_host, const DC_ITEM *dc_item, - DB_ALERT *alert, const DB_ACKNOWLEDGE *ack, const char *tz, char **data, int macro_type, char *error, - int maxerrlen); +int substitute_simple_macros_unmasked(const zbx_uint64_t *actionid, const DB_EVENT *event, const DB_EVENT *r_event, + const zbx_uint64_t *userid, const zbx_uint64_t *hostid, const DC_HOST *dc_host, const DC_ITEM *dc_item, + const DB_ALERT *alert, const DB_ACKNOWLEDGE *ack, const char *tz, char **data, int macro_type, + char *error, int maxerrlen); void evaluate_expressions(zbx_vector_ptr_t *triggers); -- cgit v1.2.3 From 1a1a25a0609998f38586fcbd7eaa70722e519a99 Mon Sep 17 00:00:00 2001 From: Andris Mednis Date: Mon, 8 Feb 2021 13:04:16 +0200 Subject: ........S. [ZBXNEXT-6368] added new macro types and HOST.TARGET.* macros substitution --- include/zbxserver.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/zbxserver.h') diff --git a/include/zbxserver.h b/include/zbxserver.h index cac8541f6f8..4db94678138 100644 --- a/include/zbxserver.h +++ b/include/zbxserver.h @@ -51,6 +51,8 @@ #define MACRO_TYPE_EVENT_NAME 0x02000000 /* event name in trigger configuration */ #define MACRO_TYPE_EXPRESSION 0x04000000 /* macros in expression macro */ #define MACRO_TYPE_SCRIPT_PARAMS_FIELD 0x08000000 +#define MACRO_TYPE_SCRIPT_NORMAL 0x10000000 +#define MACRO_TYPE_SCRIPT_RECOVERY 0x20000000 #define MACRO_EXPAND_NO 0 #define MACRO_EXPAND_YES 1 -- cgit v1.2.3