wazuh / wazuh-packages

Wazuh - Tools for packages creation
https://wazuh.com
GNU General Public License v2.0
105 stars 97 forks source link

Post release tasks for 4.8.1 #3045

Closed davidjiglesias closed 4 months ago

davidjiglesias commented 4 months ago

Description

This issue attempts to track the steps necessary to complete post-release maintenance tasks for 4.8.1. The goal is to complete the following tasks, each task must have a PR associated with this issue.

The branches must follow the naming: merge-<ORIGIN_BRANCH>-into-<DESTINATION_BRANCH>. For example, merge-4.8.1-into-4.9.0.

Tasks

vikman90 commented 4 months ago

Conflict at passwordFunctions.sh

Possible related commit: https://github.com/wazuh/wazuh-packages/commit/c6f3ca0d9bdc1021e9ed3ee0f44df9927c28e2e5

<<<<<<< HEAD

=======
            eval "echo ${adminpass} | filebeat keystore add password --force --stdin ${debug}"
            conf="$(awk '{sub("password: .*", "password: ${password}")}1' /etc/filebeat/filebeat.yml)"
            echo "${conf}" > /etc/filebeat/filebeat.yml
            eval "echo admin | filebeat keystore add username --force --stdin ${debug}"
            conf="$(awk '{sub("username: .*", "username: ${username}")}1' /etc/filebeat/filebeat.yml)"
            echo "${conf}" > /etc/filebeat/filebeat.yml
            common_logger "The filebeat.yml file has been updated to use the Filebeat Keystore username and password."
>>>>>>> 4.10.0
davidcr01 commented 4 months ago

The new lines must be added to the 5.0 branch. These changes come from https://github.com/wazuh/wazuh-packages/pull/2989/ (merged in 4.9.0), then, the changes were bumped into 4.10.0, and now it is necessary to bump it to the master branch.