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 macos apple install command #5470

Merged
merged 7 commits into from May 22, 2023
Merged

Conversation

Machi3mfl
Copy link
Member

@Machi3mfl Machi3mfl commented May 19, 2023

Description

This PR resolves issue #5466

@Machi3mfl Machi3mfl marked this pull request as ready for review May 22, 2023 12:17
@Machi3mfl Machi3mfl requested a review from a team as a code owner May 22, 2023 12:17
@Desvelao
Copy link
Member

Desvelao commented May 22, 2023

Wazuh dashboard

Legend:
⚫: none
🟢: pass
🟡: warning
🔴: fail
⚪: not applicable

UI

Test Chrome Firefox Safari
The command in the deployment guide to starting a new macOS agent must use sudo 🟢 🟢

Details

🟢 The command in the deployment guide to starting a new macOS agent must use `sudo`

Chrome - 🟢
image

Firefox - 🟢
image

Safari - ⚫

CHANGELOG.md Outdated Show resolved Hide resolved
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 ✔️

@github-actions
Copy link
Contributor

Code coverage (Jest) % values
Statements 8.77% ( 3241 / 36926 )
Branches 4.49% ( 1287 / 28640 )
Functions 7.63% ( 698 / 9146 )
Lines 8.84% ( 3126 / 35361 )

Copy link
Member

@Desvelao Desvelao left a comment

Choose a reason for hiding this comment

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

review

code 🟢
test 🟢 #5470 (comment)

@asteriscos asteriscos merged commit b38ed89 into 4.4 May 22, 2023
5 checks passed
@asteriscos asteriscos deleted the fix/5202-register-agent-macos-command branch May 22, 2023 17:41
@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-5470-to-4.4-7.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b38ed8983ed3cdec7e4a873c56e4274b169f09de
# Push it to GitHub
git push --set-upstream origin backport-5470-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-5470-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-5470-to-4.4-7.10
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b38ed8983ed3cdec7e4a873c56e4274b169f09de
# Push it to GitHub
git push --set-upstream origin backport-5470-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-5470-to-4.4-7.10.

Machi3mfl added a commit that referenced this pull request May 22, 2023
* Add sudo to apple macos install command

* Add sudo in install command instead curl

* Update CHANGELOG

* Move CHANGELOG entry

* Add 4.4.3 section in CHANGELOG

* Updated CHANGELOG

* Updated CHANGELOG

(cherry picked from commit b38ed89)
Machi3mfl added a commit that referenced this pull request May 22, 2023
* Add sudo to apple macos install command

* Add sudo in install command instead curl

* Update CHANGELOG

* Move CHANGELOG entry

* Add 4.4.3 section in CHANGELOG

* Updated CHANGELOG

* Updated CHANGELOG

(cherry picked from commit b38ed89)
asteriscos pushed a commit that referenced this pull request May 23, 2023
* Fix macos apple install command (#5470)

* Add sudo to apple macos install command

* Add sudo in install command instead curl

* Update CHANGELOG

* Move CHANGELOG entry

* Add 4.4.3 section in CHANGELOG

* Updated CHANGELOG

* Updated CHANGELOG

(cherry picked from commit b38ed89)

* fix: changelog entry and release titles

---------

Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
asteriscos pushed a commit that referenced this pull request May 23, 2023
* Fix macos apple install command (#5470)

* Add sudo to apple macos install command

* Add sudo in install command instead curl

* Update CHANGELOG

* Move CHANGELOG entry

* Add 4.4.3 section in CHANGELOG

* Updated CHANGELOG

* Updated CHANGELOG

(cherry picked from commit b38ed89)

* fix: changelog entry and release titles

---------

Co-authored-by: Antonio David Gutiérrez <antonio.gutierrez@wazuh.com>
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 command for macOS
3 participants