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

PR/merging question. #1166

Open
GregWhiteyBialas opened this issue Dec 19, 2023 · 2 comments · May be fixed by #1446
Open

PR/merging question. #1166

GregWhiteyBialas opened this issue Dec 19, 2023 · 2 comments · May be fixed by #1446
Assignees
Labels

Comments

@GregWhiteyBialas
Copy link

Hi!

In last year I have created PR which was merged and I was under impression (maybe wrong, no promises were made ;) ) that it will be merged "further" (to branch 4.4 and later to master).

Case is that in our deploys we are relaying on changes in this PR. So right now in our downstream fork we are stuck with version 4.4. To use newer versions I have to port this changes to newer downstream branch. However if this will be merged to master and used in all upcoming releases, I can happily delete downstream fork, and use latest version of Wazuh.

Is it possible to merge this into master? If yes, what's needs to be done? If no, what's needs to be done to make this happen?

@jonhattan
Copy link

That was a great change and it's a pity it didn't enter master -- I guess it was by mistake. Perhaps creating a new PR against master may help move this forward.

@wazuhci wazuhci moved this to Backlog in Release 5.0.0 Aug 26, 2024
@wazuhci wazuhci moved this from Backlog to In progress in Release 5.0.0 Oct 24, 2024
@YisDav YisDav self-assigned this Oct 25, 2024
@YisDav YisDav linked a pull request Oct 25, 2024 that will close this issue
@YisDav
Copy link
Member

YisDav commented Oct 29, 2024

Description

The changes highlighted in this issue were somehow accidentally excluded from the main changes within the wazuh-ansible repository. However, on further review, these changes were deemed to be vitally important and should be retrieved.

Accordingly, a retrieval of the commit created by @GregWhiteyBialas in the PR 1166 was performed. Thus, deployment tests were also performed with the implemented changes.

Test evidence

The implemented changes were tested through the distributed production-ready playbook on two different stacks, each one with 7 instances (Wazuh distributed deployment [6] + Wazuh ansible [1]). The first stack consisted only of Ubuntu hosts, while the second stack comprised Amazon Linux 2 instances. The deployed version of Wazuh is the latest release (4.9.1).

Ubuntu hosts

Ansible deployment

image

Dashboard

image

Amazon Linux 2 hosts

Ansible deployment

image

Dashboard

image

@wazuhci wazuhci moved this from In progress to Pending review in Release 5.0.0 Oct 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: Pending review
Development

Successfully merging a pull request may close this issue.

4 participants