Compare commits

..

18 Commits

Author SHA1 Message Date
David Correa Rodríguez
e19fa14013 Merge pull request #934 from wazuh/merge-4.5-into-4.5.1
Merge `4.5` into `4.5.1`
2023-08-11 11:58:49 +02:00
Gonzalo Acuña
e01d39e138 Merge pull request #915 from wazuh/911-typos-in-the-script
Typos in the script in charge of create Wazuh indexer's certificates
2023-08-01 13:50:24 -03:00
vcerenu
1eeca6267b fix typos in cert generator image 2023-08-01 13:07:04 -03:00
Gonzalo Acuña
d755ffbac8 Merge pull request #914 from wazuh/6282-add-notes-about
Modify ulimit
2023-08-01 12:01:13 -03:00
vcerenu
221c3ccd24 add ulimit parameter to wazuh manager deploy 2023-07-31 13:19:13 -03:00
vcerenu
1ff589ccaf add ulimit parameter to wazuh manager deploy 2023-07-31 13:16:15 -03:00
Victor Ereñú
d4c98491fc Merge pull request #910 from wazuh/909-deprecate-update_from_year-to-use-nvd-api-20-feeds
Delete update_from_year parameter
2023-07-26 13:55:52 -03:00
vcerenu
673c28b637 delete update_from_year parameter 2023-07-26 13:40:54 -03:00
Carlos Bordon
1a75d4eb77 Merge pull request #885 from wazuh/merge-4.5.0-into-4.5.1
Merge 4.5.0 into 4.5.1
2023-07-11 11:34:52 -03:00
vcerenu
247555b1b6 resolving merge conflicts 2023-07-11 11:21:00 -03:00
Carlos Bordon
442d457933 Merge pull request #884 from wazuh/merge-4.4-into-4.5.0
Merge 4.4 into 4.5.0
2023-07-11 10:42:52 -03:00
vcerenu
0f65448718 resolving merge conflicts 2023-07-11 09:41:16 -03:00
Victor Ereñú
61c37a78de Merge pull request #874 from wazuh/bump-4-5-1
Bump version 4.5.1
2023-06-26 14:07:42 -03:00
vcerenu
39208c513c bump version 4.5.1 2023-06-26 13:35:29 -03:00
vcerenu
3650feeb0e bump version 4.5.0 2023-06-26 09:40:14 -03:00
Gonzalo Acuña
2340db4079 Merge pull request #865 from wazuh/merge-4.4-into-4.4.5
Merge `4.4` into `4.4.5`
2023-06-14 14:50:59 -03:00
Gonzalo Acuña
9159eda943 Merge branch '4.4.5' into merge-4.4-into-4.4.5 2023-06-14 14:07:23 -03:00
Gonzalo Acuña
41196a5529 Bump to 4.4.5 2023-06-05 11:44:32 -03:00
15 changed files with 62 additions and 32 deletions

4
.env
View File

@@ -1,3 +1,3 @@
WAZUH_VERSION=4.4.5
WAZUH_IMAGE_VERSION=4.4.5
WAZUH_VERSION=4.5.1
WAZUH_IMAGE_VERSION=4.5.1
WAZUH_TAG_REVISION=1

2
.github/.goss.yaml vendored
View File

@@ -56,7 +56,7 @@ package:
wazuh-manager:
installed: true
versions:
- 4.4.5-1
- 4.5.1-1
port:
tcp:1514:
listening: true

View File

@@ -1,6 +1,16 @@
# Change Log
All notable changes to this project will be documented in this file.
## Wazuh Docker v4.5.1
### Added
- Update Wazuh to version [4.5.1](https://github.com/wazuh/wazuh/blob/v4.5.1/CHANGELOG.md#v451)
## Wazuh Docker v4.5.0
### Added
- Update Wazuh to version [4.5.0](https://github.com/wazuh/wazuh/blob/v4.5.0/CHANGELOG.md#v450)
## Wazuh Docker v4.4.5
### Added

View File

@@ -195,6 +195,8 @@ WAZUH_MONITORING_REPLICAS=0 ##
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.5.1 | | |
| v4.5.0 | | |
| v4.4.5 | | |
| v4.4.4 | | |
| v4.4.3 | | |

View File

@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="4.4.5"
REVISION="40413"
WAZUH-DOCKER_VERSION="4.5.1"
REVISION="40501"

View File

@@ -1,4 +1,4 @@
WAZUH_IMAGE_VERSION=4.4.5
WAZUH_IMAGE_VERSION=4.5.1
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')

View File

@@ -9,8 +9,8 @@ export CONFIG_DIR=${INSTALLATION_DIR}/config
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.4/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.4/
PACKAGES_URL=https://packages.wazuh.com/4.5/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/
## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')

View File

@@ -53,8 +53,8 @@ tar -xf ${INDEXER_FILE}
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PASSWORD_TOOL=wazuh-passwords-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.4/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.4/
PACKAGES_URL=https://packages.wazuh.com/4.5/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/
## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')

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.4
ARG TEMPLATE_VERSION=4.5
ARG FILEBEAT_CHANNEL=filebeat-oss
ARG FILEBEAT_VERSION=7.10.2
ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.2.tar.gz"

View File

@@ -8,8 +8,8 @@
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PASSWORD_TOOL=wazuh-passwords-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.4/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.4/
PACKAGES_URL=https://packages.wazuh.com/4.5/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/
## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')
@@ -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
@@ -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"

View File

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

View File

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

View File

@@ -3,9 +3,16 @@ version: '3.7'
services:
wazuh.master:
image: wazuh/wazuh-manager:4.4.5
image: wazuh/wazuh-manager:4.5.1
hostname: wazuh.master
restart: always
ulimits:
memlock:
soft: -1
hard: -1
nofile:
soft: 655360
hard: 655360
ports:
- "1515:1515"
- "514:514/udp"
@@ -38,9 +45,16 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.worker:
image: wazuh/wazuh-manager:4.4.5
image: wazuh/wazuh-manager:4.5.1
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
@@ -67,7 +81,7 @@ services:
- ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
wazuh1.indexer:
image: wazuh/wazuh-indexer:4.4.5
image: wazuh/wazuh-indexer:4.5.1
hostname: wazuh1.indexer
restart: always
ports:
@@ -93,7 +107,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh2.indexer:
image: wazuh/wazuh-indexer:4.4.5
image: wazuh/wazuh-indexer:4.5.1
hostname: wazuh2.indexer
restart: always
environment:
@@ -115,7 +129,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh3.indexer:
image: wazuh/wazuh-indexer:4.4.5
image: wazuh/wazuh-indexer:4.5.1
hostname: wazuh3.indexer
restart: always
environment:
@@ -137,7 +151,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.4.5
image: wazuh/wazuh-dashboard:4.5.1
hostname: wazuh.dashboard
restart: always
ports:

View File

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

View File

@@ -3,9 +3,16 @@ version: '3.7'
services:
wazuh.manager:
image: wazuh/wazuh-manager:4.4.5
image: wazuh/wazuh-manager:4.5.1
hostname: wazuh.manager
restart: always
ulimits:
memlock:
soft: -1
hard: -1
nofile:
soft: 655360
hard: 655360
ports:
- "1514:1514"
- "1515:1515"
@@ -39,7 +46,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.indexer:
image: wazuh/wazuh-indexer:4.4.5
image: wazuh/wazuh-indexer:4.5.1
hostname: wazuh.indexer
restart: always
ports:
@@ -64,7 +71,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/opensearch-security/internal_users.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.4.5
image: wazuh/wazuh-dashboard:4.5.1
hostname: wazuh.dashboard
restart: always
ports: