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

Merged
merged 16 commits into from
Aug 11, 2023
Merged

Merge 4.7.0 into master #938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
673c28b
delete update_from_year parameter
vcerenu Jul 26, 2023
d4c9849
Merge pull request #910 from wazuh/909-deprecate-update_from_year-to-…
vcerenu Jul 26, 2023
1ff589c
add ulimit parameter to wazuh manager deploy
vcerenu Jul 31, 2023
221c3cc
add ulimit parameter to wazuh manager deploy
vcerenu Jul 31, 2023
d755ffb
Merge pull request #914 from wazuh/6282-add-notes-about
teddytpc1 Aug 1, 2023
1eeca62
fix typos in cert generator image
vcerenu Aug 1, 2023
e01d39e
Merge pull request #915 from wazuh/911-typos-in-the-script
teddytpc1 Aug 1, 2023
d20bbe2
Fixed conditional block in images building
davidcr01 Aug 3, 2023
94be842
Restored `IMAGE_VERSION` variable
davidcr01 Aug 3, 2023
32b1d88
Merge pull request #919 from wazuh/917-fix-conditional-block-in-build…
teddytpc1 Aug 3, 2023
757e5db
Updating ossec.conf file with the AlmaLinux support in the vulnerabil…
pereyra-m Aug 7, 2023
1dec665
Merge pull request #925 from wazuh/10774-alma-support
teddytpc1 Aug 9, 2023
e19fa14
Merge pull request #934 from wazuh/merge-4.5-into-4.5.1
davidcr01 Aug 11, 2023
216b5a6
Merge pull request #935 from wazuh/merge-4.5.1-into-4.5.2
davidcr01 Aug 11, 2023
6c91bac
Merge pull request #936 from wazuh/merge-4.5.2-into-4.6.0
davidcr01 Aug 11, 2023
17ed766
Merge pull request #937 from wazuh/merge-4.6.0-into-4.7.0
teddytpc1 Aug 11, 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
8 changes: 1 addition & 7 deletions build-docker-images/build-images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,7 @@ WAZUH_IMAGE_VERSION=4.7.0
WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')
WAZUH_TAG_REVISION=1
WAZUH_CURRENT_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g')

## If wazuh manager exists in apt dev repository, change variables, if not, exit 1
if [ "$WAZUH_VERSION" -le "$WAZUH_CURRENT_VERSION" ]; then
IMAGE_VERSION=${WAZUH_IMAGE_VERSION}
else
IMAGE_VERSION=${WAZUH_IMAGE_VERSION}
fi
IMAGE_VERSION=${WAZUH_IMAGE_VERSION}

echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > .env
echo WAZUH_IMAGE_VERSION=$IMAGE_VERSION >> .env
Expand Down
14 changes: 7 additions & 7 deletions indexer-certs-creator/config/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ CERT_TOOL_PACKAGES_DEV=$(curl --silent -I $PACKAGES_DEV_URL$CERT_TOOL | grep -E

## If cert tool exists in some bucket, download it, if not exit 1
if [ "$CERT_TOOL_PACKAGES" = "200" ]; then
curl -o $CERT_TOOL $PACKAGES_URL$CERT_TOOL
echo "Cert tool exists in Packages bucket"
curl -o $CERT_TOOL $PACKAGES_URL$CERT_TOOL -s
echo "The tool to create the certificates exists in the in Packages bucket"
elif [ "$CERT_TOOL_PACKAGES_DEV" = "200" ]; then
curl -o $CERT_TOOL $PACKAGES_DEV_URL$CERT_TOOL
echo "Cert tool exists in Packages-dev bucket"
curl -o $CERT_TOOL $PACKAGES_DEV_URL$CERT_TOOL -s
echo "The tool to create the certificates exists in Packages-dev bucket"
else
echo "Cert tool does not exist in any bucket"
echo "The tool to create the certificates does not exist in any bucket"
echo "ERROR: certificates were not created"
exit 1
fi
Expand All @@ -41,9 +41,9 @@ source /$CERT_TOOL -A
nodes_server=$( cert_parseYaml /config.yml | grep nodes_server__name | sed 's/nodes_server__name=//' )
node_names=($nodes_server)

echo "Moving created certificates to destination directory"
echo "Moving created certificates to the destination directory"
cp /wazuh-certificates/* /certificates/
echo "changing certificate permissions"
echo "Changing certificate permissions"
chmod -R 500 /certificates
chmod -R 400 /certificates/*
echo "Setting UID indexer and dashboard"
Expand Down
11 changes: 9 additions & 2 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 @@ -150,10 +150,17 @@
<update_interval>1h</update_interval>
</provider>

<!-- Alma Linux OS vulnerabilities -->
<provider name="almalinux">
<enabled>no</enabled>
<os>8</os>
<os>9</os>
<update_interval>1h</update_interval>
</provider>

<!-- Aggregate vulnerabilities -->
<provider name="nvd">
<enabled>yes</enabled>
<update_from_year>2010</update_from_year>
<update_interval>1h</update_interval>
</provider>

Expand Down Expand Up @@ -354,4 +361,4 @@
<location>/var/log/dpkg.log</location>
</localfile>

</ossec_config>
</ossec_config>
11 changes: 9 additions & 2 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 @@ -144,6 +144,14 @@
<update_interval>1h</update_interval>
</provider>

<!-- Alma Linux OS vulnerabilities -->
<provider name="almalinux">
<enabled>no</enabled>
<os>8</os>
<os>9</os>
<update_interval>1h</update_interval>
</provider>

<!-- Windows OS vulnerabilities -->
<provider name="msu">
<enabled>yes</enabled>
Expand All @@ -153,7 +161,6 @@
<!-- Aggregate vulnerabilities -->
<provider name="nvd">
<enabled>yes</enabled>
<update_from_year>2010</update_from_year>
<update_interval>1h</update_interval>
</provider>

Expand Down Expand Up @@ -354,4 +361,4 @@
<location>/var/log/dpkg.log</location>
</localfile>

</ossec_config>
</ossec_config>
14 changes: 14 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 @@ -6,6 +6,13 @@ services:
image: wazuh/wazuh-manager:4.7.0
hostname: wazuh.master
restart: always
ulimits:
memlock:
soft: -1
hard: -1
nofile:
soft: 655360
hard: 655360
ports:
- "1515:1515"
- "514:514/udp"
Expand Down Expand Up @@ -41,6 +48,13 @@ services:
image: wazuh/wazuh-manager:4.7.0
hostname: wazuh.worker
restart: always
ulimits:
memlock:
soft: -1
hard: -1
nofile:
soft: 655360
hard: 655360
environment:
- INDEXER_URL=https://wazuh1.indexer:9200
- INDEXER_USERNAME=admin
Expand Down
9 changes: 8 additions & 1 deletion 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 @@ -144,6 +144,14 @@
<update_interval>1h</update_interval>
</provider>

<!-- Alma Linux OS vulnerabilities -->
<provider name="almalinux">
<enabled>no</enabled>
<os>8</os>
<os>9</os>
<update_interval>1h</update_interval>
</provider>

<!-- Windows OS vulnerabilities -->
<provider name="msu">
<enabled>yes</enabled>
Expand All @@ -153,7 +161,6 @@
<!-- Aggregate vulnerabilities -->
<provider name="nvd">
<enabled>yes</enabled>
<update_from_year>2010</update_from_year>
<update_interval>1h</update_interval>
</provider>

Expand Down
7 changes: 7 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 @@ -6,6 +6,13 @@ services:
image: wazuh/wazuh-manager:4.7.0
hostname: wazuh.manager
restart: always
ulimits:
memlock:
soft: -1
hard: -1
nofile:
soft: 655360
hard: 655360
ports:
- "1514:1514"
- "1515:1515"
Expand Down