Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 4.8.0 into 4.9.0 #2978

Merged
merged 26 commits into from
May 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e7f86fc
Set v7 theme as default
Tostti Apr 29, 2024
a85c138
Merge pull request #2932 from wazuh/set-v7-theme-as-default
asteriscos May 2, 2024
59e1050
build: update release date for 4.8.0
MarcelKemp May 3, 2024
e4b656d
Merge pull request #2940 from wazuh/maintenance/2939-release-date-4.8.0
MarcelKemp May 3, 2024
a6f0d0a
Added chown and chmod to wazuhCheckUpdates and wazuhCore plugins.
May 7, 2024
784c0bb
Merge pull request #2943 from wazuh/fix/2942-fix-wazuh-core-and-check…
rauldpm May 9, 2024
3c22a3c
build: bump version to 4.7.5
JcabreraC May 15, 2024
7304943
build: fix release date and modify source_branch
MarcelKemp May 15, 2024
857808b
Merge pull request #2950 from wazuh/maintenance/2949-bump-version-4.7.5
TomasTurina May 15, 2024
df23a5a
Fixed check_log_errors pytest
davidcr01 May 17, 2024
1c5d482
Merge pull request #2954 from wazuh/bug/2952-fix-test_unattended-and-…
teddytpc1 May 17, 2024
50bb879
Update dates for 4.7.5
TomasTurina May 22, 2024
0ff8b3a
Merge pull request #2960 from wazuh/2958_update_dates_4_7_5
TomasTurina May 22, 2024
ceb720e
Merge branch '4.7.5' into merge-4.7.5-into-4.8.0
TomasTurina May 22, 2024
849633a
Merge pull request #2961 from wazuh/merge-4.7.5-into-4.8.0
TomasTurina May 22, 2024
a12b7ec
build: update 4.8.0 release date
vikman90 May 23, 2024
2b4f695
Merge pull request #2963 from wazuh/fix/4.8.0-date
vikman90 May 23, 2024
7e070d8
Added support for Ubuntu 24
c-bordon May 28, 2024
afbc54b
build: update 4.7.5 release date
vikman90 May 29, 2024
f3b9ef9
Merge pull request #2971 from wazuh/change/2969-release-date
vikman90 May 29, 2024
8c02ef0
Merge pull request #2966 from wazuh/change/2965-add-support-for-ubunt…
c-bordon May 30, 2024
91afe00
docu: update 4.8.0 release date
vikman90 May 31, 2024
b9a2523
Merge branch '4.7.5' into merge-4.7.5-into-4.8.0
vikman90 May 31, 2024
aec4758
Merge pull request #2977 from wazuh/merge-4.7.5-into-4.8.0
vikman90 May 31, 2024
a4ac738
docu: update 4.9.0 release date
vikman90 May 31, 2024
3ceb63a
Merge branch '4.8.0' into merge-4.8.0-into-4.9.0
vikman90 May 31, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ All notable changes to this project will be documented in this file.

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

## [4.7.5]

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

## [4.7.4]

