Allow multiple server selection in the agent deploy section #4737

Machi3mfl · 2022-10-20T18:31:14Z

Description

Suggest node ip in server address input from Deploy new agent section

Issues Resolved

Closes #4109

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

Mayons95 · 2022-10-25T19:42:17Z

Hey, @Machi3mfl it could be nice if you could add some test steps.
Thanks you!

public/controllers/agent/register-agent/steps/server-address.tsx

Desvelao · 2022-10-26T08:52:40Z

question: https://github.com/wazuh/wazuh-kibana-app/pull/4760/files#r1005401745

nitpick: If I am not wrong, this request gets the data of the master node. Related to this pull request #4737 that adds the selection of the manager to connect, the protocol should use the configurated by the selected manager.

For another hand, what should be the value of the protocol variable for the next situation (taking into account the mentioned pull request):

manager1: tcp, udp

manager2: udp

yenienserrano

LGTM with comments

public/controllers/agent/register-agent/utils.ts

Machi3mfl · 2022-10-26T11:23:20Z

Hey, @Machi3mfl it could be nice if you could add some test steps. Thanks you!

I left the testing steps in the linked issue

…re/4109-suggest-cluster-ip-deploy-agent

public/controllers/agent/register-agent/steps/__snapshots__/server-address.test.tsx.snap

CHANGELOG.md

Mayons95

LGTM
TR: ✔️

Screencast.from.27-10-22.11.30.51.webm

gdiazlo

lgtm

…re/4109-suggest-cluster-ip-deploy-agent

…4737)" This reverts commit b60fd49.

Machi3mfl · 2022-10-28T18:19:08Z

question: https://github.com/wazuh/wazuh-kibana-app/pull/4760/files#r1005401745

nitpick: If I am not wrong, this request gets the data of the master node. Related to this pull request #4737 that adds the selection of the manager to connect, the protocol should use the configurated by the selected manager.
For another hand, what should be the value of the protocol variable for the next situation (taking into account the mentioned pull request):

manager1: tcp, udp

manager2: udp

Added comment in the linked issue to tread this topic: #4318 (comment)

…4775) Revert "Allow multiple server selection in the agent deploy section (#4737)" This reverts commit b60fd49.

