diff options
| author | Andris Zeila <andris.zeila@zabbix.com> | 2021-01-28 21:49:29 +0300 |
|---|---|---|
| committer | Andris Zeila <andris.zeila@zabbix.com> | 2021-01-28 21:49:29 +0300 |
| commit | b0c50a282fd26fcb4b6d56c359cb171f75687817 (patch) | |
| tree | 0acaee1c8db1111def53d09af1507029a0692622 /include | |
| parent | ffc0868ad96ffef7cbe1156c25f65d36388a6bfe (diff) | |
........S. [ZBXNEXT-6451] updated trigger function calculation
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 2 | ||||
| -rw-r--r-- | include/zbxserver.h | 3 | ||||
| -rw-r--r-- | include/zbxtrends.h | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/include/common.h b/include/common.h index 13beaf1acd8..3e21d92d70b 100644 --- a/include/common.h +++ b/include/common.h @@ -1646,6 +1646,8 @@ int zbx_str_extract(const char *text, size_t len, char **value); typedef enum { ZBX_TIME_UNIT_UNKNOWN, + ZBX_TIME_UNIT_SECOND, + ZBX_TIME_UNIT_MINUTE, ZBX_TIME_UNIT_HOUR, ZBX_TIME_UNIT_DAY, ZBX_TIME_UNIT_WEEK, diff --git a/include/zbxserver.h b/include/zbxserver.h index da0778313cf..8076dddfa67 100644 --- a/include/zbxserver.h +++ b/include/zbxserver.h @@ -62,6 +62,9 @@ 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 evaluate_function2(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, diff --git a/include/zbxtrends.h b/include/zbxtrends.h index a99b587af94..33ed4387d14 100644 --- a/include/zbxtrends.h +++ b/include/zbxtrends.h @@ -25,9 +25,9 @@ #include "dbcache.h" int zbx_trends_parse_base(const char *params, zbx_time_unit_t *base, char **error); +int zbx_parse_timeshift(time_t from, const char *timeshift, struct tm *tm, char **error); -int zbx_trends_parse_range(time_t from, const char *period, const char *period_shift, int *start, int *end, - char **error); +int zbx_trends_parse_range(time_t from, const char *param, int *start, int *end, char **error); int zbx_trends_parse_nextcheck(time_t from, const char *period_shift, time_t *nextcheck, char **error); int zbx_trends_eval_avg(const char *table, zbx_uint64_t itemid, int start, int end, double *value, char **error); |