- https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.4
Expand Down
6 changes: 4 additions & 2 deletions aix/SPECS/wazuh-agent-aix.spec
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,12 @@ rm -fr %{buildroot}
%attr(750, root, wazuh) %{_localstatedir}/wodles/*

%changelog
* Tue May 14 2024 support <[email protected]> - 4.9.0
* Wed Jul 10 2024 support <[email protected]> - 4.9.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
* Thu May 09 2024 support <[email protected]> - 4.8.0
* Wed Jun 05 2024 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Thu May 30 2024 support <[email protected]> - 4.7.5
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
* Thu Apr 25 2024 support <[email protected]> - 4.7.4
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
* Tue Feb 27 2024 support <[email protected]> - 4.7.3
Expand Down
10 changes: 8 additions & 2 deletions debs/SPECS/wazuh-agent/debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ wazuh-agent (4.9.0-RELEASE) stable; urgency=low

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

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

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

Expand All @@ -20,7 +20,13 @@ wazuh-agent (4.8.0-RELEASE) stable; urgency=low

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

-- Wazuh, Inc <[email protected]> Thu, 09 May 2024 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Wed, 05 Jun 2024 00:00:00 +0000

wazuh-agent (4.7.5-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html

-- Wazuh, Inc <[email protected]> Thu, 30 May 2024 00:00:00 +0000

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

Expand Down
2 changes: 1 addition & 1 deletion debs/SPECS/wazuh-agent/debian/copyright
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This work was packaged for Debian by:

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

It was downloaded from:

Expand Down
10 changes: 8 additions & 2 deletions debs/SPECS/wazuh-manager/debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ wazuh-manager (4.9.0-RELEASE) stable; urgency=low

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

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

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

Expand All @@ -20,7 +20,13 @@ wazuh-manager (4.8.0-RELEASE) stable; urgency=low

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

-- Wazuh, Inc <[email protected]> Thu, 09 May 2024 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Wed, 05 Jun 2024 00:00:00 +0000

wazuh-manager (4.7.5-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html

-- Wazuh, Inc <[email protected]> Thu, 30 May 2024 00:00:00 +0000

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

Expand Down
2 changes: 1 addition & 1 deletion debs/SPECS/wazuh-manager/debian/copyright
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This work was packaged for Debian by:

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

It was downloaded from:

Expand Down
6 changes: 4 additions & 2 deletions rpms/SPECS/wazuh-agent.spec
Original file line number Diff line number Diff line change
Expand Up @@ -640,10 +640,12 @@ rm -fr %{buildroot}
%attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/*

%changelog
* Tue May 14 2024 support <[email protected]> - 4.9.0
* Wed Jul 10 2024 support <[email protected]> - 4.9.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
* Thu May 09 2024 support <[email protected]> - 4.8.0
* Wed Jun 05 2024 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Thu May 30 2024 support <[email protected]> - 4.7.5
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
* Thu Apr 25 2024 support <[email protected]> - 4.7.4
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
* Tue Feb 27 2024 support <[email protected]> - 4.7.3
Expand Down
6 changes: 4 additions & 2 deletions rpms/SPECS/wazuh-manager.spec
Original file line number Diff line number Diff line change
Expand Up @@ -887,10 +887,12 @@ rm -fr %{buildroot}
%attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/*

%changelog
* Tue May 14 2024 support <[email protected]> - 4.9.0
* Wed Jul 10 2024 support <[email protected]> - 4.9.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
* Thu May 09 2024 support <[email protected]> - 4.8.0
* Wed Jun 05 2024 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Thu May 30 2024 support <[email protected]> - 4.7.5
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
* Thu Apr 25 2024 support <[email protected]> - 4.7.4
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
* Tue Feb 27 2024 support <[email protected]> - 4.7.3
Expand Down
2 changes: 1 addition & 1 deletion solaris/solaris10/pkginfo
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARCH="i386"
CLASSES="none"
CATEGORY="system"
VENDOR="Wazuh, Inc <[email protected]>"
PSTAMP="14May2024"
PSTAMP="10Jul2024"
EMAIL="[email protected]"
ISTATES="S s 1 2 3"
RSTATES="S s 1 2 3"
Expand Down
5 changes: 5 additions & 0 deletions stack/dashboard/base/builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ cp ./etc/styles.js ./src/core/server/rendering/views/styles.js
# Customize OpenSearch Dashboards with Wazuh
# -----------------------------------------------------------------------------

# Set v7 theme as default
sed -i "s|value: 'Next (preview)',|value: 'v7',|g" ./src/core/server/ui_settings/settings/theme.js
sed -i "s|defaultValue: 'v8'|defaultValue: 'v7'|g" ./src/core/server/ui_settings/ui_settings_config.js


# Replace App Title
sed -i "s|defaultValue: ''|defaultValue: \'Wazuh\'|g" ./src/core/server/opensearch_dashboards_config.js
sed -i "90s|defaultValue: true|defaultValue: false|g" ./src/core/server/opensearch_dashboards_config.js
Expand Down
10 changes: 8 additions & 2 deletions stack/dashboard/deb/debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ wazuh-dashboard (4.9.0-RELEASE) stable; urgency=low

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

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

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

Expand All @@ -20,7 +20,13 @@ wazuh-dashboard (4.8.0-RELEASE) stable; urgency=low

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

-- Wazuh, Inc <[email protected]> Thu, 09 May 2024 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Wed, 05 Jun 2024 00:00:00 +0000

wazuh-dashboard (4.7.5-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html

-- Wazuh, Inc <[email protected]> Thu, 30 May 2024 00:00:00 +0000

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

Expand Down
2 changes: 1 addition & 1 deletion stack/dashboard/deb/debian/copyright
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This work was packaged for Debian by:

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

It was downloaded from:

Expand Down
17 changes: 15 additions & 2 deletions stack/dashboard/rpm/wazuh-dashboard.spec
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,17 @@ find %{buildroot}%{INSTALL_DIR}/plugins/wazuh/ -type f -perm 755 -exec chmod 750
find %{buildroot}%{INSTALL_DIR}/plugins/wazuh/ -type d -exec chmod 750 {} \;
find %{buildroot}%{INSTALL_DIR}/plugins/wazuh/ -type f -perm 744 -exec chmod 740 {} \;

find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -exec chown %{USER}:%{GROUP} {} \;
find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -type f -perm 644 -exec chmod 640 {} \;
find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -type f -perm 755 -exec chmod 750 {} \;
find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -type d -exec chmod 750 {} \;
find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -type f -perm 744 -exec chmod 740 {} \;

find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -exec chown %{USER}:%{GROUP} {} \;
find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -type f -perm 644 -exec chmod 640 {} \;
find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -type f -perm 755 -exec chmod 750 {} \;
find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -type d -exec chmod 750 {} \;
find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -type f -perm 744 -exec chmod 740 {} \;
# -----------------------------------------------------------------------------

%pre
Expand Down Expand Up @@ -335,10 +346,12 @@ rm -fr %{buildroot}
%config(noreplace) %attr(640, %{USER}, %{GROUP}) "%{CONFIG_DIR}/opensearch_dashboards.yml"

%changelog
* Tue May 14 2024 support <[email protected]> - 4.9.0
* Wed Jul 10 2024 support <[email protected]> - 4.9.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
* Thu May 09 2024 support <[email protected]> - 4.8.0
* Wed Jun 05 2024 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Thu May 30 2024 support <[email protected]> - 4.7.5
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
* Thu Apr 25 2024 support <[email protected]> - 4.7.4
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
* Tue Feb 27 2024 support <[email protected]> - 4.7.3
Expand Down
10 changes: 8 additions & 2 deletions stack/indexer/deb/debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ wazuh-indexer (4.9.0-RELEASE) stable; urgency=low

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

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

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

Expand All @@ -20,7 +20,13 @@ wazuh-indexer (4.8.0-RELEASE) stable; urgency=low

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

-- Wazuh, Inc <[email protected]> Thu, 09 May 2024 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Wed, 05 Jun 2024 00:00:00 +0000

wazuh-indexer (4.7.5-RELEASE) stable; urgency=low

* More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html

-- Wazuh, Inc <[email protected]> Thu, 30 May 2024 00:00:00 +0000

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

Expand Down
2 changes: 1 addition & 1 deletion stack/indexer/deb/debian/copyright
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
This work was packaged for Debian by:

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

It was downloaded from:

Expand Down
6 changes: 4 additions & 2 deletions stack/indexer/rpm/wazuh-indexer.spec
Original file line number Diff line number Diff line change
Expand Up @@ -681,10 +681,12 @@ rm -fr %{buildroot}


%changelog
* Tue May 14 2024 support <[email protected]> - 4.9.0
* Wed Jul 10 2024 support <[email protected]> - 4.9.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
* Thu May 09 2024 support <[email protected]> - 4.8.0
* Wed Jun 05 2024 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Thu May 30 2024 support <[email protected]> - 4.7.5
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html
* Thu Apr 25 2024 support <[email protected]> - 4.7.4
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
* Tue Feb 27 2024 support <[email protected]> - 4.7.3
Expand Down
9 changes: 8 additions & 1 deletion tests/unattended/install/test_unattended.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,17 @@ def test_check_wazuh_api_status():
@pytest.mark.wazuh
def test_check_log_errors():
found_error = False
exceptions = [
'WARNING: Cluster error detected',
'agent-upgrade: ERROR: (8123): There has been an error executing the request in the tasks manager.',
"ERROR: Could not send message through the cluster after '10' attempts"

]

with open('/var/ossec/logs/ossec.log', 'r') as f:
for line in f.readlines():
if 'ERROR' in line:
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:
if not any(exception in line for exception in exceptions):
found_error = True
break
assert found_error == False, line
Expand Down
8 changes: 4 additions & 4 deletions unattended_installer/install_functions/checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ function check_dist() {

if [ "${DIST_NAME}" == "ubuntu" ]; then
if [ "${DIST_VER}" == "16" ] || [ "${DIST_VER}" == "18" ] ||
[ "${DIST_VER}" == "20" ] || [ "${DIST_VER}" == "22" ] ||
[ "${DIST_VER}" == "20" ] || [ "${DIST_VER}" == "22" ] ||
[ "${DIST_VER}" == "24" ]; then
if [ "${DIST_SUBVER}" != "04" ]; then
notsupported=1
Expand All @@ -246,7 +246,7 @@ function check_dist() {
fi
common_logger -d "Detected distribution name: ${DIST_NAME}"
common_logger -d "Detected distribution version: ${DIST_VER}"

}

function checks_health() {
Expand Down Expand Up @@ -384,11 +384,11 @@ function checks_ports() {
elif [ "${sys_type}" == "apt-get" ]; then
installCommon_aptInstallList "${dep}"
fi

if [ "${#not_installed[@]}" -gt 0 ]; then
wia_dependencies_installed+=("${dep}")
fi

common_logger -d "Checking ports availability."
used_port=0
ports=("$@")
Expand Down
Loading