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.

Sign up for GitHub

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.8.1 #2679

Merged
merged 33 commits into from
Dec 12, 2023
Merged

Merge 4.8.0 into 4.8.1 #2679

Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
8e54bf0
feat(wazuh-dashboard): add branding image to headers
Desvelao Nov 20, 2023
bcb2ed0
fix(dashboard): loading logos
Desvelao Nov 22, 2023
2ce5e02
Merge branch '4.8.0' into fix/2608-add-branding-images-headers
Desvelao Nov 23, 2023
f2c23f9
fix: remove dot in customization file of Wazuh dashboard
Desvelao Nov 27, 2023
62d01b2
Merge branch 'fix/2608-add-branding-images-headers' of https://github…
Desvelao Nov 27, 2023
e6da658
fix(#2654): duplicated script delete
pro-akim Nov 27, 2023
73781fc
fix: remove .md file
Desvelao Nov 27, 2023
4b4f6b9
feat(dashboard): collapse initially the application categories in the…
Desvelao Nov 29, 2023
a19250f
Merge pull request #2646 from wazuh/bug/2637-Duplicate-code-indexer-p…
davidjiglesias Nov 29, 2023
18304b5
Bump version to 4.7.2
vikman90 Nov 30, 2023
8b9bb1b
Merge pull request #2659 from wazuh/change/2658-bump-version
vikman90 Nov 30, 2023
3dbb037
Merge pull request #2615 from wazuh/fix/2608-add-branding-images-headers
asteriscos Dec 1, 2023
45610bf
Merge pull request #2653 from wazuh/feat/collapse-initially-applicati…
asteriscos Dec 1, 2023
1a0ab5a
WIA dependencies fix
c-bordon Dec 5, 2023
8b126ba
Added new variable to contemplate product dependencies
c-bordon Dec 5, 2023
eabfdc0
Fixed validation for dependencies packages
c-bordon Dec 5, 2023
ba6b5a8
Fixed wia dependencies variable
c-bordon Dec 5, 2023
b656ffe
Update release ETA for 4.8.0
Dwordcito Dec 6, 2023
0587770
Merge pull request #2666 from wazuh/operational/2664-change-etas
Dwordcito Dec 6, 2023
bd6b451
Fixed warning message when generating certificates
davidcr01 Dec 7, 2023
bb5f6f7
fix: upgrade botocore dependency
Rebits Dec 7, 2023
65a30f4
Merge pull request #2667 from wazuh/bug/2661-not-generating-a-certifi…
teddytpc1 Dec 7, 2023
f6c093b
Added remove for generate config and start cluster functions
c-bordon Dec 7, 2023
1d83007
Merge pull request #2670 from wazuh/change/2660-libtirpc-is-installed…
teddytpc1 Dec 7, 2023
eaf77a8
Merge pull request #2669 from wazuh/2668-fix-wpk-linux
davidjiglesias Dec 11, 2023
c45d90e
The source_branch variable is set dinamically
davidcr01 Dec 11, 2023
e4b564b
Merge pull request #2676 from wazuh/bug/2674-source-branch-variable-d…
teddytpc1 Dec 11, 2023
51f3f4b
Merge 4.7.2 with 4.8.0
c-bordon Dec 11, 2023
25d0043
Some conflicts were resolved
c-bordon Dec 11, 2023
c0b1844
Merge pull request #2678 from wazuh/Merge-4.7.2-into-4.8.0
teddytpc1 Dec 12, 2023
10b5237
Merge 4.8.0 into 4.8.1
c-bordon Dec 12, 2023
ee7952c
Removed `gnupg` from RPM dependency list
davidcr01 Dec 11, 2023
e975666
Updated release date
c-bordon Dec 12, 2023
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,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.2]

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

## [4.7.1]

- https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.1
Expand Down
2 changes: 2 additions & 0 deletions aix/SPECS/wazuh-agent-aix.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,8 @@ rm -fr %{buildroot}
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
* Fri Dec 15 2023 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Sun Dec 17 2023 support <[email protected]> - 4.7.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
* Tue Dec 05 2023 support <[email protected]> - 4.7.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html
* Tue Nov 21 2023 support <[email protected]> - 4.7.0
Expand Down
9 changes: 8 additions & 1 deletion debs/SPECS/wazuh-agent/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,14 @@ 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]> Fri, 15 Dec 2023 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Wed, 31 Jan 2024 00:00:00 +0000

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

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

-- Wazuh, Inc <[email protected]> Sun, 17 Dec 2023 00:00:00 +0000

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

* More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html
Expand Down
9 changes: 8 additions & 1 deletion debs/SPECS/wazuh-manager/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,14 @@ 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]> Fri, 15 Dec 2023 00:00:00 +0000
-- Wazuh, Inc <[email protected]> Wed, 31 Jan 2024 00:00:00 +0000

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

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

-- Wazuh, Inc <[email protected]> Sun, 17 Dec 2023 00:00:00 +0000

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

