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

Fixed the manager option in the agent deployment section #4981

Merged
merged 14 commits into from
Dec 21, 2022

Conversation

yenienserrano
Copy link
Member

@yenienserrano yenienserrano commented Dec 12, 2022

Description

Added options if you are in manager mode instead of cluster mode

Issues Resolved

Evidence

Screencast.from.12-12-2022.05.15.44.PM.webm

Environment

  • Have an environment in manager mode

Test

  • Enter wazuh and in the module overview the toast should not appear with error 3013.

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

@yenienserrano yenienserrano requested a review from a team as a code owner December 12, 2022 20:21
@yenienserrano yenienserrano changed the title Adding the manager option in the agent deployment section Fixed the manager option in the agent deployment section Dec 12, 2022
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.

CR: See comments
Test: ❌

Evidence

Peek 2022-12-19 18-46

@yenienserrano
Copy link
Member Author

CR: See comments Test: x

Evidence
Peek 2022-12-19 18-46

I was trying to reproduce this error, but I could not

Copy link
Member

@Machi3mfl Machi3mfl left a comment

Choose a reason for hiding this comment

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

CR: ✔️
Test: ✔️

@github-actions
Copy link
Contributor

Code coverage (Jest) % values
Statements 8.52% ( 3224 / 37849 )
Branches 4.52% ( 1322 / 29259 )
Functions 7.41% ( 697 / 9403 )
Lines 8.6% ( 3111 / 36195 )

@yenienserrano yenienserrano merged commit 65e156b into 4.4-7.16 Dec 21, 2022
@yenienserrano yenienserrano deleted the fix/4938-toast-with-error-3013-in-kibana branch December 21, 2022 15:36
@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-4981-to-4.4-7.10
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 65e156b9113a83bf523c5d985daadf97dce2a862
# Push it to GitHub
git push --set-upstream origin backport-4981-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-4981-to-4.4-7.10.

@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-4981-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 65e156b9113a83bf523c5d985daadf97dce2a862
# Push it to GitHub
git push --set-upstream origin backport-4981-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-4981-to-4.4-2.4-wzd.

yenienserrano added a commit that referenced this pull request Dec 21, 2022
* add manager option

* add changelog

* add changelog

* fix test

* fix typo

* add getCookies and getHttp (test)

* Fixed unit tests

* fix comment

Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com>
Co-authored-by: Maximiliano Ibarra <maximiliano.ibarra@wazuh.com>
(cherry picked from commit 65e156b)
yenienserrano added a commit that referenced this pull request Dec 21, 2022
* add manager option

* add changelog

* add changelog

* fix test

* fix typo

* add getCookies and getHttp (test)

* Fixed unit tests

* fix comment

Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com>
Co-authored-by: Maximiliano Ibarra <maximiliano.ibarra@wazuh.com>
(cherry picked from commit 65e156b)
yenienserrano added a commit that referenced this pull request Dec 21, 2022
…ection (#5026)

* Fixed the manager option in the agent deployment section (#4981)

* add manager option

* add changelog

* add changelog

* fix test

* fix typo

* add getCookies and getHttp (test)

* Fixed unit tests

* fix comment

Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com>
Co-authored-by: Maximiliano Ibarra <maximiliano.ibarra@wazuh.com>
(cherry picked from commit 65e156b)

* Update CHANGELOG.md
yenienserrano added a commit that referenced this pull request Dec 21, 2022
…ction (#5025)

* Fixed the manager option in the agent deployment section (#4981)

* add manager option

* add changelog

* add changelog

* fix test

* fix typo

* add getCookies and getHttp (test)

* Fixed unit tests

* fix comment

Co-authored-by: Álex <alejandro.ruiz.becerra@wazuh.com>
Co-authored-by: Maximiliano Ibarra <maximiliano.ibarra@wazuh.com>
(cherry picked from commit 65e156b)

* Update CHANGELOG.md
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.

Toast with error 3013 in Kibana
4 participants