From e3e81a4671c5f965bc7423494374806d6253219a Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Mon, 17 Dec 2018 11:14:34 +0100 Subject: [PATCH 01/12] Update Wazuh-Docker to 3.7.1_6.5.3 --- README.md | 2 +- docker-compose.yml | 10 +++++----- kibana/Dockerfile | 4 ++-- logstash/Dockerfile | 2 +- wazuh/Dockerfile | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 0004ec03..ac911356 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ In addition, a docker-compose file is provided to launch the containers mentione ## Current release -Containers are currently tested on Wazuh version 3.7.0 and Elastic Stack version 6.4.3. We will do our best to keep this repository updated to latest versions of both Wazuh and Elastic Stack. +Containers are currently tested on Wazuh version 3.7.1 and Elastic Stack version 6.5.3. We will do our best to keep this repository updated to latest versions of both Wazuh and Elastic Stack. ## Directory structure diff --git a/docker-compose.yml b/docker-compose.yml index a8097db1..ba4a946e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: wazuh: - image: wazuh/wazuh:3.7.0_6.5.0 + image: wazuh/wazuh:3.7.1_6.5.3 hostname: wazuh-manager restart: always ports: @@ -23,7 +23,7 @@ services: depends_on: - logstash logstash: - image: wazuh/wazuh-logstash:3.7.0_6.5.0 + image: wazuh/wazuh-logstash:3.7.1_6.5.3 hostname: logstash restart: always # volumes: @@ -39,7 +39,7 @@ services: environment: - LS_HEAP_SIZE=2048m elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:6.5.0 + image: docker.elastic.co/elasticsearch/elasticsearch:6.5.3 hostname: elasticsearch restart: always ports: @@ -61,7 +61,7 @@ services: networks: - docker_elk kibana: - image: wazuh/wazuh-kibana:3.7.0_6.5.0 + image: wazuh/wazuh-kibana:3.7.1_6.5.3 hostname: kibana restart: always # ports: @@ -76,7 +76,7 @@ services: - elasticsearch:elasticsearch - wazuh:wazuh nginx: - image: wazuh/wazuh-nginx:3.7.0_6.5.0 + image: wazuh/wazuh-nginx:3.7.1_6.5.3 hostname: nginx restart: always environment: diff --git a/kibana/Dockerfile b/kibana/Dockerfile index 7830e2ba..193cf5e0 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,6 +1,6 @@ # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/kibana/kibana:6.5.0 -ARG WAZUH_APP_VERSION=3.7.0_6.5.0 +FROM docker.elastic.co/kibana/kibana:6.5.3 +ARG WAZUH_APP_VERSION=3.7.1_6.5.3 USER root ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp diff --git a/logstash/Dockerfile b/logstash/Dockerfile index f46abd20..641214a5 100644 --- a/logstash/Dockerfile +++ b/logstash/Dockerfile @@ -1,5 +1,5 @@ # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/logstash/logstash:6.5.0 +FROM docker.elastic.co/logstash/logstash:6.5.3 RUN rm -f /usr/share/logstash/pipeline/logstash.conf diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index a5010f43..be3fdf34 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) FROM phusion/baseimage:latest -ARG FILEBEAT_VERSION=6.5.0 -ARG WAZUH_VERSION=3.7.0-1 +ARG FILEBEAT_VERSION=6.5.3 +ARG WAZUH_VERSION=3.7.1-1 # Updating image RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" From 16335e1f70d7b8f5923bdca3353efbf9bf00f2e7 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Mon, 17 Dec 2018 11:19:26 +0100 Subject: [PATCH 02/12] Bump version 3726 --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 6730df22..3be4a99f 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="3.7.0_6.5.0" -REVISION="3701" +WAZUH-DOCKER_VERSION="3.7.1_6.5.3" +REVISION="3726" From cd0d180c93d78fc5047229442dec75031dcb2f52 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Tue, 18 Dec 2018 18:28:02 +0100 Subject: [PATCH 03/12] Update Wazuh version 3.7.2 --- README.md | 2 +- docker-compose.yml | 8 ++++---- kibana/Dockerfile | 2 +- wazuh/Dockerfile | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ac911356..cb579786 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ In addition, a docker-compose file is provided to launch the containers mentione ## Current release -Containers are currently tested on Wazuh version 3.7.1 and Elastic Stack version 6.5.3. We will do our best to keep this repository updated to latest versions of both Wazuh and Elastic Stack. +Containers are currently tested on Wazuh version 3.7.2 and Elastic Stack version 6.5.3. We will do our best to keep this repository updated to latest versions of both Wazuh and Elastic Stack. ## Directory structure diff --git a/docker-compose.yml b/docker-compose.yml index ba4a946e..c3409ddd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: wazuh: - image: wazuh/wazuh:3.7.1_6.5.3 + image: wazuh/wazuh:3.7.2_6.5.3 hostname: wazuh-manager restart: always ports: @@ -23,7 +23,7 @@ services: depends_on: - logstash logstash: - image: wazuh/wazuh-logstash:3.7.1_6.5.3 + image: wazuh/wazuh-logstash:3.7.2_6.5.3 hostname: logstash restart: always # volumes: @@ -61,7 +61,7 @@ services: networks: - docker_elk kibana: - image: wazuh/wazuh-kibana:3.7.1_6.5.3 + image: wazuh/wazuh-kibana:3.7.2_6.5.3 hostname: kibana restart: always # ports: @@ -76,7 +76,7 @@ services: - elasticsearch:elasticsearch - wazuh:wazuh nginx: - image: wazuh/wazuh-nginx:3.7.1_6.5.3 + image: wazuh/wazuh-nginx:3.7.2_6.5.3 hostname: nginx restart: always environment: diff --git a/kibana/Dockerfile b/kibana/Dockerfile index 193cf5e0..c1435ee7 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,6 +1,6 @@ # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) FROM docker.elastic.co/kibana/kibana:6.5.3 -ARG WAZUH_APP_VERSION=3.7.1_6.5.3 +ARG WAZUH_APP_VERSION=3.7.2_6.5.3 USER root ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index be3fdf34..32ff379e 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -1,7 +1,7 @@ # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) FROM phusion/baseimage:latest ARG FILEBEAT_VERSION=6.5.3 -ARG WAZUH_VERSION=3.7.1-1 +ARG WAZUH_VERSION=3.7.2-1 # Updating image RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" From 7cce0d9c9e1e541f0e98c9d07ca258d2a5de0f7d Mon Sep 17 00:00:00 2001 From: LuisGi93 Date: Wed, 19 Dec 2018 20:05:33 +0100 Subject: [PATCH 04/12] entrypoint.sh updated so docker upgrade is posible --- wazuh/config/entrypoint.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/wazuh/config/entrypoint.sh b/wazuh/config/entrypoint.sh index df3266e4..760fd158 100644 --- a/wazuh/config/entrypoint.sh +++ b/wazuh/config/entrypoint.sh @@ -53,6 +53,12 @@ for ossecdir in "${DATA_DIRS[@]}"; do fi done +if [ -e ${WAZUH_INSTALL_PATH}/etc-template ] +then + cp -p /var/ossec/etc-template/internal_options.conf /var/ossec/etc/internal_options.conf +fi +rm /var/ossec/queue/db/.template.db + touch ${DATA_PATH}/process_list chgrp ossec ${DATA_PATH}/process_list chmod g+rw ${DATA_PATH}/process_list From 608b25df4c7773dd0a2e62b472cd3c98fecaf15e Mon Sep 17 00:00:00 2001 From: cadoming Date: Thu, 20 Dec 2018 12:02:14 +0000 Subject: [PATCH 05/12] erasing temporary fix for AWS integration --- wazuh/Dockerfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index 32ff379e..ccbbf5ba 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -76,11 +76,6 @@ RUN mkdir /etc/service/filebeat COPY config/filebeat.runit.service /etc/service/filebeat/run RUN chmod +x /etc/service/filebeat/run -# Temporary fix for AWS integration -RUN sed -i 's/.*with open*/#wiht open/' /var/ossec/wodles/aws/aws-s3 -RUN sed -i 's/.*max_queue_buffer = int(kernel_param.read().strip())*/#max_queue_buffer/' /var/ossec/wodles/aws/aws-s3 -RUN sed -i '784imax_queue_buffer = 0' /var/ossec/wodles/aws/aws-s3 -RUN sed -i '784s/^/ /' /var/ossec/wodles/aws/aws-s3 # Run all services ENTRYPOINT ["/entrypoint.sh"] From 458bfcde09432514208832ff9dc76532ca0ae364 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 20 Dec 2018 13:21:16 +0100 Subject: [PATCH 06/12] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62886cd1..98cb7206 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. ## Wazuh Docker v3.7.0_6.5.0 +### Fixed + +- entrypoint.sh updated so docker upgrade is posible ([#80](https://github.com/wazuh/wazuh-docker/pull/80)) + +## Wazuh Docker v3.7.0_6.5.0 + ### Changed - Adapt to Elastic stack 6.5.0. From 77f123460e715cfb200434bce1d4e8de8f81af86 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 20 Dec 2018 13:21:33 +0100 Subject: [PATCH 07/12] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98cb7206..84e8d34c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Change Log All notable changes to this project will be documented in this file. -## Wazuh Docker v3.7.0_6.5.0 +## Wazuh Docker v3.7.2_6.5.3 ### Fixed From 49663b71bb58d7c3620f169199753a0214b9a7ee Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 20 Dec 2018 13:22:08 +0100 Subject: [PATCH 08/12] Update VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 3be4a99f..fd9f4af7 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="3.7.1_6.5.3" -REVISION="3726" +WAZUH-DOCKER_VERSION="3.7.2_6.5.3" +REVISION="3727" From edd2e250e8fdb2390047d290ad8c1496be11fe39 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 20 Dec 2018 13:24:48 +0100 Subject: [PATCH 09/12] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84e8d34c..0332c691 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. ## Wazuh Docker v3.7.2_6.5.3 +### Changed + +- Erasing temporary fix for AWS integration #81 + ### Fixed - entrypoint.sh updated so docker upgrade is posible ([#80](https://github.com/wazuh/wazuh-docker/pull/80)) From 05fa996ffda60dd81b4c54175fe15c81f7445e86 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 20 Dec 2018 13:25:36 +0100 Subject: [PATCH 10/12] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0332c691..e04230df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Erasing temporary fix for AWS integration #81 +- Erasing temporary fix for AWS integration ([#81](https://github.com/wazuh/wazuh-docker/pull/81)) ### Fixed From 40a74df00d393ca73ad98a868f9f99244655bc04 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 20 Dec 2018 13:26:02 +0100 Subject: [PATCH 11/12] Bump version 3728 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index fd9f4af7..f0bea7ad 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="3.7.2_6.5.3" -REVISION="3727" +REVISION="3728" From 2a03d08a5b1974eef9d6b67e2f9e4777de8458fd Mon Sep 17 00:00:00 2001 From: Jesus Linares Date: Thu, 20 Dec 2018 11:39:23 -0500 Subject: [PATCH 12/12] Update changelog --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e04230df..91f026ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,12 @@ All notable changes to this project will be documented in this file. ### Changed -- Erasing temporary fix for AWS integration ([#81](https://github.com/wazuh/wazuh-docker/pull/81)) +- Erasing temporary fix for AWS integration. ([#81](https://github.com/wazuh/wazuh-docker/pull/81)) ### Fixed -- entrypoint.sh updated so docker upgrade is posible ([#80](https://github.com/wazuh/wazuh-docker/pull/80)) +- Upgrading errors due to wrong files. ([#80](https://github.com/wazuh/wazuh-docker/pull/80)) + ## Wazuh Docker v3.7.0_6.5.0