Skip to content

Commit c49ddd3

Browse files
vikman90vikman90
committed
chore: merge branch '4.10.0' into merge-4.10.0-into-master
2 parents ddaaabf + 9bafe01 commit c49ddd3

File tree

12 files changed

+76
-30
lines changed

12 files changed

+76
-30
lines changed

Diff for: ‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
44

55
- https://github.com/wazuh/wazuh-packages/releases/tag/v5.0.0
66

7+
## [4.10.0]
8+
9+
- https://github.com/wazuh/wazuh-packages/releases/tag/v4.10.0
10+
711
## [4.9.0]
812

913
- https://github.com/wazuh/wazuh-packages/releases/tag/v4.9.0

Diff for: ‎aix/SPECS/wazuh-agent-aix.spec

+4-2
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,11 @@ rm -fr %{buildroot}
293293
%changelog
294294
* Thu Dec 12 2024 support <[email protected]> - 5.0.0
295295
- More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
296-
* Wed Jul 10 2024 support <[email protected]> - 4.9.0
296+
* Tue Oct 01 2024 support <[email protected]> - 4.10.0
297+
- More info: https://documentation.wazuh.com/current/release-notes/release-4-10-0.html
298+
* Thu Aug 15 2024 support <[email protected]> - 4.9.0
297299
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
298-
* Wed Jun 26 2024 support <[email protected]> - 4.8.1
300+
* Thu Jul 18 2024 support <[email protected]> - 4.8.1
299301
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
300302
* Wed Jun 12 2024 support <[email protected]> - 4.8.0
301303
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html

Diff for: ‎debs/SPECS/wazuh-agent/debian/changelog

+8-2
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,23 @@ wazuh-agent (5.0.0-RELEASE) stable; urgency=low
44

55
-- Wazuh, Inc <[email protected]> Thu, 12 Dec 2024 00:00:00 +0000
66

7+
wazuh-agent (4.10.0-RELEASE) stable; urgency=low
8+
9+
* More info: https://documentation.wazuh.com/current/release-notes/release-4-10-0.html
10+
11+
-- Wazuh, Inc <[email protected]> Tue, 01 Oct 2024 00:00:00 +0000
12+
713
wazuh-agent (4.9.0-RELEASE) stable; urgency=low
814

915
* More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
1016

11-
-- Wazuh, Inc <[email protected]> Wed, 10 Jul 2024 00:00:00 +0000
17+
-- Wazuh, Inc <[email protected]> Thu, 15 Aug 2024 00:00:00 +0000
1218

1319
wazuh-agent (4.8.1-RELEASE) stable; urgency=low
1420

1521
* More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
1622

17-
-- Wazuh, Inc <[email protected]> Wed, 26 Jun 2024 00:00:00 +0000
23+
-- Wazuh, Inc <[email protected]> Thu, 18 Jul 2024 00:00:00 +0000
1824

1925
wazuh-agent (4.8.0-RELEASE) stable; urgency=low
2026

Diff for: ‎debs/SPECS/wazuh-manager/debian/changelog

+8-2
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,23 @@ wazuh-manager (5.0.0-RELEASE) stable; urgency=low
44

55
-- Wazuh, Inc <[email protected]> Thu, 12 Dec 2024 00:00:00 +0000
66

7+
wazuh-manager (4.10.0-RELEASE) stable; urgency=low
8+
9+
* More info: https://documentation.wazuh.com/current/release-notes/release-4-10-0.html
10+
11+
-- Wazuh, Inc <[email protected]> Tue, 01 Oct 2024 00:00:00 +0000
12+
713
wazuh-manager (4.9.0-RELEASE) stable; urgency=low
814

915
* More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
1016

11-
-- Wazuh, Inc <[email protected]> Wed, 10 Jul 2024 00:00:00 +0000
17+
-- Wazuh, Inc <[email protected]> Thu, 15 Aug 2024 00:00:00 +0000
1218

1319
wazuh-manager (4.8.1-RELEASE) stable; urgency=low
1420

1521
* More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
1622

