diff options
Diffstat (limited to 'include/common.h')
| -rw-r--r-- | include/common.h | 44 |
1 files changed, 20 insertions, 24 deletions
diff --git a/include/common.h b/include/common.h index 8691b752cf6..10c16b69228 100644 --- a/include/common.h +++ b/include/common.h @@ -360,7 +360,7 @@ const char *zbx_dservice_type_string(zbx_dservice_type_t service); #define CONDITION_TYPE_DVALUE 12 #define CONDITION_TYPE_HOST_TEMPLATE 13 #define CONDITION_TYPE_EVENT_ACKNOWLEDGED 14 -#define CONDITION_TYPE_APPLICATION 15 +/* #define CONDITION_TYPE_APPLICATION 15 deprecated */ #define CONDITION_TYPE_SUPPRESSED 16 #define CONDITION_TYPE_DRULE 18 #define CONDITION_TYPE_DCHECK 19 @@ -404,24 +404,6 @@ const char *zbx_dservice_type_string(zbx_dservice_type_t service); #define EVENT_TYPE_TRIGGER_UNKNOWN 4 /* #define EVENT_TYPE_TRIGGER_NORMAL 5 deprecated */ -#define SCREEN_RESOURCE_GRAPH 0 -#define SCREEN_RESOURCE_SIMPLE_GRAPH 1 -#define SCREEN_RESOURCE_MAP 2 -#define SCREEN_RESOURCE_PLAIN_TEXT 3 -#define SCREEN_RESOURCE_HOST_INFO 4 -#define SCREEN_RESOURCE_TRIGGER_INFO 5 -#define SCREEN_RESOURCE_SERVER_INFO 6 -#define SCREEN_RESOURCE_CLOCK 7 -#define SCREEN_RESOURCE_SCREEN 8 -#define SCREEN_RESOURCE_TRIGGER_OVERVIEW 9 -#define SCREEN_RESOURCE_DATA_OVERVIEW 10 -#define SCREEN_RESOURCE_URL 11 -#define SCREEN_RESOURCE_ACTIONS 12 -#define SCREEN_RESOURCE_EVENTS 13 -#define SCREEN_RESOURCE_HOSTGROUP_TRIGGERS 14 -#define SCREEN_RESOURCE_SYSTEM_STATUS 15 -#define SCREEN_RESOURCE_HOST_TRIGGERS 16 - typedef enum { SYSMAP_ELEMENT_TYPE_HOST = 0, @@ -569,7 +551,9 @@ const char *get_program_type_string(unsigned char program_type); #define ZBX_PROCESS_TYPE_ALERTSYNCER 30 #define ZBX_PROCESS_TYPE_HISTORYPOLLER 31 #define ZBX_PROCESS_TYPE_AVAILMAN 32 -#define ZBX_PROCESS_TYPE_COUNT 33 /* number of process types */ +#define ZBX_PROCESS_TYPE_REPORTMANAGER 33 +#define ZBX_PROCESS_TYPE_REPORTWRITER 34 +#define ZBX_PROCESS_TYPE_COUNT 35 /* number of process types */ #define ZBX_PROCESS_TYPE_UNKNOWN 255 const char *get_process_type_string(unsigned char proc_type); int get_process_type_by_name(const char *proc_type_str); @@ -855,9 +839,12 @@ zbx_script_t; #define ZBX_SCRIPT_TYPE_IPMI 1 #define ZBX_SCRIPT_TYPE_SSH 2 #define ZBX_SCRIPT_TYPE_TELNET 3 -#define ZBX_SCRIPT_TYPE_GLOBAL_SCRIPT 4 #define ZBX_SCRIPT_TYPE_WEBHOOK 5 +#define ZBX_SCRIPT_SCOPE_ACTION 1 +#define ZBX_SCRIPT_SCOPE_HOST 2 +#define ZBX_SCRIPT_SCOPE_EVENT 4 + #define ZBX_SCRIPT_EXECUTE_ON_AGENT 0 #define ZBX_SCRIPT_EXECUTE_ON_SERVER 1 #define ZBX_SCRIPT_EXECUTE_ON_PROXY 2 /* fall back to execution on server if target not monitored by proxy */ @@ -919,8 +906,8 @@ while (0) \ do \ { \ - zbx_error("ERROR [file and function: <%s,%s>, revision:%s] Something impossible has just happened.", \ - __FILE__, __func__, ZABBIX_REVISION); \ + zbx_error("ERROR [file and function: <%s,%s>, revision:%s, line:%d] Something impossible has just" \ + " happened.", __FILE__, __func__, ZABBIX_REVISION, __LINE__); \ zbx_backtrace(); \ } \ while (0) @@ -1679,7 +1666,6 @@ int zbx_validate_value_dbl(double value, int dbl_precision); void zbx_update_env(double time_now); int zbx_get_agent_item_nextcheck(zbx_uint64_t itemid, const char *delay, int now, int *nextcheck, char **error); - #define ZBX_DATA_SESSION_TOKEN_SIZE (MD5_DIGEST_SIZE * 2) char *zbx_create_token(zbx_uint64_t seed); @@ -1741,4 +1727,14 @@ int zbx_open_xml(char *data, int options, int maxerrlen, void **xml_doc, void ** int zbx_check_xml_memory(char *mem, int maxerrlen, char **errmsg); #endif +/* report scheduling */ + +#define ZBX_REPORT_CYCLE_DAILY 0 +#define ZBX_REPORT_CYCLE_WEEKLY 1 +#define ZBX_REPORT_CYCLE_MONTHLY 2 +#define ZBX_REPORT_CYCLE_YEARLY 3 + +int zbx_get_report_nextcheck(int now, unsigned char cycle, unsigned char weekdays, int start_time, + const char *tz); + #endif |