Add cluster's IP and protocol as suggestions in the agent deployment wizard #4776

Machi3mfl · 2022-10-28T15:17:49Z

Description

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

Issues Resolved

Closes #4109 and #4318

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

… them to documentation

…/github.com/wazuh/wazuh-kibana-app into enhancement-4205-redesign-of-add-agent-page

… them to documentation

AlexRuiz7

LGTM!

Check the suggestions

CHANGELOG.md

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

asteriscos

Test: ✔️

CR: ✔️

…into feature/4109-suggest-cluster-ip-deploy-agent

github-actions · 2022-11-10T15:42:12Z

Code coverage (Jest)	%	values
Statements	8.69%	( 3211 / 36931 )
Branches	4.43%	( 1271 / 28674 )
Functions	7.6%	( 696 / 9163 )
Lines	8.76%	( 3098 / 35351 )

Mayons95

LGTM

github-actions · 2022-11-10T17:26:24Z

The backport to 4.4-7.16 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-7.16 4.4-7.16
# Navigate to the new working tree
cd .worktrees/backport-4.4-7.16
# Create a new branch
git switch --create backport-4776-to-4.4-7.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d1787527a1879b399a39b907a74e9f6d28f8db97
# Push it to GitHub
git push --set-upstream origin backport-4776-to-4.4-7.16
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.4-7.16

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

github-actions · 2022-11-10T17:26:25Z

The backport to 4.4-2.3-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.3-wzd 4.4-2.3-wzd
# Navigate to the new working tree
cd .worktrees/backport-4.4-2.3-wzd
# Create a new branch
git switch --create backport-4776-to-4.4-2.3-wzd
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d1787527a1879b399a39b907a74e9f6d28f8db97
# Push it to GitHub
git push --set-upstream origin backport-4776-to-4.4-2.3-wzd
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.4-2.3-wzd

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

