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 WAZUH_PROTOCOL param suggestion #4849

Merged
merged 2 commits into from
Nov 11, 2022

Conversation

Machi3mfl
Copy link
Member

@Machi3mfl Machi3mfl commented Nov 11, 2022

Description

Fixed wrong WAZUH_PROTOCOL suggestion when the user has `enrollment.DNS configuration and set a custom IP typing in the server Address Combobox

Updated unit tests

image

image

Closes #4318

@Machi3mfl Machi3mfl requested a review from a team as a code owner November 11, 2022 15:45
@Machi3mfl
Copy link
Member Author

Test Cases

1. When the user types a custom IP in Server Address Combobox, the WAZUH_PROTOCOL must not appear. Because the protocol is TCP

Peek.2022-11-11.12-48.mp4
  1. When the user has set the enrollment.DNS configuration, the WAZUH_PROTOCOL must not appear. Because the protocol is TCP. And the Combobox must be disabled.
Peek.2022-11-11.12-51.mp4

@Machi3mfl Machi3mfl changed the title Fixed protocol param suggestion Fixed WAZUH_PROTOCOL param suggestion Nov 11, 2022
@github-actions
Copy link
Contributor

Code coverage (Jest) % values
Statements 8.69% ( 3208 / 36931 )
Branches 4.43% ( 1269 / 28674 )
Functions 7.6% ( 696 / 9163 )
Lines 8.76% ( 3095 / 35351 )

Copy link
Member

@chantal-kelm chantal-kelm left a comment

Choose a reason for hiding this comment

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

Evidence

Screencast.2022-11-11.13.09.56.mp4

@Machi3mfl Machi3mfl merged commit ee0b618 into 4.4-7.10 Nov 11, 2022
@Machi3mfl Machi3mfl deleted the fix/4318-fixed-protocol-param-deploy-agent branch November 11, 2022 16:25
@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-4849-to-4.4-7.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ee0b61817cc1aff1e9e35d1481787179b9fec9a3
# Push it to GitHub
git push --set-upstream origin backport-4849-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-4849-to-4.4-7.16.

@github-actions
Copy link
Contributor

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-4849-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 ee0b61817cc1aff1e9e35d1481787179b9fec9a3
# Push it to GitHub
git push --set-upstream origin backport-4849-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-4849-to-4.4-2.3-wzd.

Machi3mfl added a commit that referenced this pull request Nov 11, 2022
* Fixed protocol param suggestion

* Updated CHANGELOG

(cherry picked from commit ee0b618)
Machi3mfl added a commit that referenced this pull request Nov 11, 2022
* Fixed protocol param suggestion

* Updated CHANGELOG

(cherry picked from commit ee0b618)
Machi3mfl added a commit that referenced this pull request Nov 14, 2022
* Fixed protocol param suggestion

* Updated CHANGELOG

(cherry picked from commit ee0b618)
Machi3mfl added a commit that referenced this pull request Nov 14, 2022
Fixed WAZUH_PROTOCOL param suggestion (#4849)

* Fixed protocol param suggestion

* Updated CHANGELOG

(cherry picked from commit ee0b618)
Machi3mfl added a commit that referenced this pull request Nov 14, 2022
* Fixed protocol param suggestion

* Updated CHANGELOG

(cherry picked from commit ee0b618)
Machi3mfl added a commit that referenced this pull request Nov 14, 2022
Fixed WAZUH_PROTOCOL param suggestion (#4849)

* Fixed protocol param suggestion

* Updated CHANGELOG

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

2 participants