Added server address and wazuh protocol definition in Deploy agent section #5166

Machi3mfl · 2023-01-25T16:09:02Z

Description

This PR, adds a new WzServerAddress component for the Deploy Agent section.
The component is a free input.

Closes #5138 #5140

Scope

Protocol cases

When the only available Protocol is UDP, the WAZUH_PROTOCOL param in the command will show UDP.

On Manager and Cluster mode.

When the Protocol available exists TCP, the WAZUH_PROTOCOL param in the command will be TCP (the param is hidden, and TCP is the default value)

On Manager and Cluster mode.

Server address input cases

When the user has filled the enrollment.dns field in Management > Configuration. The server address input must be filled by default with this value.

Annotation

The protocol and server address input are independent.
The command protocol param defined depends on only the remote configuration defined in the ossec.conf file.

Test cases evidence

Protocol cases

When the protocol is UDP (Cluster mode)

Check the remote config in Management > Configuration > Global configuration > Remote Tab
Go to Deploy Agent
Complete the OS options.
The WAZUH_PROTOCOL param must show UDP

Kazam_screencast_00005.mp4

When the protocol is TCP (`Cluster mode`)

Check the remote config in Management > Configuration > Global configuration > Remote Tab
Go to Deploy Agent
Complete the OS options.
The WAZUH_PROTOCOL param must be hidden (when is not defined the protocol is TCP)

Kazam_screencast_00006.mp4

When the protocol is UDP (`Manager mode`)

Check the remote config in Management > Configuration > Global configuration > Remote Tab
Go to Deploy Agent
Complete the OS options.
The WAZUH_PROTOCOL param must show UDP

Kazam_screencast_00008.mp4

When the protocol is TCP (`Manager mode`)

Check the remote config in Management > Configuration > Global configuration > Remote Tab
Go to Deploy Agent
Complete the OS options.
The WAZUH_PROTOCOL param must be hidden (when is not defined the protocol is TCP)

Kazam_screencast_00007.mp4

Check List

All tests pass
- yarn test:jest
New functionality includes testing.
New functionality has been documented.
Update CHANGELOG.md
Commits are signed per the DCO using --signoff

Machi3mfl · 2023-01-25T16:15:34Z

This PR also resolves issue #5140

Now, when the Deploy Agent inputs changes don't launch new requests.

Kazam_screencast_00000.mp4

public/controllers/agent/components/register-agent.js

CHANGELOG.md

public/controllers/agent/register-agent/steps/wz-manager-address.tsx

tsconfig.json

github-actions · 2023-01-26T15:44:46Z

Code coverage (Jest)	%	values
Statements	8.8%	( 3255 / 36973 )
Branches	4.49%	( 1291 / 28723 )
Functions	7.68%	( 703 / 9159 )
Lines	8.87%	( 3140 / 35403 )

Desvelao

review:

code 🟢

Tests

Kibana 7.10.2

WIP

Legend:
⚫: none
🟢: passed
🔴: failed
🟡: warning
⚪: not applicable

UI

Test	Chrome	Firefox	Safari
For a manager master (cluster mode) configurated as TCP and UDP as the protocols of the remote secure connection, uses the TCP protocol. It should not display the WAZUH_PROTOCOL deployment variable	🟢	🟢	⚫
For a manager master (cluster mode) configurated as TCP as the protocol of the remote secure connection, uses the TCP protocol. It should not display the WAZUH_PROTOCOL deployment variable	🟢	🟢	⚫
For a manager master (cluster mode) configurated as UDP as the protocol of the remote secure connection, uses the UDP protocol. It should display the WAZUH_PROTOCOL deployment variable with UDP value	🟢	🟢	⚫
For a manager master (manager mode) configurated as TCP and UDP as the protocols of the remote secure connection, uses the TCP protocol. It should not display the WAZUH_PROTOCOL deployment variable	🟢	🟢	⚫
For a manager master (cluster mode) configurated as TCP as the protocol of the remote secure connection, uses the TCP protocol. It should not display the WAZUH_PROTOCOL deployment variable	🟢	🟢	⚫
For a manager master (manager mode) configurated as UDP as the protocol of the remote secure connection, uses the UDP protocol. It should display the WAZUH_PROTOCOL deployment variable with UDP value	🟢	🟢	⚫

Details

🟢 For a manager master (cluster mode) configurated as TCP and UDP as the protocols of the remote secure connection, uses the TCP protocol. It should not display the WAZUH_PROTOCOL deployment variable

Chrome - 🟢

Firefox - 🟢

Safari - ⚫

🟢 For a manager master (cluster mode) configurated as TCP as the protocol of the remote secure connection, uses the TCP protocol. It should not display the WAZUH_PROTOCOL deployment variable

