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

Fix section deploy new agent #5045

Merged
merged 16 commits into from
Dec 29, 2022
Merged

Conversation

chantal-kelm
Copy link
Member

@chantal-kelm chantal-kelm commented Dec 28, 2022

Description

Fixed commands: Aix, OpenSUSE, Alpine, Suse11, Fedora, HP, Oracle Linux 5, Amazon Linux 2, Centos5
Changed the word 'or higher' in buttons to '+'.
Fixed validations for Hp, Solaris, and Alpine.
The enroll message for hp, solaris and Alpine os has been moved. The message now appears below the install and enroll section.

Issues Resolved

#5042

Evidence

Grabacion.de.pantalla.2022-12-28.a.la.s.12.24.07.mov

Steps to test

  • Verify commands for Aix, OpenSUSE, Alpine, Suse11, Fedora, HP, Oracle Linux 5, Amazon Linux 2, Centos5. You can verify them here

  • Verified that the buttons have changed the word 'or higher' to '+'.

  • Alpine, Hp or Solaris do not allow configuring wazuh server, agentName and agentGroup.
    When clicking on an operating system, set an incorrect agentName and then click on Alpine, Hp or Solaris verify that no validation error appears.

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 self-assigned this Dec 28, 2022
@chantal-kelm chantal-kelm changed the title fix section deploy new agent: rpm commands Fix section deploy new agent Dec 28, 2022
@chantal-kelm chantal-kelm marked this pull request as ready for review December 28, 2022 15:28
@chantal-kelm chantal-kelm requested a review from a team as a code owner December 28, 2022 15:28
c-bordon
c-bordon previously approved these changes Dec 29, 2022
Copy link
Member

@c-bordon c-bordon left a comment

Choose a reason for hiding this comment

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

LGTM

@github-actions
Copy link
Contributor

Code coverage (Jest) % values
Statements 8.72% ( 3227 / 36991 )
Branches 4.52% ( 1300 / 28735 )
Functions 7.6% ( 697 / 9167 )
Lines 8.79% ( 3114 / 35417 )

Copy link
Member

@AlexRuiz7 AlexRuiz7 left a comment

Choose a reason for hiding this comment

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

LGTM

Command for RedHat Linux 7+, x86_64

sudo WAZUH_MANAGER='wazuh-master' WAZUH_AGENT_GROUP='default' WAZUH_AGENT_NAME='agent_01' yum install -y https://packages.wazuh.com/4.x/yum/wazuh-agent-4.4.0-1.x86_64.rpm

@chantal-kelm chantal-kelm merged commit 17936a9 into 4.4-7.10 Dec 29, 2022
@chantal-kelm chantal-kelm deleted the 5042-fix-section-deploy-new-agent branch December 29, 2022 18:11
@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-5045-to-4.4-7.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 17936a9f5c62ff93553654413faa3550b11be55b
# Push it to GitHub
git push --set-upstream origin backport-5045-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-5045-to-4.4-7.16.

@github-actions
Copy link
Contributor

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-5045-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 17936a9f5c62ff93553654413faa3550b11be55b
# Push it to GitHub
git push --set-upstream origin backport-5045-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-5045-to-4.4-2.4-wzd.

chantal-kelm added a commit that referenced this pull request Dec 30, 2022
* fix section deploy new agent: rpm commands

* fix section deploy new agent: command variables removed

* fix section deploy new agent: hp package handler

* fix section deploy new agent: aix commands, oracle linux

* fix section deploy new agent: commands aix, opensuse, alpine, suse, fedora, hp and validations

* changed the word or higher in buttons to +

* changelog

* changelog

* changes

* changes

* changes

* changes

* section deploy new agent: message

* changes

* debian buttons

* windows

(cherry picked from commit 17936a9)
AlexRuiz7 pushed a commit that referenced this pull request Dec 30, 2022
* fix section deploy new agent: rpm commands

* fix section deploy new agent: command variables removed

* fix section deploy new agent: hp package handler

* fix section deploy new agent: aix commands, oracle linux

* fix section deploy new agent: commands aix, opensuse, alpine, suse, fedora, hp and validations

* changed the word or higher in buttons to +

* changelog

* changelog

* changes

* changes

* changes

* changes

* section deploy new agent: message

* changes

* debian buttons

* windows

(cherry picked from commit 17936a9)
AlexRuiz7 added a commit that referenced this pull request Dec 30, 2022
Fix section deploy new agent (#5045)

* fix section deploy new agent: rpm commands

* fix section deploy new agent: command variables removed

* fix section deploy new agent: hp package handler

* fix section deploy new agent: aix commands, oracle linux

* fix section deploy new agent: commands aix, opensuse, alpine, suse, fedora, hp and validations

* changed the word or higher in buttons to +

* changelog

* changelog

* changes

* changes

* changes

* changes

* section deploy new agent: message

* changes

* debian buttons

* windows

(cherry picked from commit 17936a9)

Co-authored-by: Chantal Belén kelm <99441266+chantal-kelm@users.noreply.github.com>
chantal-kelm added a commit that referenced this pull request Jan 2, 2023
Fix section deploy new agent (#5045)

* fix section deploy new agent: rpm commands

* fix section deploy new agent: command variables removed

* fix section deploy new agent: hp package handler

* fix section deploy new agent: aix commands, oracle linux

* fix section deploy new agent: commands aix, opensuse, alpine, suse, fedora, hp and validations

* changed the word or higher in buttons to +

* changelog

* changelog

* changes

* changes

* changes

* changes

* section deploy new agent: message

* changes

* debian buttons

* windows

(cherry picked from commit 17936a9)
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.

The suggested agent installation command is incorrect
3 participants