diff options
| author | Armands Arseniuss Skolmeisters <armands.skolmeisters@zabbix.com> | 2022-10-24 12:15:06 +0300 |
|---|---|---|
| committer | Armands Arseniuss Skolmeisters <armands.skolmeisters@zabbix.com> | 2022-10-24 12:15:06 +0300 |
| commit | a43e78d15f4f55c6867572e47540851059d03132 (patch) | |
| tree | f8b6ec65b448a928f94611e9d3d0dc899a0b58bc /include | |
| parent | 089a712a521a41d6142552d6258fcaa242dedd36 (diff) | |
| parent | 376983d91eda734c416bae51658c4b72c256bf8e (diff) | |
...G...PS. [DEV-2144] updated to the latest master
Diffstat (limited to 'include')
| -rw-r--r-- | include/audit/zbxaudit_trigger.h | 7 | ||||
| -rw-r--r-- | include/zbxdbhigh.h | 1 | ||||
| -rw-r--r-- | include/zbxtime.h | 2 | ||||
| -rw-r--r-- | include/zbxxml.h | 1 |
4 files changed, 8 insertions, 3 deletions
diff --git a/include/audit/zbxaudit_trigger.h b/include/audit/zbxaudit_trigger.h index b2594bbcf49..e20772fabb1 100644 --- a/include/audit/zbxaudit_trigger.h +++ b/include/audit/zbxaudit_trigger.h @@ -27,9 +27,9 @@ void zbx_audit_trigger_create_entry(int audit_action, zbx_uint64_t triggerid, co void zbx_audit_trigger_update_json_add_data(zbx_uint64_t triggerid, zbx_uint64_t templateid, unsigned char recovery_mode, unsigned char status, unsigned char type, zbx_uint64_t value, - zbx_uint64_t state, unsigned char priority, const char *comments, const char *url, int flags, - unsigned char correlation_mode, const char *correlation_tag, unsigned char manual_close, - const char *opdata, unsigned char discover, const char *event_name); + zbx_uint64_t state, unsigned char priority, const char *comments, const char *url, + const char *url_name, int flags, unsigned char correlation_mode, const char *correlation_tag, + unsigned char manual_close, const char *opdata, unsigned char discover, const char *event_name); void zbx_audit_trigger_update_json_add_expr(zbx_uint64_t triggerid, int flags, const char *expression); void zbx_audit_trigger_update_json_add_rexpr(zbx_uint64_t triggerid, int flags, const char *recovery_expression); @@ -48,6 +48,7 @@ PREPARE_AUDIT_TRIGGER_UPDATE_H(event_name, const char*) PREPARE_AUDIT_TRIGGER_UPDATE_H(priority, int) PREPARE_AUDIT_TRIGGER_UPDATE_H(comments, const char*) PREPARE_AUDIT_TRIGGER_UPDATE_H(url, const char*) +PREPARE_AUDIT_TRIGGER_UPDATE_H(url_name, const char*) PREPARE_AUDIT_TRIGGER_UPDATE_H(type, int) PREPARE_AUDIT_TRIGGER_UPDATE_H(status, int) PREPARE_AUDIT_TRIGGER_UPDATE_H(templateid, zbx_uint64_t) diff --git a/include/zbxdbhigh.h b/include/zbxdbhigh.h index 1eded731847..69fbad596e7 100644 --- a/include/zbxdbhigh.h +++ b/include/zbxdbhigh.h @@ -225,6 +225,7 @@ typedef struct char *expression; char *recovery_expression; char *url; + char *url_name; char *comments; char *correlation_tag; char *opdata; diff --git a/include/zbxtime.h b/include/zbxtime.h index 678156523a7..a383d774845 100644 --- a/include/zbxtime.h +++ b/include/zbxtime.h @@ -81,4 +81,6 @@ int zbx_calculate_sleeptime(int nextcheck, int max_sleeptime); char *zbx_age2str(int age); char *zbx_date2str(time_t date, const char *tz); char *zbx_time2str(time_t time, const char *tz); +int zbx_iso8601_utc(const char *str, time_t *time); + #endif /* ZABBIX_TIME_H */ diff --git a/include/zbxxml.h b/include/zbxxml.h index 7cc1bb22a34..7cf062cb8fd 100644 --- a/include/zbxxml.h +++ b/include/zbxxml.h @@ -52,6 +52,7 @@ int zbx_xml_node_read_values(xmlDoc *xdoc, xmlNode *node, const char *xpath, zbx int zbx_xml_try_read_value(const char *data, size_t len, const char *xpath, xmlDoc **xdoc, char **value, char **error); int zbx_xml_doc_read_num(xmlDoc *xdoc, const char *xpath, int *num); +int zbx_xml_node_read_num(xmlDoc *xdoc, xmlNode *node, const char *xpath, int *num); char *zbx_xml_node_read_value(xmlDoc *xdoc, xmlNode *node, const char *xpath); char *zbx_xml_doc_read_value(xmlDoc *xdoc, const char *xpath); xmlNode *zbx_xml_node_get(xmlDoc *xdoc, xmlNode *node, const char *xpath); |