Skip to content

Commit e6e6ff9

Browse files
vikman90vikman90
committed
Merge branch '4.9.0' into merge-4.9.0-into-master
2 parents e31b0d2 + 8bc24e1 commit e6e6ff9

File tree

14 files changed

+172
-30
lines changed

14 files changed

+172
-30
lines changed

‎CHANGELOG.md

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

2121
- https://github.com/wazuh/wazuh-packages/releases/tag/v4.8.0
2222

23+
## [4.7.5]
24+
25+
- https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.5
26+
2327
## [4.7.4]
2428

2529
- https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.4

‎aix/SPECS/wazuh-agent-aix.spec

+4-2
Original file line numberDiff line numberDiff line change
@@ -293,10 +293,12 @@ 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-
* Tue May 14 2024 support <[email protected]> - 4.9.0
296+
* Wed Jul 10 2024 support <[email protected]> - 4.9.0
297297
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
298-
* Thu May 09 2024 support <[email protected]> - 4.8.0
298+
* Wed Jun 05 2024 support <[email protected]> - 4.8.0
299299
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
300+
* Thu May 30 2024 support <[email protected]> - 4.7.5
301+
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
300302
* Thu Apr 25 2024 support <[email protected]> - 4.7.4
301303
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
302304
* Tue Feb 27 2024 support <[email protected]> - 4.7.3

‎debs/SPECS/wazuh-agent/debian/changelog

+8-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ wazuh-agent (4.9.0-RELEASE) stable; urgency=low
88

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

11-
-- Wazuh, Inc <[email protected]> Tue, 14 May 2024 00:00:00 +0000
11+
-- Wazuh, Inc <[email protected]> Wed, 10 Jul 2024 00:00:00 +0000
1212

1313
wazuh-agent (4.8.2-RELEASE) stable; urgency=low
1414

@@ -26,7 +26,13 @@ wazuh-agent (4.8.0-RELEASE) stable; urgency=low
2626

2727
* More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
2828

29-
-- Wazuh, Inc <[email protected]> Thu, 09 May 2024 00:00:00 +0000
29+
-- Wazuh, Inc <[email protected]> Wed, 05 Jun 2024 00:00:00 +0000
30+
31+
wazuh-agent (4.7.5-RELEASE) stable; urgency=low
32+
33+
* More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
34+
35+
-- Wazuh, Inc <[email protected]> Thu, 30 May 2024 00:00:00 +0000
3036

3137
wazuh-agent (4.7.4-RELEASE) stable; urgency=low
3238

‎debs/SPECS/wazuh-manager/debian/changelog

+8-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ wazuh-manager (4.9.0-RELEASE) stable; urgency=low
88

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

11-
-- Wazuh, Inc <[email protected]> Tue, 14 May 2024 00:00:00 +0000
11+
-- Wazuh, Inc <[email protected]> Wed, 10 Jul 2024 00:00:00 +0000
1212

1313
wazuh-manager (4.8.2-RELEASE) stable; urgency=low
1414

@@ -26,7 +26,13 @@ wazuh-manager (4.8.0-RELEASE) stable; urgency=low
2626

2727
* More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
2828

29-
-- Wazuh, Inc <[email protected]> Thu, 09 May 2024 00:00:00 +0000
29+
-- Wazuh, Inc <[email protected]> Wed, 05 Jun 2024 00:00:00 +0000
30+
31+
wazuh-manager (4.7.5-RELEASE) stable; urgency=low
32+
33+
* More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
34+
35+
-- Wazuh, Inc <[email protected]> Thu, 30 May 2024 00:00:00 +0000
3036

3137
wazuh-manager (4.7.4-RELEASE) stable; urgency=low
3238

‎rpms/SPECS/wazuh-agent.spec