* section deploy new agent in progress * tabSystemD and tabSysV * section deploy a new agent done * cleaning code * cleaning code * test * CHANGELOG * code cleaning * design for when a user selects an obsolete system version * code cleanup * changed macOS for macOS and updated the macOS version view * development with information update provided by ci cd * applying some of the new changes that the ci cd team sent us today * delete * updating information sent by ci/cd on operating systems, commands, etc. * logic of displaying message to rare operating systems and redirecting them to documentation * logic of displaying message to rare operating systems and redirecting them to documentation * wazuh protocol variable * Ordered OS buttons in deploy new agent steps * removing spaces, css den deshuso, unify uppercase * removing link space * fixed labels * change of logic in links * Removed snapshot to fix unit tests workflow * Add agent name to the deployment command (#4739) * Add variable for the agent's name * input is cleaned if there is no data * design input name * Update CHANGELOG * Resolved review comment, unused code and code format Co-authored-by: Maximiliano Ibarra <maximilianoaibarra@gmail.com> * Allow multiple server selection in the agent deploy section (#4737) * Replaced input server address * Testing signed commits * Added server address component isolated from register-agent component * Added test for multiple nodes rendered in combobox * Added wazuh manager multiple ips in command definition * Refactored and cleaned code * Added unit test * Updated CHANGELOG * Added default option and paste only name in combo tag * Added free option enter and cleaned code * Refactored code and added new tests and fixed old tests * Resolved review comments following dev style guide * Added OS delimiter condition * Added and updated unit tests * Resolved review comments * Removed empty file Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com> * links included * remove messages, add and remove links * update * Revert "Allow multiple server selection in the agent deploy section" (#4775) Revert "Allow multiple server selection in the agent deploy section (#4737)" This reverts commit b60fd49. * changes Co-authored-by: Maximiliano Ibarra <maximilianoaibarra@gmail.com> Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: Maximiliano Ibarra <maximiliano.ibarra@wazuh.com>

* section deploy new agent in progress * tabSystemD and tabSysV * section deploy a new agent done * cleaning code * cleaning code * test * CHANGELOG * code cleaning * design for when a user selects an obsolete system version * code cleanup * changed macOS for macOS and updated the macOS version view * development with information update provided by ci cd * applying some of the new changes that the ci cd team sent us today * delete * updating information sent by ci/cd on operating systems, commands, etc. * logic of displaying message to rare operating systems and redirecting them to documentation * logic of displaying message to rare operating systems and redirecting them to documentation * wazuh protocol variable * Ordered OS buttons in deploy new agent steps * removing spaces, css den deshuso, unify uppercase * removing link space * fixed labels * change of logic in links * Removed snapshot to fix unit tests workflow * Add agent name to the deployment command (#4739) * Add variable for the agent's name * input is cleaned if there is no data * design input name * Update CHANGELOG * Resolved review comment, unused code and code format Co-authored-by: Maximiliano Ibarra <maximilianoaibarra@gmail.com> * Allow multiple server selection in the agent deploy section (#4737) * Replaced input server address * Testing signed commits * Added server address component isolated from register-agent component * Added test for multiple nodes rendered in combobox * Added wazuh manager multiple ips in command definition * Refactored and cleaned code * Added unit test * Updated CHANGELOG * Added default option and paste only name in combo tag * Added free option enter and cleaned code * Refactored code and added new tests and fixed old tests * Resolved review comments following dev style guide * Added OS delimiter condition * Added and updated unit tests * Resolved review comments * Removed empty file Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com> * links included * remove messages, add and remove links * update * Revert "Allow multiple server selection in the agent deploy section" (#4775) Revert "Allow multiple server selection in the agent deploy section (#4737)" This reverts commit b60fd49. * changes Co-authored-by: Maximiliano Ibarra <maximilianoaibarra@gmail.com> Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: Maximiliano Ibarra <maximiliano.ibarra@wazuh.com> (cherry picked from commit 77945e2)

Redesign of add agent page (#4647) * section deploy new agent in progress * tabSystemD and tabSysV * section deploy a new agent done * cleaning code * cleaning code * test * CHANGELOG * code cleaning * design for when a user selects an obsolete system version * code cleanup * changed macOS for macOS and updated the macOS version view * development with information update provided by ci cd * applying some of the new changes that the ci cd team sent us today * delete * updating information sent by ci/cd on operating systems, commands, etc. * logic of displaying message to rare operating systems and redirecting them to documentation * logic of displaying message to rare operating systems and redirecting them to documentation * wazuh protocol variable * Ordered OS buttons in deploy new agent steps * removing spaces, css den deshuso, unify uppercase * removing link space * fixed labels * change of logic in links * Removed snapshot to fix unit tests workflow * Add agent name to the deployment command (#4739) * Add variable for the agent's name * input is cleaned if there is no data * design input name * Update CHANGELOG * Resolved review comment, unused code and code format Co-authored-by: Maximiliano Ibarra <maximilianoaibarra@gmail.com> * Allow multiple server selection in the agent deploy section (#4737) * Replaced input server address * Testing signed commits * Added server address component isolated from register-agent component * Added test for multiple nodes rendered in combobox * Added wazuh manager multiple ips in command definition * Refactored and cleaned code * Added unit test * Updated CHANGELOG * Added default option and paste only name in combo tag * Added free option enter and cleaned code * Refactored code and added new tests and fixed old tests * Resolved review comments following dev style guide * Added OS delimiter condition * Added and updated unit tests * Resolved review comments * Removed empty file Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com> * links included * remove messages, add and remove links * update * Revert "Allow multiple server selection in the agent deploy section" (#4775) Revert "Allow multiple server selection in the agent deploy section (#4737)" This reverts commit b60fd49. * changes Co-authored-by: Maximiliano Ibarra <maximilianoaibarra@gmail.com> Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com> Co-authored-by: Maximiliano Ibarra <maximiliano.ibarra@wazuh.com> (cherry picked from commit 77945e2) Co-authored-by: Chantal Belén kelm <99441266+chantal-kelm@users.noreply.github.com>

Replaced input server address

3b87ad4

gdiazlo linked an issue Oct 20, 2022 that may be closed by this pull request

Only master IP is suggested during agent deployment in a Wazuh cluster #4109

Closed

Machi3mfl added 4 commits October 21, 2022 09:30

Testing signed commits

07b6797

Added server address component isolated from register-agent component

50af516

Added test for multiple nodes rendered in combobox

d9ada7d

Added wazuh manager multiple ips in command definition

96ae187

Machi3mfl self-assigned this Oct 21, 2022

Machi3mfl added 2 commits October 24, 2022 11:48

Refactored and cleaned code

a53d6e4

Added unit test

3a8d476

Machi3mfl marked this pull request as ready for review October 24, 2022 14:50

Machi3mfl requested a review from a team as a code owner October 24, 2022 14:50

Machi3mfl changed the title ~~Replaced input server address~~ Replaced server address input in deploy agent section Oct 24, 2022

Machi3mfl changed the title ~~Replaced server address input in deploy agent section~~ Changed server address input in deploy agent section Oct 24, 2022

Machi3mfl added 4 commits October 24, 2022 11:52

Updated CHANGELOG

04c410e

Added default option and paste only name in combo tag

1487fd7

Added free option enter and cleaned code

ed4cc34

Refactored code and added new tests and fixed old tests

20045cd

yenienserrano reviewed Oct 26, 2022

View reviewed changes

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

yenienserrano reviewed Oct 26, 2022

View reviewed changes

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

yenienserrano reviewed Oct 26, 2022

View reviewed changes

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

Desvelao mentioned this pull request Oct 26, 2022

Fix deployment wizard to add the WAZUH_PROTOCOL variable only for UDP connections #4760

Closed

yenienserrano approved these changes Oct 26, 2022

View reviewed changes

Desvelao reviewed Oct 26, 2022

View reviewed changes

public/controllers/agent/register-agent/utils.ts Outdated Show resolved Hide resolved

Machi3mfl added 4 commits October 26, 2022 08:48

Resolved review comments following dev style guide

a607b88

Merge branch 'enhancement-4205-redesign-of-add-agent-page' into featu…

3abc300

…re/4109-suggest-cluster-ip-deploy-agent

Added OS delimiter condition

0534fb7

Added and updated unit tests

bdc4aa2

gdiazlo reviewed Oct 26, 2022

View reviewed changes

public/controllers/agent/register-agent/steps/__snapshots__/server-address.test.tsx.snap Outdated Show resolved Hide resolved

gdiazlo reviewed Oct 26, 2022

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

Machi3mfl changed the title ~~Changed server address input in deploy agent section~~ Allow multiple server selection in the agent deploy section Oct 27, 2022

Resolved review comments

0405b70

Machi3mfl requested a review from Desvelao October 27, 2022 11:39

Removed empty file

e3db405

Mayons95 self-requested a review October 27, 2022 14:35

Mayons95 approved these changes Oct 27, 2022

View reviewed changes

Machi3mfl requested a review from gdiazlo October 27, 2022 16:26

gdiazlo approved these changes Oct 28, 2022

View reviewed changes

Merge branch 'enhancement-4205-redesign-of-add-agent-page' into featu…

2210433

…re/4109-suggest-cluster-ip-deploy-agent

AlexRuiz7 merged commit b60fd49 into enhancement-4205-redesign-of-add-agent-page Oct 28, 2022

AlexRuiz7 deleted the feature/4109-suggest-cluster-ip-deploy-agent branch October 28, 2022 09:20

AlexRuiz7 mentioned this pull request Oct 28, 2022

Redesign of add agent page #4647

Merged

Machi3mfl restored the feature/4109-suggest-cluster-ip-deploy-agent branch October 28, 2022 14:36

Machi3mfl added a commit that referenced this pull request Oct 28, 2022

Revert "Allow multiple server selection in the agent deploy section (#…

1efd61a

…4737)" This reverts commit b60fd49.

This was referenced Oct 28, 2022

Revert "Allow multiple server selection in the agent deploy section" #4775

Merged

Deployment variables wrongly use protocol for syslog if it is declared first #4318

Closed

Machi3mfl added a commit that referenced this pull request Nov 2, 2022

Revert "Allow multiple server selection in the agent deploy section" (#…

6701c3b

…4775) Revert "Allow multiple server selection in the agent deploy section (#4737)" This reverts commit b60fd49.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow multiple server selection in the agent deploy section #4737

Allow multiple server selection in the agent deploy section #4737

Machi3mfl commented Oct 20, 2022 •

edited

Loading

Mayons95 commented Oct 25, 2022 •

edited

Loading

Desvelao commented Oct 26, 2022

yenienserrano left a comment

Machi3mfl commented Oct 26, 2022 •

edited

Loading

Mayons95 left a comment

gdiazlo left a comment

Machi3mfl commented Oct 28, 2022

Allow multiple server selection in the agent deploy section #4737

Allow multiple server selection in the agent deploy section #4737

Conversation

Machi3mfl commented Oct 20, 2022 • edited Loading

Description

Issues Resolved

Check List

Mayons95 commented Oct 25, 2022 • edited Loading

Desvelao commented Oct 26, 2022

yenienserrano left a comment

Choose a reason for hiding this comment

Machi3mfl commented Oct 26, 2022 • edited Loading

Mayons95 left a comment

Choose a reason for hiding this comment

gdiazlo left a comment

Choose a reason for hiding this comment

Machi3mfl commented Oct 28, 2022

Machi3mfl commented Oct 20, 2022 •

edited

Loading

Mayons95 commented Oct 25, 2022 •

edited

Loading

Machi3mfl commented Oct 26, 2022 •

edited

Loading