17-
-- Wazuh, Inc <[email protected]> Wed, 26 Jun 2024 00:00:00 +0000
23+
-- Wazuh, Inc <[email protected]> Thu, 18 Jul 2024 00:00:00 +0000
1824

1925
wazuh-manager (4.8.0-RELEASE) stable; urgency=low
2026

Diff for: ‎rpms/SPECS/wazuh-agent.spec

+4-2
Original file line numberDiff line numberDiff line change
@@ -642,9 +642,11 @@ rm -fr %{buildroot}
642642
%changelog
643643
* Thu Dec 12 2024 support <[email protected]> - 5.0.0
644644
- More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
645-
* Wed Jul 10 2024 support <[email protected]> - 4.9.0
645+
* Tue Oct 01 2024 support <[email protected]> - 4.10.0
646+
- More info: https://documentation.wazuh.com/current/release-notes/release-4-10-0.html
647+
* Thu Aug 15 2024 support <[email protected]> - 4.9.0
646648
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
647-
* Wed Jun 26 2024 support <[email protected]> - 4.8.1
649+
* Thu Jul 18 2024 support <[email protected]> - 4.8.1
648650
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
649651
* Wed Jun 12 2024 support <[email protected]> - 4.8.0
650652
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html

Diff for: ‎rpms/SPECS/wazuh-manager.spec

+4-2
Original file line numberDiff line numberDiff line change
@@ -889,9 +889,11 @@ rm -fr %{buildroot}
889889
%changelog
890890
* Thu Dec 12 2024 support <[email protected]> - 5.0.0
891891
- More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
892-
* Wed Jul 10 2024 support <[email protected]> - 4.9.0
892+
* Tue Oct 01 2024 support <[email protected]> - 4.10.0
893+
- More info: https://documentation.wazuh.com/current/release-notes/release-4-10-0.html
894+
* Thu Aug 15 2024 support <[email protected]> - 4.9.0
893895
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
894-
* Wed Jun 26 2024 support <[email protected]> - 4.8.1
896+
* Thu Jul 18 2024 support <[email protected]> - 4.8.1
895897
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
896898
* Wed Jun 12 2024 support <[email protected]> - 4.8.0
897899
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html

Diff for: ‎stack/dashboard/deb/debian/changelog

+8-2
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,23 @@ wazuh-dashboard (5.0.0-RELEASE) stable; urgency=low
44

55
-- Wazuh, Inc <[email protected]> Thu, 12 Dec 2024 00:00:00 +0000
66

7+
wazuh-dashboard (4.10.0-RELEASE) stable; urgency=low
8+
9+
* More info: https://documentation.wazuh.com/current/release-notes/release-4-10-0.html
10+
11+
-- Wazuh, Inc <[email protected]> Tue, 01 Oct 2024 00:00:00 +0000
12+
713
wazuh-dashboard (4.9.0-RELEASE) stable; urgency=low
814

915
* More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
1016

11-
-- Wazuh, Inc <[email protected]> Wed, 10 Jul 2024 00:00:00 +0000
17+
-- Wazuh, Inc <[email protected]> Thu, 15 Aug 2024 00:00:00 +0000
1218

1319
wazuh-dashboard (4.8.1-RELEASE) stable; urgency=low
1420

1521
* More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
1622

17-
-- Wazuh, Inc <[email protected]> Wed, 26 Jun 2024 00:00:00 +0000
23+
-- Wazuh, Inc <[email protected]> Thu, 18 Jul 2024 00:00:00 +0000
1824

1925
wazuh-dashboard (4.8.0-RELEASE) stable; urgency=low
2026

Diff for: ‎stack/dashboard/rpm/wazuh-dashboard.spec