Chrome - 🟢

Firefox - 🟢

Safari - ⚫

🟢 For a manager master (cluster mode) configurated as UDP as the protocol of the remote secure connection, uses the UDP protocol. It should display the WAZUH_PROTOCOL deployment variable with UDP value

Chrome - 🟢

Firefox - 🟢

Safari - ⚫

🟢 For a manager master (manager mode) configurated as TCP and UDP as the protocols of the remote secure connection, uses the TCP protocol. It should not display the WAZUH_PROTOCOL deployment variable

Chrome - 🟢

Firefox - 🟢

Safari - ⚫

🟢 For a manager master (cluster mode) configurated as TCP as the protocol of the remote secure connection, uses the TCP protocol. It should not display the WAZUH_PROTOCOL deployment variable

Chrome - 🟢

Firefox - 🟢

Safari - ⚫

🟢 For a manager master (manager mode) configurated as UDP as the protocol of the remote secure connection, uses the UDP protocol. It should display the WAZUH_PROTOCOL deployment variable with UDP value

Chrome - ⚫

Firefox - ⚫

Safari - ⚫

asteriscos

Test: ❌
If I choose Operating systems without Manager Server Address the script does not show UDP in cluster mode:

Machi3mfl · 2023-01-26T17:57:04Z

Test: x If I choose Operating systems without Manager Server Address the script does not show UDP in cluster mode:

Thanks, @asteriscos.
I researched this use case and is the expected behavior, for the Alpine SO the command doesn't have additional parameters like WAZUH_PROTOCOL, WAZUH_MANAGER, etc.
The command structure is defined in the following issue comment

asteriscos

CR: ✔️

Cluster mode - With Enrollment - UDP - 🟢

Cluster mode - Without Enrollment - UDP - 🟢

Cluster mode - TCP - 🟢

Manager mode - TCP - 🟢

Manager mode - UDP - 🟢

github-actions · 2023-01-26T19:11:57Z

The backport to 4.4-2.4-wzd failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.4-2.4-wzd 4.4-2.4-wzd
# Navigate to the new working tree
cd .worktrees/backport-4.4-2.4-wzd
# Create a new branch
git switch --create backport-5166-to-4.4-2.4-wzd
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b167d6c4bc65b1b42029ddbab13c99c99cd43428
# Push it to GitHub
git push --set-upstream origin backport-5166-to-4.4-2.4-wzd
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.4-2.4-wzd

Then, create a pull request where the base branch is 4.4-2.4-wzd and the compare/head branch is backport-5166-to-4.4-2.4-wzd.

