From 673c28b637ee5611765ebc450752a60c76ae80de Mon Sep 17 00:00:00 2001 From: vcerenu Date: Wed, 26 Jul 2023 13:40:54 -0300 Subject: [PATCH 1/6] delete update_from_year parameter --- multi-node/config/wazuh_cluster/wazuh_manager.conf | 1 - multi-node/config/wazuh_cluster/wazuh_worker.conf | 1 - single-node/config/wazuh_cluster/wazuh_manager.conf | 1 - 3 files changed, 3 deletions(-) diff --git a/multi-node/config/wazuh_cluster/wazuh_manager.conf b/multi-node/config/wazuh_cluster/wazuh_manager.conf index aec223a1..de889f89 100644 --- a/multi-node/config/wazuh_cluster/wazuh_manager.conf +++ b/multi-node/config/wazuh_cluster/wazuh_manager.conf @@ -153,7 +153,6 @@ yes - 2010 1h diff --git a/multi-node/config/wazuh_cluster/wazuh_worker.conf b/multi-node/config/wazuh_cluster/wazuh_worker.conf index 46fceb1e..16cd29bb 100644 --- a/multi-node/config/wazuh_cluster/wazuh_worker.conf +++ b/multi-node/config/wazuh_cluster/wazuh_worker.conf @@ -153,7 +153,6 @@ yes - 2010 1h diff --git a/single-node/config/wazuh_cluster/wazuh_manager.conf b/single-node/config/wazuh_cluster/wazuh_manager.conf index 4db508d6..d71a44ab 100644 --- a/single-node/config/wazuh_cluster/wazuh_manager.conf +++ b/single-node/config/wazuh_cluster/wazuh_manager.conf @@ -153,7 +153,6 @@ yes - 2010 1h From 1ff589ccaf07044b8f5e9f4b87a243d923b81760 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 31 Jul 2023 13:16:15 -0300 Subject: [PATCH 2/6] add ulimit parameter to wazuh manager deploy --- single-node/docker-compose.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 358dece9..3f066fdd 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -6,6 +6,13 @@ services: image: wazuh/wazuh-manager:4.5.0 hostname: wazuh.manager restart: always + ulimits: + memlock: + soft: -1 + hard: -1 + nofile: + soft: 655360 + hard: 655360 ports: - "1514:1514" - "1515:1515" From 221c3ccd2499f2b220bbdd847e2b7f030a8c7f60 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 31 Jul 2023 13:19:13 -0300 Subject: [PATCH 3/6] add ulimit parameter to wazuh manager deploy --- multi-node/docker-compose.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index a8403851..d50271e4 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -6,6 +6,13 @@ services: image: wazuh/wazuh-manager:4.5.0 hostname: wazuh.master restart: always + ulimits: + memlock: + soft: -1 + hard: -1 + nofile: + soft: 655360 + hard: 655360 ports: - "1515:1515" - "514:514/udp" @@ -41,6 +48,13 @@ services: image: wazuh/wazuh-manager:4.5.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 From 1eeca6267b75d129ef717e7e964de7220245bcfc Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 1 Aug 2023 13:07:04 -0300 Subject: [PATCH 4/6] fix typos in cert generator image --- indexer-certs-creator/config/entrypoint.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/indexer-certs-creator/config/entrypoint.sh b/indexer-certs-creator/config/entrypoint.sh index 3ee16ba9..32414bde 100644 --- a/indexer-certs-creator/config/entrypoint.sh +++ b/indexer-certs-creator/config/entrypoint.sh @@ -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" From d20bbe247c959020de34156819f69838425aa38f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 3 Aug 2023 11:45:56 +0200 Subject: [PATCH 5/6] Fixed conditional block in images building --- build-docker-images/build-images.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 5e5e5fec..f6dec2b1 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -3,13 +3,6 @@ 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 - echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > .env echo WAZUH_IMAGE_VERSION=$IMAGE_VERSION >> .env echo WAZUH_TAG_REVISION=$WAZUH_TAG_REVISION >> .env From 94be842afcadd865a8a2443fe1c7ffa20e455581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 3 Aug 2023 11:51:01 +0200 Subject: [PATCH 6/6] Restored `IMAGE_VERSION` variable --- build-docker-images/build-images.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index f6dec2b1..be814f84 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -2,6 +2,7 @@ WAZUH_IMAGE_VERSION=4.5.2 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') +IMAGE_VERSION=${WAZUH_IMAGE_VERSION} echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > .env echo WAZUH_IMAGE_VERSION=$IMAGE_VERSION >> .env