........S. [ZBX-20077] fixed possible collision of audit entities for server in json

1 files changed, 17 insertions, 15 deletions

diff --git a/src/libs/zbxaudit/audit_graph.c b/src/libs/zbxaudit/audit_graph.c
index 302f0d260e4..8584b5830ff 100644
--- a/src/libs/zbxaudit/audit_graph.c
+++ b/src/libs/zbxaudit/audit_graph.c
@@ -52,6 +52,7 @@ void	zbx_audit_graph_create_entry(int audit_action, zbx_uint64_t graphid, const
 	resource_type = graph_flag_to_resource_type(flags);
 
 	local_audit_graph_entry.id = graphid;
+	local_audit_graph_entry.id_table = AUDIT_GRAPH_ID;
 
 	found_audit_graph_entry = (zbx_audit_entry_t**)zbx_hashset_search(zbx_get_audit_hashset(),
 			&(local_audit_graph_entry_x));
@@ -60,14 +61,15 @@ void	zbx_audit_graph_create_entry(int audit_action, zbx_uint64_t graphid, const
 	{
 		zbx_audit_entry_t	*local_audit_graph_entry_insert;
 
-		local_audit_graph_entry_insert = zbx_audit_entry_init(graphid, name, audit_action, resource_type);
+		local_audit_graph_entry_insert = zbx_audit_entry_init(graphid, AUDIT_GRAPH_ID, name, audit_action,
+				resource_type);
 
 		zbx_hashset_insert(zbx_get_audit_hashset(), &local_audit_graph_entry_insert,
 				sizeof(local_audit_graph_entry_insert));
 
 		if (AUDIT_ACTION_ADD == audit_action)
 		{
-			zbx_audit_update_json_append_uint64(graphid, AUDIT_DETAILS_ACTION_ADD, GR_OR_GRP(graphid),
+			zbx_audit_update_json_append_uint64(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_ADD, GR_OR_GRP(graphid),
 					graphid, "graphs", "graphid");
 		}
 	}
@@ -117,12 +119,12 @@ void	zbx_audit_graph_update_json_add_data(zbx_uint64_t graphid, const char *name
 	AUDIT_KEY_SNPRINTF(flags)
 	AUDIT_KEY_SNPRINTF(discover)
 #undef AUDIT_KEY_SNPRINTF
-	zbx_audit_update_json_append_no_value(graphid, AUDIT_DETAILS_ACTION_ADD, audit_key);
-#define ADD_STR(r, t, f) zbx_audit_update_json_append_string(graphid, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r, t, f);
-#define ADD_UINT64(r, t, f) zbx_audit_update_json_append_uint64(graphid, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r, t,\
+	zbx_audit_update_json_append_no_value(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_ADD, audit_key);
+#define ADD_STR(r, t, f) zbx_audit_update_json_append_string(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r, t, f);
+#define ADD_UINT64(r, t, f) zbx_audit_update_json_append_uint64(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r, t,\
 		f);
-#define ADD_INT(r, t, f) zbx_audit_update_json_append_int(graphid, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r, t, f);
-#define ADD_DOUBLE(r, t, f) zbx_audit_update_json_append_double(graphid, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r, t,\
+#define ADD_INT(r, t, f) zbx_audit_update_json_append_int(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r, t, f);
+#define ADD_DOUBLE(r, t, f) zbx_audit_update_json_append_double(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r, t,\
 		f);
 #define	AUDIT_TABLE_NAME	"graphs"
 	ADD_STR(name, AUDIT_TABLE_NAME, "name")
@@ -178,10 +180,10 @@ void	zbx_audit_graph_update_json_add_gitems(zbx_uint64_t graphid, int flags, zbx
 	AUDIT_KEY_GITEMS_SNPRINTF(type, .)
 	AUDIT_KEY_GITEMS_SNPRINTF(itemid, .)
 
-	zbx_audit_update_json_append_no_value(graphid, AUDIT_DETAILS_ACTION_ADD, audit_key_);
-#define ADD_STR(r, t, f) zbx_audit_update_json_append_string(graphid, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r, t, f);
-#define ADD_INT(r, t, f) zbx_audit_update_json_append_int(graphid, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r, t, f);
-#define ADD_UINT64(r, t, f) zbx_audit_update_json_append_uint64(graphid, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r, t,\
+	zbx_audit_update_json_append_no_value(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_);
+#define ADD_STR(r, t, f) zbx_audit_update_json_append_string(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r, t, f);
+#define ADD_INT(r, t, f) zbx_audit_update_json_append_int(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r, t, f);
+#define ADD_UINT64(r, t, f) zbx_audit_update_json_append_uint64(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_ADD, audit_key_##r, r, t,\
 		f);
 #define	AUDIT_TABLE_NAME	"graphs_items"
 	ADD_INT(drawtype, AUDIT_TABLE_NAME, "drawtype")
@@ -209,7 +211,7 @@ void	zbx_audit_graph_update_json_update_##resource(zbx_uint64_t graphid, int fla
 														\
 	zbx_snprintf(buf, sizeof(buf), GR_OR_GRP(resource));							\
 														\
-	zbx_audit_update_json_update_##type2(graphid, buf, resource##_old, resource##_new);			\
+	zbx_audit_update_json_update_##type2(graphid, AUDIT_GRAPH_ID, buf, resource##_old, resource##_new);			\
 }
 
 PREPARE_AUDIT_GRAPH_UPDATE(name, const char*, string)
@@ -245,7 +247,7 @@ void	zbx_audit_graph_update_json_update_gitem_create_entry(zbx_uint64_t graphid,
 
 	AUDIT_KEY_GITEMS_SNPRINTF(,)
 
-	zbx_audit_update_json_append_no_value(graphid, AUDIT_DETAILS_ACTION_UPDATE, audit_key_);
+	zbx_audit_update_json_append_no_value(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_UPDATE, audit_key_);
 }
 
 #define PREPARE_AUDIT_GRAPH_UPDATE(resource, type1, type2)							\
@@ -261,7 +263,7 @@ void	zbx_audit_graph_update_json_update_gitem_update_##resource(zbx_uint64_t gra
 														\
 	AUDIT_KEY_GITEMS_SNPRINTF(resource, .)									\
 														\
-	zbx_audit_update_json_update_##type2(graphid, audit_key_##resource, resource##_old, resource##_new);	\
+	zbx_audit_update_json_update_##type2(graphid, AUDIT_GRAPH_ID, audit_key_##resource, resource##_old, resource##_new);	\
 }
 PREPARE_AUDIT_GRAPH_UPDATE(itemid, zbx_uint64_t, uint64)
 PREPARE_AUDIT_GRAPH_UPDATE(drawtype,int, int)
@@ -288,7 +290,7 @@ void	zbx_audit_graph_update_json_delete_gitems(zbx_uint64_t graphid, int flags,
 	else
 		zbx_snprintf(audit_key, sizeof(audit_key), "graphprototype.gitems[" ZBX_FS_UI64 "]", gitemid);
 
-	zbx_audit_update_json_append_no_value(graphid, AUDIT_DETAILS_ACTION_DELETE, audit_key);
+	zbx_audit_update_json_append_no_value(graphid, AUDIT_GRAPH_ID, AUDIT_DETAILS_ACTION_DELETE, audit_key);
 }
 
 void	zbx_audit_DBselect_delete_for_graph(const char *sql, zbx_vector_uint64_t *ids)