…wizard (#4776) * 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 * 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 * variable of deployment wazuh protocol * merge 4.4-7.10 * Added free option enter and cleaned code * removing spaces, css den deshuso, unify uppercase * Refactored code and added new tests and fixed old tests * removing link space * fixed labels * Resolved review comments following dev style guide * change of logic in links * Added OS delimiter condition * Added and updated unit tests * Resolved review comments * Removed empty file * Removed snapshot to fix unit tests workflow * message + error handling * Detached getRemoteInfo request in service to ease unit testing * 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> * Fixing tests * Testing signed commit with updated email * Fixing unverified commit * Fixing eslint errors * Added get remote info by node and unit tests * Added server address and protocol behavior * Updated Server address unit tests * Updated and added register agent service unit tests * Added error managment in register agent and server address component * Updated CHANGELOG * Fixed tests workflow * CHANGELOG * udpProtocol:false * constants for repeated text Co-authored-by: chantal.kelm <chantal.belen.kelm@gmail.com> Co-authored-by: Chantal Belén kelm <99441266+chantal-kelm@users.noreply.github.com> Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com> (cherry picked from commit d178752)

…n the agent deployment wizard (#4861) Add cluster's IP and protocol as suggestions in the agent deployment wizard (#4776) * 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 * 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 * variable of deployment wazuh protocol * merge 4.4-7.10 * Added free option enter and cleaned code * removing spaces, css den deshuso, unify uppercase * Refactored code and added new tests and fixed old tests * removing link space * fixed labels * Resolved review comments following dev style guide * change of logic in links * Added OS delimiter condition * Added and updated unit tests * Resolved review comments * Removed empty file * Removed snapshot to fix unit tests workflow * message + error handling * Detached getRemoteInfo request in service to ease unit testing * 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> * Fixing tests * Testing signed commit with updated email * Fixing unverified commit * Fixing eslint errors * Added get remote info by node and unit tests * Added server address and protocol behavior * Updated Server address unit tests * Updated and added register agent service unit tests * Added error managment in register agent and server address component * Updated CHANGELOG * Fixed tests workflow * CHANGELOG * udpProtocol:false * constants for repeated text Co-authored-by: chantal.kelm <chantal.belen.kelm@gmail.com> Co-authored-by: Chantal Belén kelm <99441266+chantal-kelm@users.noreply.github.com> Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com> (cherry picked from commit d178752)

…he agent deployment wizard (#4862) * Add cluster's IP and protocol as suggestions in the agent deployment wizard (#4776) * 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 * 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 * variable of deployment wazuh protocol * merge 4.4-7.10 * Added free option enter and cleaned code * removing spaces, css den deshuso, unify uppercase * Refactored code and added new tests and fixed old tests * removing link space * fixed labels * Resolved review comments following dev style guide * change of logic in links * Added OS delimiter condition * Added and updated unit tests * Resolved review comments * Removed empty file * Removed snapshot to fix unit tests workflow * message + error handling * Detached getRemoteInfo request in service to ease unit testing * 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> * Fixing tests * Testing signed commit with updated email * Fixing unverified commit * Fixing eslint errors * Added get remote info by node and unit tests * Added server address and protocol behavior * Updated Server address unit tests * Updated and added register agent service unit tests * Added error managment in register agent and server address component * Updated CHANGELOG * Fixed tests workflow * CHANGELOG * udpProtocol:false * constants for repeated text Co-authored-by: chantal.kelm <chantal.belen.kelm@gmail.com> Co-authored-by: Chantal Belén kelm <99441266+chantal-kelm@users.noreply.github.com> Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com> (cherry picked from commit d178752) * Fixed unit tests snapshots

chantal-kelm and others added 30 commits September 6, 2022 14:27

section deploy new agent in progress

167d30e

tabSystemD and tabSysV

c67f0e8

section deploy a new agent done

d5679e7

cleaning code

182b00f

cleaning code

8df80a5

test

1714e73

CHANGELOG

ce5e5b6

code cleaning

4f135f4

git pull and changelog

dfeb90a

merge changelog

55eb517

design for when a user selects an obsolete system version

e791330

code cleanup

4433acd

changed macOS for macOS and updated the macOS version view

dbf70fc

development with information update provided by ci cd

c6ade31

applying some of the new changes that the ci cd team sent us today

f5220df

delete

8f7c38c

updating information sent by ci/cd on operating systems, commands, etc.

462a4f4

Merge branch '4.4-7.10' into enhancement-4205-redesign-of-add-agent-page

383a49e

logic of displaying message to rare operating systems and redirecting…

b69415a

… them to documentation

Merge branch 'enhancement-4205-redesign-of-add-agent-page' of https:/…

a5ee293

…/github.com/wazuh/wazuh-kibana-app into enhancement-4205-redesign-of-add-agent-page

logic of displaying message to rare operating systems and redirecting…

f07d842

… them to documentation

wazuh protocol variable

d16535d

Ordered OS buttons in deploy new agent steps

c464416

Replaced input server address

3b87ad4

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

Refactored and cleaned code

a53d6e4

Added unit test

3a8d476

Machi3mfl requested a review from a team November 8, 2022 14:51

AlexRuiz7 linked an issue Nov 9, 2022 that may be closed by this pull request

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

Closed

AlexRuiz7 mentioned this pull request Nov 9, 2022

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

Closed

AlexRuiz7 changed the title ~~Added cluster ip and protocol suggestions in deploy agent command~~ Add cluster's IP and protocol as suggestions in the agent deployment wizard Nov 9, 2022

AlexRuiz7 previously approved these changes Nov 9, 2022

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

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

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

asteriscos previously approved these changes Nov 9, 2022

View reviewed changes

chantal-kelm added 2 commits November 10, 2022 12:24

Merge branch '4.4-7.10' of https://github.com/wazuh/wazuh-kibana-app …

dc8eabe

…into feature/4109-suggest-cluster-ip-deploy-agent

CHANGELOG

5e1e6c0

chantal-kelm dismissed stale reviews from asteriscos, AlexRuiz7, and Mayons95 via 5e1e6c0 November 10, 2022 15:27

chantal-kelm added 2 commits November 10, 2022 12:30

udpProtocol:false

7eb799a

constants for repeated text

2a582f7

AlexRuiz7 approved these changes Nov 10, 2022

View reviewed changes

asteriscos approved these changes Nov 10, 2022

View reviewed changes

Mayons95 self-requested a review November 10, 2022 16:48

Mayons95 approved these changes Nov 10, 2022

View reviewed changes

chantal-kelm merged commit d178752 into 4.4-7.10 Nov 10, 2022

chantal-kelm deleted the feature/4109-suggest-cluster-ip-deploy-agent branch November 10, 2022 17:26

Machi3mfl mentioned this pull request Nov 14, 2022

[Backport 4.4-2.3-wzd] Add cluster's IP and protocol as suggestions in the agent deployment wizard #4861

Merged

Machi3mfl mentioned this pull request Nov 14, 2022

[Backport 4.4-7.16] Add cluster's IP and protocol as suggestions in the agent deployment wizard [Backport 4.4-7.16] #4862

Merged

Desvelao mentioned this pull request Dec 20, 2022

Fix vulnerabilities in dependencies #5014

Merged

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add cluster's IP and protocol as suggestions in the agent deployment wizard #4776

Add cluster's IP and protocol as suggestions in the agent deployment wizard #4776

Machi3mfl commented Oct 28, 2022 •

edited

Loading

AlexRuiz7 left a comment

asteriscos left a comment

github-actions bot commented Nov 10, 2022

Mayons95 left a comment

github-actions bot commented Nov 10, 2022

github-actions bot commented Nov 10, 2022

Add cluster's IP and protocol as suggestions in the agent deployment wizard #4776

Add cluster's IP and protocol as suggestions in the agent deployment wizard #4776

Conversation

Machi3mfl commented Oct 28, 2022 • edited Loading

Description

Issues Resolved

Check List

AlexRuiz7 left a comment

Choose a reason for hiding this comment

asteriscos left a comment

Choose a reason for hiding this comment

github-actions bot commented Nov 10, 2022

Mayons95 left a comment

Choose a reason for hiding this comment

github-actions bot commented Nov 10, 2022

github-actions bot commented Nov 10, 2022

Machi3mfl commented Oct 28, 2022 •

edited

Loading