Add new endpoint 'recalculate-agent-group-hashes' to wazuh-db #23441
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ate-agent-group-hashes.
…ction. + adds new function wdb_global_recalculate_agent_groups_hash_without_sync_status.
+ Fixed ut for function wdb_global_recalculate_all_agent_groups_hash
Nicogp
force-pushed
the
fix/23422-groups-hash
branch
from
1fa1e79
to
4b994e0
Compare
TomasTurina
reviewed
May 16, 2024
src/wazuh_db/wdb.c
Outdated
| [WDB_STMT_GLOBAL_UPDATE_AGENT_INFO] = "UPDATE agent SET config_sum = :config_sum, ip = :ip, manager_host = :manager_host, merged_sum = :merged_sum, name = :name, node_name = :node_name, os_arch = :os_arch, os_build = :os_build, os_codename = :os_codename, os_major = :os_major, os_minor = :os_minor, os_name = :os_name, os_platform = :os_platform, os_uname = :os_uname, os_version = :os_version, version = :version, last_keepalive = :last_keepalive, connection_status = :connection_status, disconnection_time = :disconnection_time, group_config_status = :group_config_status, status_code= :status_code, sync_status = :sync_status WHERE id = :id;", | ||
| [WDB_STMT_GLOBAL_GET_GROUPS] = "SELECT DISTINCT `group`, group_hash from agent WHERE id > 0 AND group_hash > ? ORDER BY group_hash;", | ||
| [WDB_STMT_GLOBAL_GET_AGENTS] = "SELECT id FROM agent WHERE id > ?;", | ||
| [WDB_STMT_GLOBAL_GET_AGENTS_BY_CONNECTION_STATUS] = "SELECT id FROM agent WHERE id > ? AND connection_status = ?;", | ||
| [WDB_STMT_GLOBAL_GET_AGENTS_BY_CONNECTION_STATUS_AND_NODE] = "SELECT id FROM agent WHERE id > ? AND connection_status = ? AND node_name = ? ORDER BY id LIMIT ?;", | ||
| [WDB_STMT_GLOBAL_GET_AGENTS_TO_RECALCULATE_GROUP_HASH] = "SELECT id FROM agent WHERE id > 0;", |
There was a problem hiding this comment.
I think you can use the query WDB_STMT_GLOBAL_GET_AGENTS.
src/wazuh_db/wdb_parser.c
Outdated
| int wdb_parse_global_recalculate_agent_group_hashes(wdb_t* wdb, char* output) { | ||
|
|
||
| if (OS_SUCCESS != wdb_global_recalculate_all_agent_groups_hash(wdb)) { | ||
| mdebug1("Error recalculating group hash of agents in global.db."); |
There was a problem hiding this comment.
I think we can change this log to warning.
…ALCULATE_GROUP_HASH, WDB_STMT_GLOBAL_GET_AGENTS is used.
+ Changes the debugging message “Error recalculating group hash of agents in global.db.” to warning
Nicogp
force-pushed
the
fix/23422-groups-hash
branch
from
a0cc761
to
22449c8
Compare
|
UTs running in local environment: UTs serverUTs agent linux |
TomasTurina
approved these changes
May 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR adds the new endpoint 'recalculate-agent-group-hashes' to wazuh-db, this endpoint performs the recalculation of agent-group hashes for each agent stored in the global.db database.
Conditions (agent by agent) for hash recalculation:
The 'group' field of that agent must be different from NULL.Conditions for updating the value of the 'group_hash' and 'group' column in the database:
The newly calculated hash must be different from the previous one.Conditions for updating the value of the 'group_sync_status' column in the database:
The newly calculated hash must be different from the previous one.The value of 'group_sync_status' will be set to 'synced' if the manager is a single-node or a worker node.The value of 'group_sync_status' will be set to 'syncreq' if the manager is the master node.Values that can be returned by the endpoint:
okerr Error recalculating group hash of agents in global.dbTests