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 master #1069

Merged
merged 15 commits into from
Oct 23, 2023
Merged

Merge 4.8.0 into master #1069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
aee83a1
Bump revision to 40701
davidcr01 Oct 13, 2023
0f1cc4b
Merge pull request #1053 from wazuh/bump-revision-40701
davidcr01 Oct 13, 2023
523a28b
Fixed Filebeat template bug in image generation
davidcr01 Oct 16, 2023
5106715
bump 4.5.4 version
vcerenu Oct 17, 2023
b8ff013
Merge pull request #1056 from wazuh/bug/1054-the-images-build-fails-d…
teddytpc1 Oct 17, 2023
0cd9876
Removed value of Filebeat template variable
davidcr01 Oct 17, 2023
6056372
Merge pull request #1059 from wazuh/bug/1054-remove-filebeat-template…
teddytpc1 Oct 17, 2023
c46b1c0
resolving conflicts
vcerenu Oct 23, 2023
05ef9b8
Merge pull request #1065 from wazuh/merge-4.5.4-into-4.6.0
vcerenu Oct 23, 2023
0c7d298
Merge pull request #1066 from wazuh/merge-4.6.0-into-4.7.0
vcerenu Oct 23, 2023
781e6a4
resolving conflicts
vcerenu Oct 23, 2023
d45e2d9
resolving conflicts
vcerenu Oct 23, 2023
c4d6a25
Merge pull request #1067 from wazuh/merge-4.7.0-into-4.7.1
vcerenu Oct 23, 2023
274c0bc
resolving conflicts
vcerenu Oct 23, 2023
4061858
Merge pull request #1068 from wazuh/merge-4.7.1-into-4.8.0
vcerenu Oct 23, 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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ All notable changes to this project will be documented in this file.

- Update Wazuh to version [4.6.0](https://github.com/wazuh/wazuh/blob/v4.6.0/CHANGELOG.md#v460)

## Wazuh Docker v4.5.4
### Added

- Update Wazuh to version [4.5.4](https://github.com/wazuh/wazuh/blob/v4.5.4/CHANGELOG.md#v454)

## Wazuh Docker v4.5.3
### Added

Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
| v4.7.1 | | |
| v4.7.0 | | |
| v4.6.0 | | |
| v4.5.4 | | |
| v4.5.3 | | |
| v4.5.2 | | |
| v4.5.1 | | |
Expand Down
2 changes: 1 addition & 1 deletion build-docker-images/wazuh-manager/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RUN rm /bin/sh && ln -s /bin/bash /bin/sh

ARG WAZUH_VERSION
ARG WAZUH_TAG_REVISION
ARG TEMPLATE_VERSION=v4.8.0
ARG FILEBEAT_TEMPLATE_BRANCH
ARG FILEBEAT_CHANNEL=filebeat-oss
ARG FILEBEAT_VERSION=7.10.2
ARG WAZUH_FILEBEAT_MODULE
Expand Down
Loading