Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed step 3 in the "Deploy a new agent" section. #5416

Merged
merged 13 commits into from
May 29, 2023

Conversation

chantal-kelm
Copy link
Member

@chantal-kelm chantal-kelm commented May 3, 2023

Description

Changed the title of step 3 of the deploy a new agent section:

"Optionally, assign a name and a group to the agent"

By:

"Optional settings"

Added a title to the agent name input of the deploy a new agent section:

"Assign an agent name"

Changed the description of step 3 of the deploy a new agent section:

"The agent name is set as the name of the host where it is deployed. You can set your own name in the field below. Note that the agent name cannot be changed once registered."

By:

"The deployment sets the endpoint hostname as the agent name by default. Optionally, you can set the agent name below."

Changed the placeholder of the agent name input of the deploy a new agent section:

"Name agent"

To:

"Agent name"

Added callout below the agent name entry of the deploy a new agent section:

Captura de pantalla 2023-05-10 a la(s) 10 07 07

Issues Resolved

#5415

Evidence

Captura de pantalla 2023-05-10 a la(s) 12 22 02

Test

Verify that these changes appear:

Changed the title of step 3 of the deploy a new agent section:

"Optionally, assign a name and a group to the agent"

By:

"Optional settings"

Added a title to the agent name input of the deploy a new agent section:

"Assign an agent name"

Changed the description of step 3 of the deploy a new agent section:

"The agent name is set as the name of the host where it is deployed. You can set your own name in the field below. Note that the agent name cannot be changed once registered."

By:

"The deployment sets the endpoint hostname as the agent name by default. Optionally, you can set the agent name below."

Changed the placeholder of the agent name input of the deploy a new agent section:

"Name agent"

To:

"Agent name"

Added callout below the agent name entry of the deploy a new agent section:

Captura de pantalla 2023-05-10 a la(s) 10 07 07

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

@chantal-kelm chantal-kelm requested a review from a team as a code owner May 3, 2023 18:41
@chantal-kelm chantal-kelm linked an issue May 3, 2023 that may be closed by this pull request
@chantal-kelm chantal-kelm self-assigned this May 3, 2023
@chantal-kelm chantal-kelm changed the title Changes in title and description of step assignment of name and group… Agent-deploy-page-optional-steps May 3, 2023
yenienserrano
yenienserrano previously approved these changes May 4, 2023
Copy link
Member

@yenienserrano yenienserrano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test: ✅
CR: ✅

image

Machi3mfl
Machi3mfl previously approved these changes May 4, 2023
@chantal-kelm chantal-kelm dismissed stale reviews from Machi3mfl and yenienserrano via 777e342 May 4, 2023 17:29
Machi3mfl
Machi3mfl previously approved these changes May 4, 2023
@chantal-kelm chantal-kelm changed the title Agent-deploy-page-optional-steps Agent deploy page optional steps May 5, 2023
@chantal-kelm chantal-kelm changed the title Agent deploy page optional steps Changed the title and added a description to step 3 of the deploy a new agent section. May 5, 2023
Machi3mfl
Machi3mfl previously approved these changes May 5, 2023
yenienserrano
yenienserrano previously approved these changes May 5, 2023
@AlexRuiz7 AlexRuiz7 changed the title Changed the title and added a description to step 3 of the deploy a new agent section. Changed the title and added a description to step 3 of the deploy a new agent section May 5, 2023
@AlexRuiz7 AlexRuiz7 dismissed stale reviews from yenienserrano and Machi3mfl via 196bbfd May 5, 2023 16:08
@chantal-kelm chantal-kelm changed the title Changed the title and added a description to step 3 of the deploy a new agent section Changed step 3 in the "Deploy a new agent" section. May 10, 2023
Machi3mfl
Machi3mfl previously approved these changes May 11, 2023
yenienserrano
yenienserrano previously approved these changes May 11, 2023
@chantal-kelm chantal-kelm dismissed stale reviews from yenienserrano and Machi3mfl via 285ed79 May 29, 2023 15:41
@github-actions
Copy link
Contributor