+4-2
Original file line numberDiff line numberDiff line change
@@ -642,10 +642,12 @@ 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-
* Tue May 14 2024 support <[email protected]> - 4.9.0
645+
* Wed Jul 10 2024 support <[email protected]> - 4.9.0
646646
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
647-
* Thu May 09 2024 support <[email protected]> - 4.8.0
647+
* Wed Jun 05 2024 support <[email protected]> - 4.8.0
648648
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
649+
* Thu May 30 2024 support <[email protected]> - 4.7.5
650+
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
649651
* Thu Apr 25 2024 support <[email protected]> - 4.7.4
650652
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
651653
* Tue Feb 27 2024 support <[email protected]> - 4.7.3

‎rpms/SPECS/wazuh-manager.spec

+5-3
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ rm -fr %{buildroot}
625625
%dir %attr(770, root, wazuh) %{_localstatedir}/api/configuration/security
626626
%dir %attr(770, root, wazuh) %{_localstatedir}/api/configuration/ssl
627627
%dir %attr(750, root, wazuh) %{_localstatedir}/api/scripts
628-
%attr(640, root, wazuh) %{_localstatedir}/api/scripts/wazuh-apid.py
628+
%attr(640, root, wazuh) %{_localstatedir}/api/scripts/*.py
629629
%dir %attr(750, root, wazuh) %{_localstatedir}/backup
630630
%dir %attr(750, wazuh, wazuh) %{_localstatedir}/backup/db
631631
%dir %attr(750, wazuh, wazuh) %{_localstatedir}/backup/agents
@@ -889,10 +889,12 @@ 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-
* Tue May 14 2024 support <[email protected]> - 4.9.0
892+
* Wed Jul 10 2024 support <[email protected]> - 4.9.0
893893
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
894-
* Thu May 09 2024 support <[email protected]> - 4.8.0
894+
* Wed Jun 05 2024 support <[email protected]> - 4.8.0
895895
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
896+
* Thu May 30 2024 support <[email protected]> - 4.7.5
897+
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
896898
* Thu Apr 25 2024 support <[email protected]> - 4.7.4
897899
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
898900
* Tue Feb 27 2024 support <[email protected]> - 4.7.3

‎solaris/solaris11/SPECS/template_agent.json

+73-1
Original file line numberDiff line numberDiff line change
@@ -2047,7 +2047,79 @@
20472047
"type": "file",
20482048
"user": "root"
20492049
},
2050-
"/var/ossec/wodles/azure/orm.py": {
2050+
"/var/ossec/wodles/azure/azure_utils.py": {
2051+
"class": "static",
2052+
"group": "wazuh",
2053+
"mode": "0750",
2054+
"prot": "-rwxr-x---",
2055+
"type": "file",
2056+
"user": "root"
2057+
},
2058+
"/var/ossec/wodles/azure/azure_services": {
2059+
"class": "static",
2060+
"group": "wazuh",
2061+
"mode": "0750",
2062+
"prot": "drwxr-x---",
2063+
"type": "directory",
2064+
"user": "root"
2065+
},
2066+
"/var/ossec/wodles/azure/azure_services/__init__.py": {
2067+
"class": "static",
2068+
"group": "wazuh",
2069+
"mode": "0750",
2070+
"prot": "-rwxr-x---",
2071+
"type": "file",
2072+
"user": "root"
2073+
},
2074+
"/var/ossec/wodles/azure/azure_services/analytics.py": {
2075+
"class": "static",
2076+
"group": "wazuh",
2077+
"mode": "0750",
2078+
"prot": "-rwxr-x---",
2079+
"type": "file",
2080+
"user": "root"
2081+
},
2082+
"/var/ossec/wodles/azure/azure_services/graph.py": {
2083+
"class": "static",
2084+
"group": "wazuh",
2085+
"mode": "0750",
2086+
"prot": "-rwxr-x---",
2087+
"type": "file",
2088+
"user": "root"
2089+
},
2090+
"/var/ossec/wodles/azure/azure_services/storage.py": {
2091+
"class": "static",
2092+
"group": "wazuh",
2093+
"mode": "0750",
2094+
"prot": "-rwxr-x---",
2095+
"type": "file",
2096+
"user": "root"
2097+
},
2098+
"/var/ossec/wodles/azure/db": {
2099+
"class": "static",
2100+
"group": "wazuh",
2101+
"mode": "0750",
2102+
"prot": "drwxr-x---",
2103+
"type": "directory",
2104+
"user": "root"
2105+
},
2106+
"/var/ossec/wodles/azure/db/__init__.py": {
2107+
"class": "static",
2108+
"group": "wazuh",
2109+
"mode": "0750",
2110+
"prot": "-rwxr-x---",
2111+
"type": "file",
2112+
"user": "root"
2113+
},
2114+
"/var/ossec/wodles/azure/db/orm.py": {
2115+
"class": "static",
2116+
"group": "wazuh",
2117+
"mode": "0750",
2118+
"prot": "-rwxr-x---",
2119+
"type": "file",
2120+
"user": "root"
2121+
},
2122+
"/var/ossec/wodles/azure/db/utils.py": {
20512123
"class": "static",
20522124
"group": "wazuh",
20532125
"mode": "0750",

‎stack/dashboard/base/builder.sh

+5
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@ cp ./etc/styles.js ./src/core/server/rendering/views/styles.js
110110
# Customize OpenSearch Dashboards with Wazuh
111111
# -----------------------------------------------------------------------------
112112

113+
# Set v7 theme as default
114+
sed -i "s|value: 'Next (preview)',|value: 'v7',|g" ./src/core/server/ui_settings/settings/theme.js
115+
sed -i "s|defaultValue: 'v8'|defaultValue: 'v7'|g" ./src/core/server/ui_settings/ui_settings_config.js
116+
117+
113118
# Replace App Title
114119
sed -i "s|defaultValue: ''|defaultValue: \'Wazuh\'|g" ./src/core/server/opensearch_dashboards_config.js
115120
sed -i "90s|defaultValue: true|defaultValue: false|g" ./src/core/server/opensearch_dashboards_config.js

‎stack/dashboard/deb/debian/changelog

+8-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ wazuh-dashboard (4.9.0-RELEASE) stable; urgency=low
88

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

11-
-- Wazuh, Inc <[email protected]> Tue, 14 May 2024 00:00:00 +0000
11+
-- Wazuh, Inc <[email protected]> Wed, 10 Jul 2024 00:00:00 +0000
1212

1313
wazuh-dashboard (4.8.2-RELEASE) stable; urgency=low
1414

@@ -26,7 +26,13 @@ wazuh-dashboard (4.8.0-RELEASE) stable; urgency=low
2626

2727
* More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
2828

29-
-- Wazuh, Inc <[email protected]> Thu, 09 May 2024 00:00:00 +0000
29+
-- Wazuh, Inc <[email protected]> Wed, 05 Jun 2024 00:00:00 +0000
30+
31+
wazuh-dashboard (4.7.5-RELEASE) stable; urgency=low
32+
33+
* More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
34+
35+
-- Wazuh, Inc <[email protected]> Thu, 30 May 2024 00:00:00 +0000
3036

3137
wazuh-dashboard (4.7.4-RELEASE) stable; urgency=low
3238

‎stack/dashboard/rpm/wazuh-dashboard.spec

+15-2
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,17 @@ find %{buildroot}%{INSTALL_DIR}/plugins/wazuh/ -type f -perm 755 -exec chmod 750
108108
find %{buildroot}%{INSTALL_DIR}/plugins/wazuh/ -type d -exec chmod 750 {} \;
109109
find %{buildroot}%{INSTALL_DIR}/plugins/wazuh/ -type f -perm 744 -exec chmod 740 {} \;
110110

111+
find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -exec chown %{USER}:%{GROUP} {} \;
112+
find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -type f -perm 644 -exec chmod 640 {} \;
113+
find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -type f -perm 755 -exec chmod 750 {} \;
114+
find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -type d -exec chmod 750 {} \;
115+
find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -type f -perm 744 -exec chmod 740 {} \;
116+
117+
find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -exec chown %{USER}:%{GROUP} {} \;
118+
find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -type f -perm 644 -exec chmod 640 {} \;
119+
find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -type f -perm 755 -exec chmod 750 {} \;
120+
find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -type d -exec chmod 750 {} \;
121+
find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -type f -perm 744 -exec chmod 740 {} \;
111122
# -----------------------------------------------------------------------------
112123

113124
%pre
@@ -337,10 +348,12 @@ rm -fr %{buildroot}
337348
%changelog
338349
* Thu Dec 12 2024 support <[email protected]> - 5.0.0
339350
- More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html
340-
* Tue May 14 2024 support <[email protected]> - 4.9.0
351+
* Wed Jul 10 2024 support <[email protected]> - 4.9.0
341352
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
342-
* Thu May 09 2024 support <[email protected]> - 4.8.0
353+
* Wed Jun 05 2024 support <[email protected]> - 4.8.0
343354
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
355+
* Thu May 30 2024 support <[email protected]> - 4.7.5
356+
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
344357
* Thu Apr 25 2024 support <[email protected]> - 4.7.4
345358
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
346359
* Tue Feb 27 2024 support <[email protected]> - 4.7.3

‎stack/indexer/deb/debian/changelog

+8-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ wazuh-indexer (4.9.0-RELEASE) stable; urgency=low
88

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

11-
-- Wazuh, Inc <[email protected]> Tue, 14 May 2024 00:00:00 +0000
11+
-- Wazuh, Inc <[email protected]> Wed, 10 Jul 2024 00:00:00 +0000
1212

1313
wazuh-indexer (4.8.2-RELEASE) stable; urgency=low
1414

@@ -26,7 +26,13 @@ wazuh-indexer (4.8.0-RELEASE) stable; urgency=low
2626

2727
* More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
2828

29-
-- Wazuh, Inc <[email protected]> Thu, 09 May 2024 00:00:00 +0000
29+
-- Wazuh, Inc <[email protected]> Wed, 05 Jun 2024 00:00:00 +0000
30+
31+
wazuh-indexer (4.7.5-RELEASE) stable; urgency=low
32+
33+
* More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
34+
35+
-- Wazuh, Inc <[email protected]> Thu, 30 May 2024 00:00:00 +0000
3036

3137
wazuh-indexer (4.7.4-RELEASE) stable; urgency=low
3238

‎stack/indexer/rpm/wazuh-indexer.spec

+4-2
Original file line numberDiff line numberDiff line change
@@ -683,10 +683,12 @@ 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-
* Tue May 14 2024 support <[email protected]> - 4.9.0
686+
* Wed Jul 10 2024 support <[email protected]> - 4.9.0
687687
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
688-
* Thu May 09 2024 support <[email protected]> - 4.8.0
688+
* Wed Jun 05 2024 support <[email protected]> - 4.8.0
689689
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
690+
* Thu May 30 2024 support <[email protected]> - 4.7.5
691+
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
690692
* Thu Apr 25 2024 support <[email protected]> - 4.7.4
691693
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
692694
* Tue Feb 27 2024 support <[email protected]> - 4.7.3

‎tests/unattended/install/test_unattended.py

+9-2
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ def test_check_wazuh_manager_modulesd():
171171

172172
@pytest.mark.wazuh
173173
def test_check_wazuh_manager_apid():
174-
assert check_call("ps -xa | grep wazuh-apid | grep -v grep", shell=True) != ""
174+
assert check_call("ps -xa | grep wazuh_apid | grep -v grep", shell=True) != ""
175175

176176
@pytest.mark.wazuh_cluster
177177
def test_check_wazuh_manager_clusterd():
@@ -208,10 +208,17 @@ def test_check_wazuh_api_status():
208208
@pytest.mark.wazuh
209209
def test_check_log_errors():
210210
found_error = False
211+
exceptions = [
212+
'WARNING: Cluster error detected',
213+
'agent-upgrade: ERROR: (8123): There has been an error executing the request in the tasks manager.',
214+
"ERROR: Could not send message through the cluster after '10' attempts"
215+
216+
]
217+
211218
with open('/var/ossec/logs/ossec.log', 'r') as f:
212219
for line in f.readlines():
213220
if 'ERROR' in line:
214-
if 'ERROR: Cluster error detected' not in line and 'agent-upgrade: ERROR: (8123): There has been an error executing the request in the tasks manager.' not in line:
221+
if not any(exception in line for exception in exceptions):
215222
found_error = True
216223
break
217224
assert found_error == False, line

‎unattended_installer/install_functions/checks.sh

+17-8
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,8 @@ function check_curlVersion() {
200200
function check_dist() {
201201
common_logger -d "Checking system distribution."
202202
dist_detect
203-
if [ "${DIST_NAME}" != "centos" ] && [ "${DIST_NAME}" != "rhel" ] && [ "${DIST_NAME}" != "amzn" ] && [ "${DIST_NAME}" != "ubuntu" ]; then
203+
if [ "${DIST_NAME}" != "centos" ] && [ "${DIST_NAME}" != "rhel" ] &&
204+
[ "${DIST_NAME}" != "amzn" ] && [ "${DIST_NAME}" != "ubuntu" ] && [ "${DIST_NAME}" != "rocky" ]; then
204205
notsupported=1
205206
fi
206207
if [ "${DIST_NAME}" == "centos" ] && { [ "${DIST_VER}" -ne "7" ] && [ "${DIST_VER}" -ne "8" ]; }; then
@@ -211,9 +212,9 @@ function check_dist() {
211212
fi
212213

213214
if [ "${DIST_NAME}" == "amzn" ]; then
214-
if [ "${DIST_VER}" != "2" ] &&
215-
[ "${DIST_VER}" != "2023" ] &&
216-
[ "${DIST_VER}" != "2018.03" ]; then
215+
if [ "${DIST_VER}" != "2" ] &&
216+
[ "${DIST_VER}" != "2023" ] &&
217+
[ "${DIST_VER}" != "2018.03" ]; then
217218
notsupported=1
218219
fi
219220
if [ "${DIST_VER}" -eq "2023" ]; then
@@ -223,21 +224,29 @@ function check_dist() {
223224

224225
if [ "${DIST_NAME}" == "ubuntu" ]; then
225226
if [ "${DIST_VER}" == "16" ] || [ "${DIST_VER}" == "18" ] ||
226-
[ "${DIST_VER}" == "20" ] || [ "${DIST_VER}" == "22" ]; then
227+
[ "${DIST_VER}" == "20" ] || [ "${DIST_VER}" == "22" ] ||
228+
[ "${DIST_VER}" == "24" ]; then
227229
if [ "${DIST_SUBVER}" != "04" ]; then
228230
notsupported=1
229231
fi
230232
else
231233
notsupported=1
232234
fi
233235
fi
236+
237+
if [ "${DIST_NAME}" == "rocky" ]; then
238+
if [ "${DIST_VER}" != "9" ] || [ "${DIST_SUBVER}" != "4" ]; then
239+
notsupported=1
240+
fi
241+
fi
242+
234243
if [ -n "${notsupported}" ] && [ -z "${ignore}" ]; then
235244
common_logger -e "The recommended systems are: Red Hat Enterprise Linux 7, 8, 9; CentOS 7, 8; Amazon Linux 2; Ubuntu 16.04, 18.04, 20.04, 22.04. The current system does not match this list. Use -i|--ignore-check to skip this check."
236245
exit 1
237246
fi
238247
common_logger -d "Detected distribution name: ${DIST_NAME}"
239248
common_logger -d "Detected distribution version: ${DIST_VER}"
240-
249+
241250
}
242251

243252
function checks_health() {
@@ -375,11 +384,11 @@ function checks_ports() {
375384
elif [ "${sys_type}" == "apt-get" ]; then
376385
installCommon_aptInstallList "${dep}"
377386
fi
378-
387+
379388
if [ "${#not_installed[@]}" -gt 0 ]; then
380389
wia_dependencies_installed+=("${dep}")
381390
fi
382-
391+
383392
common_logger -d "Checking ports availability."
384393
used_port=0
385394
ports=("$@")

0 commit comments

Comments
 (0)