+4-2
Original file line numberDiff line numberDiff line change
@@ -348,9 +348,11 @@ rm -fr %{buildroot}
348348
%changelog
349349
* Thu Dec 12 2024 support <[email protected]> - 5.0.0
350350
- More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
351-
* Wed Jul 10 2024 support <[email protected]> - 4.9.0
351+
* Tue Oct 01 2024 support <[email protected]> - 4.10.0
352+
- More info: https://documentation.wazuh.com/current/release-notes/release-4-10-0.html
353+
* Thu Aug 15 2024 support <[email protected]> - 4.9.0
352354
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
353-
* Wed Jun 26 2024 support <[email protected]> - 4.8.1
355+
* Thu Jul 18 2024 support <[email protected]> - 4.8.1
354356
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
355357
* Wed Jun 12 2024 support <[email protected]> - 4.8.0
356358
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html

Diff for: ‎stack/indexer/deb/debian/changelog

+8-2
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,23 @@ wazuh-indexer (5.0.0-RELEASE) stable; urgency=low
44

55
-- Wazuh, Inc <[email protected]> Thu, 12 Dec 2024 00:00:00 +0000
66

7+
wazuh-indexer (4.10.0-RELEASE) stable; urgency=low
8+
9+
* More info: https://documentation.wazuh.com/current/release-notes/release-4-10-0.html
10+
11+
-- Wazuh, Inc <[email protected]> Tue, 01 Oct 2024 00:00:00 +0000
12+
713
wazuh-indexer (4.9.0-RELEASE) stable; urgency=low
814

915
* More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
1016

11-
-- Wazuh, Inc <[email protected]> Wed, 10 Jul 2024 00:00:00 +0000
17+
-- Wazuh, Inc <[email protected]> Thu, 15 Aug 2024 00:00:00 +0000
1218

1319
wazuh-indexer (4.8.1-RELEASE) stable; urgency=low
1420

1521
* More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
1622

17-
-- Wazuh, Inc <[email protected]> Wed, 26 Jun 2024 00:00:00 +0000
23+
-- Wazuh, Inc <[email protected]> Thu, 18 Jul 2024 00:00:00 +0000
1824

1925
wazuh-indexer (4.8.0-RELEASE) stable; urgency=low
2026

Diff for: ‎stack/indexer/rpm/wazuh-indexer.spec

+4-2
Original file line numberDiff line numberDiff line change
@@ -683,9 +683,11 @@ rm -fr %{buildroot}
683683
%changelog
684684
* Thu Dec 12 2024 support <[email protected]> - 5.0.0
685685
- More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
686-
* Wed Jul 10 2024 support <[email protected]> - 4.9.0
686+
* Tue Oct 01 2024 support <[email protected]> - 4.10.0
687+
- More info: https://documentation.wazuh.com/current/release-notes/release-4-10-0.html
688+
* Thu Aug 15 2024 support <[email protected]> - 4.9.0
687689
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
688-
* Wed Jun 26 2024 support <[email protected]> - 4.8.1
690+
* Thu Jul 18 2024 support <[email protected]> - 4.8.1
689691
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
690692
* Wed Jun 12 2024 support <[email protected]> - 4.8.0
691693
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html

Diff for: ‎unattended_installer/passwords_tool/passwordsFunctions.sh