* More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html
Expand Down
2 changes: 2 additions & 0 deletions rpms/SPECS/wazuh-agent.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,6 +629,8 @@ rm -fr %{buildroot}
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
* Fri Dec 15 2023 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Sun Dec 17 2023 support <[email protected]> - 4.7.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
* Tue Dec 05 2023 support <[email protected]> - 4.7.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html
* Tue Nov 21 2023 support <[email protected]> - 4.7.0
Expand Down
2 changes: 2 additions & 0 deletions rpms/SPECS/wazuh-manager.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,6 +857,8 @@ rm -fr %{buildroot}
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
* Fri Dec 15 2023 support <[email protected]> - 4.8.0
- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
* Sun Dec 17 2023 support <[email protected]> - 4.7.2
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
* Tue Dec 05 2023 support <[email protected]> - 4.7.1
- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html
* Tue Nov 21 2023 support <[email protected]> - 4.7.0
Expand Down
30 changes: 5 additions & 25 deletions stack/dashboard/base/builder.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,8 @@ sed -i 's/exec "${NODE}"/NODE_ENV=production exec "${NODE}" ${NODE_OPTIONS} /g'
cp ./etc/custom_welcome/template.js.hbs ./src/legacy/ui/ui_render/bootstrap/template.js.hbs
cp ./etc/custom_welcome/light_theme.style.css ./src/core/server/core_app/assets/legacy_light_theme.css
# SVG
cp ./etc/custom_welcome/*svg ./src/core/server/core_app/assets/logos/
cp ./etc/custom_welcome/Assets/default_branding/*svg ./src/core/server/core_app/assets/logos/
# Copy Home button
cp ./etc/custom_welcome/Assets/default_branding/home.svg ./src/core/server/core_app/assets/logos/
cp ./etc/custom_welcome/Assets/default_branding/home_dark_mode.svg ./src/core/server/core_app/assets/logos/
# Copy favicons
cp ./etc/custom_welcome/Assets/Favicons/* ./src/core/server/core_app/assets/favicons/
cp ./etc/custom_welcome/Assets/Favicons/favicon.ico ./src/core/server/core_app/assets/favicons/favicon.ico
Expand All @@ -116,11 +114,6 @@ cp ./etc/styles.js ./src/core/server/rendering/views/styles.js
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

## Remove OpenSearch from the upper bar with empty svg
cp ./etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg ./src/core/server/core_app/assets/logos/opensearch_dashboards.svg
cp ./etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg ./src/core/server/core_app/assets/logos/opensearch_dashboards_on_light.svg
cp ./etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg ./src/core/server/core_app/assets/logos/opensearch_dashboards_on_dark.svg

# Remove the `home` button from the sidebar menu
sed -i 's|\["EuiHorizontalRule"\],{margin:"none"})),external_osdSharedDeps_React_default.a.createElement(external_osdSharedDeps_ElasticEui_\["EuiFlexItem"\],{grow:false,style:{flexShrink:0}},external_osdSharedDeps_React_default.a.createElement(external_osdSharedDeps_ElasticEui_\["EuiCollapsibleNavGroup"\]|["EuiHorizontalRule"],{margin:"none"})),false\&\&external_osdSharedDeps_React_default.a.createElem(external_osdSharedDeps_ElasticEui_["EuiFlexItem"],{grow:false,style:{flexShrink:0}},external_osdSharedDeps_React_default.a.createElement(external_osdSharedDeps_ElasticEui_["EuiCollapsibleNavGroup"]|' ./src/core/target/public/core.entry.js

Expand Down Expand Up @@ -158,24 +151,11 @@ sed -i 's|https://survey.opensearch.org|https://wazuh.com/community/join-us-on-s
sed -i 's|GITHUB_CREATE_ISSUE_LINK="https://github.com/opensearch-project/OpenSearch-Dashboards/issues/new/choose"|GITHUB_CREATE_ISSUE_LINK="https://github.com/wazuh/wazuh/issues/new/choose"|' ./src/core/target/public/core.entry.js

# Custom logos
## Custom logos - Home button logo
sed -i 's|MARK_THEMED="ui/logos/opensearch_mark.svg"|MARK_THEMED="ui/logos/home.svg"|g' ./src/core/target/public/core.entry.js
sed -i 's|MARK_ON_LIGHT="ui/logos/opensearch_mark_on_light.svg"|MARK_ON_LIGHT="ui/logos/home.svg"|g' ./src/core/target/public/core.entry.js
sed -i 's|MARK_ON_DARK="ui/logos/opensearch_mark_on_dark.svg"|MARK_ON_DARK="ui/logos/home_dark_mode.svg"|g' ./src/core/target/public/core.entry.js
sed -i 's|MARK_THEMED="ui/logos/opensearch_mark.svg"|MARK_THEMED="ui/logos/home.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js
sed -i 's|MARK_ON_LIGHT="ui/logos/opensearch_mark_on_light.svg"|MARK_ON_LIGHT="ui/logos/home.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js
sed -i 's|MARK_ON_DARK="ui/logos/opensearch_mark_on_dark.svg"|MARK_ON_DARK="ui/logos/home_dark_mode.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js
## Custom logos - Login logo
sed -i 's|OPENSEARCH_ON_LIGHT="ui/logos/opensearch_on_light.svg"|OPENSEARCH_ON_LIGHT="ui/logos/Wazuh-Logo.svg"|g' ./plugins/alertingDashboards/target/public/alertingDashboards.plugin.js
sed -i 's|OPENSEARCH_ON_DARK="ui/logos/opensearch_on_dark.svg"|OPENSEARCH_ON_DARK="ui/logos/Wazuh-Logo.svg"|g' ./plugins/alertingDashboards/target/public/alertingDashboards.plugin.js
sed -i 's|OPENSEARCH_ON_LIGHT="ui/logos/opensearch_on_light.svg"|OPENSEARCH_ON_LIGHT="ui/logos/Wazuh-Logo.svg"|g' ./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js
sed -i 's|OPENSEARCH_ON_DARK="ui/logos/opensearch_on_dark.svg"|OPENSEARCH_ON_DARK="ui/logos/Wazuh-Logo.svg"|g' ./plugins/indexManagementDashboards/target/public/indexManagementDashboards.plugin.js
sed -i 's|OPENSEARCH_ON_LIGHT="ui/logos/opensearch_on_light.svg"|OPENSEARCH_ON_LIGHT="ui/logos/Wazuh-Logo.svg"|g' ./plugins/notificationsDashboards/target/public/notificationsDashboards.plugin.js
sed -i 's|OPENSEARCH_ON_DARK="ui/logos/opensearch_on_dark.svg"|OPENSEARCH_ON_DARK="ui/logos/Wazuh-Logo.svg"|g' ./plugins/notificationsDashboards/target/public/notificationsDashboards.plugin.js
sed -i 's|OPENSEARCH_ON_LIGHT="ui/logos/opensearch_on_light.svg"|OPENSEARCH_ON_LIGHT="ui/logos/Wazuh-Logo.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js
sed -i 's|OPENSEARCH_ON_DARK="ui/logos/opensearch_on_dark.svg"|OPENSEARCH_ON_DARK="ui/logos/Wazuh-Logo.svg"|g' ./plugins/securityDashboards/target/public/securityDashboards.plugin.js
sed -i 's|OPENSEARCH_ON_LIGHT="ui/logos/opensearch_on_light.svg"|OPENSEARCH_ON_LIGHT="ui/logos/Wazuh-Logo.svg"|g' ./src/core/target/public/core.entry.js
sed -i 's|OPENSEARCH_ON_DARK="ui/logos/opensearch_on_dark.svg"|OPENSEARCH_ON_DARK="ui/logos/Wazuh-Logo.svg"|g' ./src/core/target/public/core.entry.js
sed -i 's|props.chrome.logos.OpenSearch.url|props.http.basePath.prepend("/ui/logos/wazuh_dashboard_login_mark.svg")|g' ./plugins/securityDashboards/target/public/securityDashboards.chunk.5.js

# Collapse initially the application categories in the side menu
sed -i 's|_storage\$getItem!==void 0?_storage\$getItem:"true"|_storage\$getItem!==void 0?_storage\$getItem:"false"|' ./src/core/target/public/core.entry.js

# Redirections
## Redirections - Replace the redirections to the home app
Expand Down
7 changes: 0 additions & 7 deletions stack/dashboard/base/files/etc/custom_welcome/Assets/default_branding/home.svg
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions ...hboard/base/files/etc/custom_welcome/Assets/default_branding/home_dark_mode.svg
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions ...board/base/files/etc/custom_welcome/Assets/default_branding/logo_full_alpha.svg
View file
Open in desktop

This file was deleted.

0 ...ault_branding/wazuh_mark_default_mode.svg → ...me/Assets/default_branding/opensearch.svg
View file
Open in desktop
File renamed without changes
13 changes: 13 additions & 0 deletions ...ase/files/etc/custom_welcome/Assets/default_branding/opensearch_center_mark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ...default_branding/wazuh_mark_dark_mode.svg → ..._branding/opensearch_center_mark_dark.svg
View file
Open in desktop
File renamed without changes
32 changes: 32 additions & 0 deletions ...es/etc/custom_welcome/Assets/default_branding/opensearch_dashboards_on_dark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions ...s/etc/custom_welcome/Assets/default_branding/opensearch_dashboards_on_light.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions ...board/base/files/etc/custom_welcome/Assets/default_branding/opensearch_mark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions ...se/files/etc/custom_welcome/Assets/default_branding/opensearch_mark_on_dark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions ...e/files/etc/custom_welcome/Assets/default_branding/opensearch_mark_on_light.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions ...rd/base/files/etc/custom_welcome/Assets/default_branding/opensearch_on_dark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions ...d/base/files/etc/custom_welcome/Assets/default_branding/opensearch_on_light.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading