diff --git a/CHANGELOG.md b/CHANGELOG.md index ee5aca1b..fca8573a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,31 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Docker v3.10.2_7.3.2 + +### Added + +- Update to Wazuh version 3.10.2_7.3.2 + +## Wazuh Docker v3.10.0_7.3.2 + +### Added + +- Update to Wazuh version 3.10.0_7.3.2 + +## Wazuh Docker v3.9.5_7.2.1 + +### Added + +- Update to Wazuh version 3.9.5_7.2.1 + +## Wazuh Docker v3.9.4_7.2.0 + +### Added + +- Update to Wazuh version 3.9.4_7.2.0 +- Implemented Wazuh Filebeat Module ([jm404](https://www.github.com/jm404)) [#2a77c6a](https://github.com/wazuh/wazuh-docker/commit/2a77c6a6e6bf78f2492adeedbade7a507d9974b2) + ## Wazuh Docker v3.9.3_7.2.0 ### Fixed diff --git a/README.md b/README.md index 7eae4b5a..4635ac1b 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ In addition, a docker-compose file is provided to launch the containers mentione * `stable` branch on correspond to the latest Wazuh-Docker stable version. * `master` branch contains the latest code, be aware of possible bugs on this branch. -* `Wazuh.Version_ElasticStack.Version` (for example 3.9.3_7.2.0) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch. +* `Wazuh.Version_ElasticStack.Version` (for example 3.10.2_7.3.2) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch. ## Credits and Thank you diff --git a/VERSION b/VERSION index 585e30a6..443c76ac 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="3.9.3_7.2.0" -REVISION="3930" \ No newline at end of file +WAZUH-DOCKER_VERSION="3.10.2_7.3.2" +REVISION="31020" \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index b69f350b..327ab969 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: wazuh: - image: wazuh/wazuh:3.9.3_7.2.0 + image: wazuh/wazuh:3.10.2_7.3.2 hostname: wazuh-manager restart: always ports: @@ -13,7 +13,7 @@ services: - "55000:55000" elasticsearch: - image: wazuh/wazuh-elasticsearch:3.9.3_7.2.0 + image: wazuh/wazuh-elasticsearch:3.10.2_7.3.2 hostname: elasticsearch restart: always ports: @@ -30,7 +30,7 @@ services: mem_limit: 2g kibana: - image: wazuh/wazuh-kibana:3.9.3_7.2.0 + image: wazuh/wazuh-kibana:3.10.2_7.3.2 hostname: kibana restart: always depends_on: @@ -39,7 +39,7 @@ services: - elasticsearch:elasticsearch - wazuh:wazuh nginx: - image: wazuh/wazuh-nginx:3.9.3_7.2.0 + image: wazuh/wazuh-nginx:3.10.2_7.3.2 hostname: nginx restart: always environment: diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 83023c08..83d6d89f 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -1,5 +1,5 @@ # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) -ARG ELASTIC_VERSION=7.2.0 +ARG ELASTIC_VERSION=7.3.2 FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION} ARG S3_PLUGIN_URL="https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-${ELASTIC_VERSION}.zip" @@ -15,7 +15,7 @@ ENV XPACK_ML="true" ENV ENABLE_CONFIGURE_S3="false" -ARG TEMPLATE_VERSION=v3.9.3 +ARG TEMPLATE_VERSION=v3.10.2 # Elasticearch cluster configuration environment variables # If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration diff --git a/kibana/Dockerfile b/kibana/Dockerfile index d8830750..12fb2c38 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,7 +1,7 @@ # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/kibana/kibana:7.2.0 -ARG ELASTIC_VERSION=7.2.0 -ARG WAZUH_VERSION=3.9.3 +FROM docker.elastic.co/kibana/kibana:7.3.2 +ARG ELASTIC_VERSION=7.3.2 +ARG WAZUH_VERSION=3.10.2 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}" USER root diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index da842789..a1fb62c6 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -1,14 +1,14 @@ # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) FROM phusion/baseimage:latest -ARG FILEBEAT_VERSION=7.2.0 +ARG FILEBEAT_VERSION=7.3.2 -ARG WAZUH_VERSION=3.9.3-1 +ARG WAZUH_VERSION=3.10.2-1 ENV API_USER="foo" \ API_PASS="bar" -ARG TEMPLATE_VERSION="v3.9.3" +ARG TEMPLATE_VERSION="v3.10.2" # Set repositories. RUN set -x && echo "deb https://packages.wazuh.com/3.x/apt/ stable main" | tee /etc/apt/sources.list.d/wazuh.list && \ diff --git a/wazuh/config/01-config_filebeat.sh b/wazuh/config/01-config_filebeat.sh index 61cd1c2a..818878c0 100644 --- a/wazuh/config/01-config_filebeat.sh +++ b/wazuh/config/01-config_filebeat.sh @@ -3,8 +3,17 @@ set -e +WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.1.tar.gz + # Modify the output to Elasticsearch if th ELASTICSEARCH_URL is set if [ "$ELASTICSEARCH_URL" != "" ]; then >&2 echo "Customize Elasticsearch ouput IP." sed -i 's|http://elasticsearch:9200|'$ELASTICSEARCH_URL'|g' /etc/filebeat/filebeat.yml -fi \ No newline at end of file +fi + +# Install Wazuh Filebeat Module + +curl -s "https://packages.wazuh.com/3.x/filebeat/${WAZUH_FILEBEAT_MODULE}" | tar -xvz -C /usr/share/filebeat/module +mkdir -p /usr/share/filebeat/module/wazuh +chmod 755 -R /usr/share/filebeat/module/wazuh +