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.5.3 into 4.6.0 #983

Merged
merged 10 commits into from
Sep 7, 2023
Merged

Merge 4.5.3 into 4.6.0 #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
902b0d8
Fixed Wazuh dashboard modules persistency
davidcr01 Aug 28, 2023
e5abd5d
Bump to 4.5.3
davidcr01 Aug 29, 2023
f1d8565
Merge pull request #971 from wazuh/bump-4.5.3
teddytpc1 Aug 29, 2023
8886e23
Merge pull request #968 from wazuh/951-fix-wazuh-dashboard-modules-pe…
teddytpc1 Aug 30, 2023
c0fb417
Bump revision to 40505
davidcr01 Sep 4, 2023
2902a0c
Merge pull request #977 from wazuh/bump-revision-40505
davidjiglesias Sep 4, 2023
0a4c057
Merge branch '4.5.2' into merge-4.5.2-into-4.5.3
davidcr01 Sep 7, 2023
1fae0d3
Merge pull request #982 from wazuh/merge-4.5.2-into-4.5.3
teddytpc1 Sep 7, 2023
9a871db
Merge branch '4.5.3' into merge-4.5.3-into-4.6.0
davidcr01 Sep 7, 2023
b18c068
Added empty line to changelog
davidcr01 Sep 7, 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 @@ -6,6 +6,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.3
teddytpc1 marked this conversation as resolved.
Show resolved Hide resolved
### Added

- Update Wazuh to version [4.5.3](https://github.com/wazuh/wazuh/blob/v4.5.3/CHANGELOG.md#v453)

## Wazuh Docker v4.5.2
### 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 @@ -196,6 +196,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.6.0 | | |
| v4.5.3 | | |
| v4.5.2 | | |
| v4.5.1 | | |
| v4.5.0 | | |
Expand Down
2 changes: 2 additions & 0 deletions multi-node/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ services:
- ./config/wazuh_indexer_ssl_certs/wazuh.dashboard-key.pem:/usr/share/wazuh-dashboard/certs/wazuh-dashboard-key.pem
- ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-dashboard/certs/root-ca.pem
- ./config/wazuh_dashboard/opensearch_dashboards.yml:/usr/share/wazuh-dashboard/config/opensearch_dashboards.yml
- wazuh-dashboard-config:/usr/share/wazuh-dashboard/data/wazuh/config
- ./config/wazuh_dashboard/wazuh.yml:/usr/share/wazuh-dashboard/data/wazuh/config/wazuh.yml
depends_on:
- wazuh1.indexer
Expand Down Expand Up @@ -218,3 +219,4 @@ volumes:
wazuh-indexer-data-1:
wazuh-indexer-data-2:
wazuh-indexer-data-3:
wazuh-dashboard-config:
2 changes: 2 additions & 0 deletions single-node/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ services:
- ./config/wazuh_indexer_ssl_certs/wazuh.dashboard-key.pem:/usr/share/wazuh-dashboard/certs/wazuh-dashboard-key.pem
- ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-dashboard/certs/root-ca.pem
- ./config/wazuh_dashboard/opensearch_dashboards.yml:/usr/share/wazuh-dashboard/config/opensearch_dashboards.yml
- wazuh-dashboard-config:/usr/share/wazuh-dashboard/data/wazuh/config
- ./config/wazuh_dashboard/wazuh.yml:/usr/share/wazuh-dashboard/data/wazuh/config/wazuh.yml
depends_on:
- wazuh.indexer
Expand All @@ -109,3 +110,4 @@ volumes:
filebeat_etc:
filebeat_var:
wazuh-indexer-data:
wazuh-dashboard-config:
Loading