Code coverage (Jest) % values
Statements 8.78% ( 3244 / 36928 )
Branches 4.48% ( 1285 / 28635 )
Functions 7.63% ( 698 / 9147 )
Lines 8.84% ( 3129 / 35362 )

Copy link
Member

@asteriscos asteriscos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM ✔️

@asteriscos asteriscos merged commit b573bdc into 4.4 May 29, 2023
3 checks passed
@asteriscos asteriscos deleted the 5415-Agent-deploy-page-optional-steps branch May 29, 2023 17:16
@github-actions
Copy link
Contributor

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-5416-to-4.4-7.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b573bdc747ab323222e11561b1f4e29e2ad73753
# Push it to GitHub
git push --set-upstream origin backport-5416-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-5416-to-4.4-7.16.

@github-actions
Copy link
Contributor

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

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

chantal-kelm added a commit that referenced this pull request May 30, 2023
* Changes in title and description of step assignment of name and group to agent in the deploy new agent section

* Update changelog

* Update changelog

* Update changelog

* Update changelog

* Update changelog

* Update CHANGELOG.md

* sentences were changed and added in step 3 of the deploy new agent section

* changelog

* changelog

* Changed the description of step 3 of the deploy a new agent section.

---------

Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>
(cherry picked from commit b573bdc)
chantal-kelm added a commit that referenced this pull request May 30, 2023
* Changes in title and description of step assignment of name and group to agent in the deploy new agent section

* Update changelog

* Update changelog

* Update changelog

* Update changelog

* Update changelog

* Update CHANGELOG.md

* sentences were changed and added in step 3 of the deploy new agent section

* changelog

* changelog

* Changed the description of step 3 of the deploy a new agent section.

---------

Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>
(cherry picked from commit b573bdc)
chantal-kelm added a commit that referenced this pull request May 30, 2023
* Changes in title and description of step assignment of name and group to agent in the deploy new agent section

* Update changelog

* Update changelog

* Update changelog

* Update changelog

* Update changelog

* Update CHANGELOG.md

* sentences were changed and added in step 3 of the deploy new agent section

* changelog

* changelog

* Changed the description of step 3 of the deploy a new agent section.

---------

Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>
(cherry picked from commit b573bdc)
}

systemSelectorWazuhControlMacos() {
if (this.state.selectedVersion == 'sierra') {
return 'sudo /Library/Ossec/bin/wazuh-control start';
} else return '';
return '/Library/Ossec/bin/wazuh-control start';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick: This command needs to be run with sudo. We should create another pull request or add the commit to fix this in the development branch 4.4 because this pull request was merged with the problem.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch

asteriscos pushed a commit that referenced this pull request May 30, 2023
…n. (#5513)

* Changed step 3 in the "Deploy a new agent" section. (#5416)

* Changes in title and description of step assignment of name and group to agent in the deploy new agent section

* Update changelog

* Update changelog

* Update changelog

* Update changelog

* Update changelog

* Update CHANGELOG.md

* sentences were changed and added in step 3 of the deploy new agent section

* changelog

* changelog

* Changed the description of step 3 of the deploy a new agent section.

---------

Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>
(cherry picked from commit b573bdc)

* Update with sudo register-agent.js
asteriscos pushed a commit that referenced this pull request May 30, 2023
…n. (#5512)

* Changed step 3 in the "Deploy a new agent" section. (#5416)

* Changes in title and description of step assignment of name and group to agent in the deploy new agent section

* Update changelog

* Update changelog

* Update changelog

* Update changelog

* Update changelog

* Update CHANGELOG.md

* sentences were changed and added in step 3 of the deploy new agent section

* changelog

* changelog

* Changed the description of step 3 of the deploy a new agent section.

---------

Co-authored-by: Álex Ruiz <alejandro.ruiz.becerra@wazuh.com>
(cherry picked from commit b573bdc)

* Update with sudo register-agent.js
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Agent deploy page - optional steps
6 participants