paulmataruso/wazuh-docker-mirror
1
0
Fork 0
mirror of https://github.com/wazuh/wazuh-docker.git synced 2025-10-23 04:51:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1011 from wazuh/merge-4.7.1-into-master

Browse Source 
Merge 4.7.1 into master
This commit is contained in:
Gonzalo Acuña
2023-09-22 07:48:54 -03:00
committed by GitHub
parent 8fbda5afd3 d8f7fd6767
commit 69868c0c70
9 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@@ -6,6 +6,11 @@ All notable changes to this project will be documented in this file.
- Update Wazuh to version [4.8.0](https://github.com/wazuh/wazuh/blob/v4.8.0/CHANGELOG.md#v480)
## Wazuh Docker v4.7.1
### Added
- Update Wazuh to version [4.7.1](https://github.com/wazuh/wazuh/blob/v4.7.1/CHANGELOG.md#v471)
## Wazuh Docker v4.7.0
### Added

1
README.md
View File

@@ -196,6 +196,7 @@ WAZUH_MONITORING_REPLICAS=0 ##
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.8.0 | | |
| v4.7.1 | | |
| v4.7.0 | | |
| v4.6.0 | | |
| v4.5.3 | | |

2
build-docker-images/wazuh-dashboard/Dockerfile
View File

@@ -66,6 +66,8 @@ ENV PATTERN="" \
EXTENSIONS_CISCAT="" \
EXTENSIONS_AWS="" \
EXTENSIONS_GCP="" \
EXTENSIONS_GITHUB=""\
EXTENSIONS_OFFICE=""\
EXTENSIONS_VIRUSTOTAL="" \
EXTENSIONS_OSQUERY="" \
EXTENSIONS_DOCKER="" \

2
build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh
View File

@@ -25,6 +25,8 @@ declare -A CONFIG_MAP=(
[extensions.ciscat]=$EXTENSIONS_CISCAT
[extensions.aws]=$EXTENSIONS_AWS
[extensions.gcp]=$EXTENSIONS_GCP
[extensions.github]=$EXTENSIONS_GITHUB
[extensions.office]=$EXTENSIONS_OFFICE
[extensions.virustotal]=$EXTENSIONS_VIRUSTOTAL
[extensions.osquery]=$EXTENSIONS_OSQUERY
[extensions.docker]=$EXTENSIONS_DOCKER

2
build-docker-images/wazuh-manager/Dockerfile
View File

@@ -5,7 +5,7 @@ RUN rm /bin/sh && ln -s /bin/bash /bin/sh
ARG WAZUH_VERSION
ARG WAZUH_TAG_REVISION
ARG TEMPLATE_VERSION=4.8
ARG TEMPLATE_VERSION=v4.8.0
ARG FILEBEAT_CHANNEL=filebeat-oss
ARG FILEBEAT_VERSION=7.10.2
ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.2.tar.gz"

4
build-docker-images/wazuh-manager/config/create_user.py
View File

@@ -13,7 +13,7 @@ SPECIAL_CHARS = "@$!%*?&-_"
try:
from wazuh.rbac.orm import create_rbac_db
from wazuh.rbac.orm import check_database_integrity
from wazuh.security import (
create_user,
get_users,
@@ -69,7 +69,7 @@ if __name__ == "__main__":
username, password = read_user_file()
# create RBAC database
create_rbac_db()
check_database_integrity()
initial_users = db_users()
if username not in initial_users:

1
multi-node/config/wazuh_cluster/wazuh_manager.conf
View File

@@ -137,6 +137,7 @@
<enabled>no</enabled>
<os>amazon-linux</os>
<os>amazon-linux-2</os>
<os>amazon-linux-2023</os>
<update_interval>1h</update_interval>
</provider>

1
multi-node/config/wazuh_cluster/wazuh_worker.conf
View File

@@ -137,6 +137,7 @@
<enabled>no</enabled>
<os>amazon-linux</os>
<os>amazon-linux-2</os>
<os>amazon-linux-2023</os>
<update_interval>1h</update_interval>
</provider>

1
single-node/config/wazuh_cluster/wazuh_manager.conf
View File

@@ -137,6 +137,7 @@
<enabled>no</enabled>
<os>amazon-linux</os>
<os>amazon-linux-2</os>
<os>amazon-linux-2023</os>
<update_interval>1h</update_interval>
</provider>