wazuh / wazuh-ansible

Wazuh - Ansible playbook
https://wazuh.com
Other
292 stars 190 forks source link

PR/merging question. #1166

Open GregWhiteyBialas opened 10 months ago

GregWhiteyBialas commented 10 months ago

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 commented 3 months ago

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.

YisDav commented 2 days ago

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