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.7.0 into 4.7.1 #1010

Merged
merged 12 commits into from
Sep 22, 2023
Merged

Merge 4.7.0 into 4.7.1 #1010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
63817df
add extensions for wazuh.yml
vcerenu Sep 7, 2023
73ada94
Merge pull request #988 from wazuh/987-add-support-to-define-the-defa…
teddytpc1 Sep 8, 2023
de77543
change wazuh template origin
vcerenu Sep 12, 2023
0c6077c
Merge pull request #992 from wazuh/984-build-imagessh-script-is-not-c…
teddytpc1 Sep 13, 2023
5769159
change RBAC database procedure
vcerenu Sep 18, 2023
536dd51
Merge pull request #1000 from wazuh/18966-error-in-wazuh-docker-startup
teddytpc1 Sep 18, 2023
8cc5c8b
Add Amazon Linux 2023 VDT support
Leoquicenoz Sep 2, 2023
149df5e
Merge pull request #973 from wazuh/17617-vdt-alas2023-support
teddytpc1 Sep 21, 2023
7312f86
Merge remote-tracking branch 'origin/4.6.0' into merge-4.6.0-into-4.7.0
davidcr01 Sep 22, 2023
6407325
Merge pull request #1009 from wazuh/merge-4.6.0-into-4.7.0
teddytpc1 Sep 22, 2023
a3e2a2d
Merge remote-tracking branch 'origin/4.7.0' into merge-4.7.0-into-4.7.1
davidcr01 Sep 22, 2023
b3441a6
Updated TEMPLATE_VERSION variable
davidcr01 Sep 22, 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
2 changes: 2 additions & 0 deletions build-docker-images/wazuh-dashboard/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ ENV PATTERN="" \
EXTENSIONS_CISCAT="" \
EXTENSIONS_AWS="" \
EXTENSIONS_GCP="" \
EXTENSIONS_GITHUB=""\
EXTENSIONS_OFFICE=""\
EXTENSIONS_VIRUSTOTAL="" \
EXTENSIONS_OSQUERY="" \
EXTENSIONS_DOCKER="" \
Expand Down
2 changes: 2 additions & 0 deletions build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions 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=4.7
ARG TEMPLATE_VERSION=v4.7.1
ARG FILEBEAT_CHANNEL=filebeat-oss
ARG FILEBEAT_VERSION=7.10.2
ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.2.tar.gz"
Expand Down Expand Up @@ -54,4 +54,4 @@ RUN chmod 755 /permanent_data.sh && \
# Services ports
EXPOSE 55000/tcp 1514/tcp 1515/tcp 514/udp 1516/tcp

ENTRYPOINT [ "/init" ]
ENTRYPOINT [ "/init" ]
4 changes: 2 additions & 2 deletions build-docker-images/wazuh-manager/config/create_user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


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,
Expand Down Expand Up @@ -69,7 +69,7 @@ def disable_user(uid):
username, password = read_user_file()

# create RBAC database
create_rbac_db()
check_database_integrity()

initial_users = db_users()
if username not in initial_users:
Expand Down
1 change: 1 addition & 0 deletions multi-node/config/wazuh_cluster/wazuh_manager.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
1 change: 1 addition & 0 deletions multi-node/config/wazuh_cluster/wazuh_worker.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
1 change: 1 addition & 0 deletions single-node/config/wazuh_cluster/wazuh_manager.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Loading