........S. [ZBXNEXT-6470,ZBXNEXT-6715] updated to the latest master

1 files changed, 20 insertions, 0 deletions

diff --git a/include/db.h b/include/db.h
index 2ea42e8a189..e0836e3f17e 100644
--- a/include/db.h
+++ b/include/db.h
@@ -341,6 +341,15 @@ DB_TRIGGER;
 
 typedef struct
 {
+	zbx_uint64_t		serviceid;
+	char			*name;
+	zbx_vector_uint64_t	eventids;
+	zbx_vector_ptr_t	events;
+}
+DB_SERVICE;
+
+typedef struct
+{
 	zbx_uint64_t		eventid;
 	DB_TRIGGER		trigger;
 	zbx_uint64_t		objectid;
@@ -463,6 +472,8 @@ typedef struct
 	zbx_uint64_t		eventid;
 	zbx_uint64_t		r_eventid;
 	zbx_uint64_t		acknowledgeid;
+	zbx_uint64_t		servicealarmid;
+	zbx_uint64_t		serviceid;
 	int			nextcheck;
 	int			esc_step;
 	zbx_escalation_status_t	status;
@@ -493,6 +504,14 @@ typedef struct
 }
 DB_ACKNOWLEDGE;
 
+typedef struct
+{
+	zbx_uint64_t	service_alarmid;
+	int		value;
+	int		clock;
+}
+zbx_service_alarm_t;
+
 int	DBinit(char **error);
 void	DBdeinit(void);
 
@@ -765,6 +784,7 @@ typedef struct
 {
 	zbx_uint64_t		eventid;
 	int			clock;
+	int			ns;
 	int			value;
 	int			severity;