+14-12
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,18 @@ function passwords_changePassword() {
4848

4949
if [ "${nuser}" == "admin" ] || [ -n "${changeall}" ]; then
5050
if [ -n "${filebeat_installed}" ]; then
51-
if filebeat keystore list | grep -q password ; then
52-
eval "(echo ${adminpass} | filebeat keystore add password --force --stdin)" "${debug}"
53-
else
54-
wazuhold=$(grep "password:" /etc/filebeat/filebeat.yml )
55-
ra=" password: "
56-
wazuhold="${wazuhold//$ra}"
57-
conf="$(awk '{sub("password: .*", "password: '"${adminpass}"'")}1' /etc/filebeat/filebeat.yml)"
58-
echo "${conf}" > /etc/filebeat/filebeat.yml
51+
file_username=$(grep "username:" /etc/filebeat/filebeat.yml | awk '{print $2}')
52+
file_password=$(grep "password:" /etc/filebeat/filebeat.yml | awk '{print $2}')
53+
if [ "$file_username" != "\${username}" ] || [ "$file_password" != "\${password}" ]; then
54+
common_logger -w "The user and password configured in the filebeat.yml file will be updated and stored in Filebeat Keystore."
5955
fi
60-
56+
eval "echo ${adminpass} | filebeat keystore add password --force --stdin ${debug}"
57+
conf="$(awk '{sub("password: .*", "password: ${password}")}1' /etc/filebeat/filebeat.yml)"
58+
echo "${conf}" > /etc/filebeat/filebeat.yml
59+
eval "echo admin | filebeat keystore add username --force --stdin ${debug}"
60+
conf="$(awk '{sub("username: .*", "username: ${username}")}1' /etc/filebeat/filebeat.yml)"
61+
echo "${conf}" > /etc/filebeat/filebeat.yml
62+
common_logger "The filebeat.yml file has been updated to use the Filebeat Keystore username and password."
6163
passwords_restartService "filebeat"
6264
eval "/var/ossec/bin/wazuh-keystore -f indexer -k password -v ${adminpass}"
6365
common_logger -nl $"The new password for Filebeat is ${adminpass}"
@@ -222,7 +224,7 @@ function passwords_generateHash() {
222224
common_logger -d "Generating password hashes."
223225
for i in "${!passwords[@]}"
224226
do
225-
nhash=$(bash /usr/share/wazuh-indexer/plugins/opensearch-security/tools/hash.sh -p "${passwords[i]}" | grep -A 2 'issues' | tail -n 1)
227+
nhash=$(bash /usr/share/wazuh-indexer/plugins/opensearch-security/tools/hash.sh -p "${passwords[i]}" 2>&1 | grep -A 2 'issues' | tail -n 1)
226228
if [ "${PIPESTATUS[0]}" != 0 ]; then
227229
common_logger -e "Hash generation failed."
228230
if [[ $(type -t installCommon_rollBack) == "function" ]]; then
@@ -235,7 +237,7 @@ function passwords_generateHash() {
235237
common_logger -d "Password hashes generated."
236238
else
237239
common_logger "Generating password hash"
238-
hash=$(bash /usr/share/wazuh-indexer/plugins/opensearch-security/tools/hash.sh -p "${password}" | grep -A 2 'issues' | tail -n 1)
240+
hash=$(bash /usr/share/wazuh-indexer/plugins/opensearch-security/tools/hash.sh -p "${password}" 2>&1 | grep -A 2 'issues' | tail -n 1)
239241
if [ "${PIPESTATUS[0]}" != 0 ]; then
240242
common_logger -e "Hash generation failed."
241243
if [[ $(type -t installCommon_rollBack) == "function" ]]; then
@@ -397,7 +399,7 @@ function passwords_getNetworkHost() {
397399
IP=$(grep -hr "^network.host:" /etc/wazuh-indexer/opensearch.yml)
398400
NH="network.host: "
399401
IP="${IP//$NH}"
400-
402+
401403
# Remove surrounding double quotes if present
402404
IP="${IP//\"}"
403405

Diff for: ‎unattended_installer/passwords_tool/passwordsMain.sh

+6
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ function getHelp() {
2626
echo -e ""
2727
echo -e " -au, --admin-user <adminUser>"
2828
echo -e " Admin user for Wazuh API, Required to change Wazuh API passwords."
29+
echo -e " Requires -A|--api."
2930
echo -e ""
3031
echo -e " -ap, --admin-password <adminPassword>"
3132
echo -e " Password for Wazuh API admin user, Required to change Wazuh API passwords."
33+
echo -e " Requires -A|--api."
3234
echo -e ""
3335
echo -e " -u, --user <user>"
3436
echo -e " Indicates the name of the user whose password will be changed."
@@ -217,6 +219,10 @@ function main() {
217219
getHelp
218220
fi
219221

222+
if [ -n "${adminUser}" ] && [ -n "${adminPassword}" ] && [ -z "${api}" ]; then
223+
getHelp
224+
fi
225+
220226
if [ -n "${nuser}" ]; then
221227
if [ -n "${adminUser}" ] && [ -n "${adminPassword}" ]; then
222228
passwords_getApiToken

0 commit comments

Comments
 (0)