Scheduled upward merges for numbered branches in wazuh-installation-assistant repository - Fortnight #18

[juliamagan]

Description

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.9.1-into-4.10.0.

Tasks

4.9.1

• Update changelog.
• Merge branch 4.9.1 into branch 4.10.0.

[davidcr01]

Update Report

Already merged

• Change version to tag reference in source_branch references wazuh-packages#3098 was merged in 4.9.1 and 4.10.0 (new repository)
• Fix bug when changing the Filebeat URL in the Installation Assistant wazuh-packages#3110 was merged in 4.9.1 and 4.10.0 (new repository)

Needs to be merged

• Offline Installation Assistant import the downloaded GPG Wazuh key. wazuh-packages#3111 needs to be migrated to the new repository

  • added gpg key import in offline installation
  • change import gpg command
  • Merge pull request #3110 from wazuh/bug/3099-checkfilebeaturl-does-not-perform-as-expected

• Change Filebeat passwords only when installing Wazuh Server or changing passwords wazuh-packages#3118 needs to be migrated to the new repository

  • change filebeat passwords only when needed
  • Merge pull request #3118 from wazuh/bug/3115-fix-filebeat-credentials-update

[CarlosALgit]

LGTM