…ction (#5166) * Added new WzServerAddressInput component * Updated CHANGELOG * Update state server address when is mounted * Resolved review comments * Updated CHANGELOG * Updated logic when protocol is UDP * Modified wazuh protocol param definition * Changed PR text in CHANGELOG * Reverted changes tsconfig (cherry picked from commit b167d6c)

…tion in Deploy agent section (#5173) Added server address and wazuh protocol definition in Deploy agent section (#5166) * Added new WzServerAddressInput component * Updated CHANGELOG * Update state server address when is mounted * Resolved review comments * Updated CHANGELOG * Updated logic when protocol is UDP * Modified wazuh protocol param definition * Changed PR text in CHANGELOG * Reverted changes tsconfig (cherry picked from commit b167d6c) Co-authored-by: Maximiliano Ibarra <[email protected]>

…n in Deploy agent section (#5172) Added server address and wazuh protocol definition in Deploy agent section (#5166) * Added new WzServerAddressInput component * Updated CHANGELOG * Update state server address when is mounted * Resolved review comments * Updated CHANGELOG * Updated logic when protocol is UDP * Modified wazuh protocol param definition * Changed PR text in CHANGELOG * Reverted changes tsconfig (cherry picked from commit b167d6c) Co-authored-by: Maximiliano Ibarra <[email protected]> Co-authored-by: Antonio <[email protected]> Co-authored-by: Federico Rodriguez <[email protected]>

Added new WzServerAddressInput component

8f922ca

Machi3mfl requested a review from a team as a code owner January 25, 2023 16:09

This was linked to issues Jan 25, 2023

The "Deploy a new agent" section misleads users with an all-in-one deployment #5138

Closed

Deploy new agent - repeated requests #5140

Closed

Machi3mfl mentioned this pull request Jan 25, 2023

Deploy new agent - repeated requests #5140

Closed

Machi3mfl self-assigned this Jan 25, 2023

Machi3mfl changed the title ~~Added new WzServerAddressInput component~~ Added new Server Address component Jan 25, 2023

Machi3mfl added 2 commits January 25, 2023 14:23

Updated CHANGELOG

42385f8

Update state server address when is mounted

9fe9810

Desvelao reviewed Jan 26, 2023

View reviewed changes

public/controllers/agent/components/register-agent.js Outdated Show resolved Hide resolved

Desvelao reviewed Jan 26, 2023

View reviewed changes

public/controllers/agent/components/register-agent.js Outdated Show resolved Hide resolved

Resolved review comments

6ae5910

Desvelao reviewed Jan 26, 2023

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

Machi3mfl changed the title ~~Added new Server Address component~~ Added new Server Address input in Deploy agent section Jan 26, 2023

Updated CHANGELOG

fb33831

Desvelao reviewed Jan 26, 2023

View reviewed changes

public/controllers/agent/register-agent/steps/wz-manager-address.tsx Outdated Show resolved Hide resolved

Machi3mfl added 2 commits January 26, 2023 09:54

Updated logic when protocol is UDP

6ba81b4

Modified wazuh protocol param definition

b238861

Machi3mfl changed the title ~~Added new Server Address input in Deploy agent section~~ Added server address and wazuh protocol definition in Deploy agent section Jan 26, 2023

Changed PR text in CHANGELOG

2c774e2

Machi3mfl mentioned this pull request Jan 26, 2023

The "Deploy a new agent" section misleads users with an all-in-one deployment #5138

Closed

Desvelao reviewed Jan 26, 2023

View reviewed changes

tsconfig.json Outdated Show resolved Hide resolved

Reverted changes tsconfig

e0b15e4

Desvelao approved these changes Jan 26, 2023

View reviewed changes

asteriscos requested changes Jan 26, 2023

View reviewed changes

asteriscos approved these changes Jan 26, 2023

View reviewed changes

Machi3mfl added the backport 4.4-7.16 label Jan 26, 2023

Machi3mfl added the backport 4.4-2.4-wzd label Jan 26, 2023

asteriscos merged commit b167d6c into 4.4-7.10 Jan 26, 2023

asteriscos deleted the feat/5138-server-address-input-not-select branch January 26, 2023 19:11

github-actions bot mentioned this pull request Jan 26, 2023

[Backport 4.4-7.16] Added server address and wazuh protocol definition in Deploy agent section #5172

Merged

Desvelao mentioned this pull request Jan 27, 2023

[Backport 4.4-2.4-wzd] Added server address and wazuh protocol definition in Deploy agent section #5173

Merged

chantal-kelm mentioned this pull request May 31, 2023

[Redesign add agent] Inputs logic (server address, name, password, group) #5518

Closed

5 tasks

Machi3mfl mentioned this pull request Jun 28, 2023

[Redesign add agent] Validate register agent commands depending on form parameters #5594

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added server address and wazuh protocol definition in Deploy agent section #5166

Added server address and wazuh protocol definition in Deploy agent section #5166

Machi3mfl commented Jan 25, 2023 •

edited

Loading

Machi3mfl commented Jan 25, 2023 •

edited

Loading

github-actions bot commented Jan 26, 2023

Desvelao left a comment •

edited

Loading

asteriscos left a comment

Machi3mfl commented Jan 26, 2023 •

edited

Loading

asteriscos left a comment

github-actions bot commented Jan 26, 2023

Added server address and wazuh protocol definition in Deploy agent section #5166

Added server address and wazuh protocol definition in Deploy agent section #5166

Conversation

Machi3mfl commented Jan 25, 2023 • edited Loading

Description

Scope

Protocol cases

Server address input cases

Annotation

Test cases evidence

Protocol cases

When the protocol is UDP (Cluster mode)

When the protocol is TCP (Cluster mode)

When the protocol is UDP (Manager mode)

When the protocol is TCP (Manager mode)

Check List

Machi3mfl commented Jan 25, 2023 • edited Loading

github-actions bot commented Jan 26, 2023

Desvelao left a comment • edited Loading

Choose a reason for hiding this comment

Kibana 7.10.2

UI

asteriscos left a comment

Choose a reason for hiding this comment

Machi3mfl commented Jan 26, 2023 • edited Loading

asteriscos left a comment

Choose a reason for hiding this comment

github-actions bot commented Jan 26, 2023

Machi3mfl commented Jan 25, 2023 •

edited

Loading

When the protocol is TCP (`Cluster mode`)

When the protocol is UDP (`Manager mode`)

When the protocol is TCP (`Manager mode`)

Machi3mfl commented Jan 25, 2023 •

edited

Loading

Desvelao left a comment •

edited

Loading

Machi3mfl commented Jan 26, 2023 •

edited

Loading