From 3a27f55cbafd8d20ac98285ba08beb95c9413470 Mon Sep 17 00:00:00 2001 From: Manuel Gutierrez Date: Tue, 14 Apr 2020 19:23:27 +0200 Subject: [PATCH] Bump to version 3.12.2_7.6.2 --- CHANGELOG.md | 69 +++++++++++++++++++++++++++++++++++++++- LICENSE | 2 +- README.md | 2 +- VERSION | 4 +-- elasticsearch/Dockerfile | 6 ++-- kibana/Dockerfile | 6 ++-- wazuh/Dockerfile | 6 ++-- 7 files changed, 81 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09bd3987..4d683dfd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,73 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Docker v3.12.2_7.6.2 + +### Added + +- Update to Wazuh version 3.12.2_7.6.2 + +## Wazuh Docker v3.12.1_7.6.2 + +### Added + +- Update to Wazuh version 3.12.1_7.6.2 + +### Fixed + +- Agent timestamp not being properly saved ([@xr09](https://github.com/xr09)) [#323](https://github.com/wazuh/wazuh-docker/pull/323) + + +## Wazuh Docker v3.12.0_7.6.1 + +### Added + +- Update to Wazuh version 3.12.0_7.6.1 + + +## Wazuh Docker v3.11.4_7.6.1 + +### Added + +- Update to Wazuh version 3.11.4_7.6.1 + +- Enable HTTP v2 on nginx ([@xr09](https://github.com/xr09)) [#308](https://github.com/wazuh/wazuh-docker/pull/308) + +### Fixed + +- Updated NGINX config syntax ([@xr09](https://github.com/xr09)) [#303](https://github.com/wazuh/wazuh-docker/pull/303) + + +## Wazuh Docker v3.11.3_7.5.2 + +### Added + +- Update to Wazuh version 3.11.3_7.5.2 + +## Wazuh Docker v3.11.2_7.5.1 + +### Added + +- Bumped Node.js to version 10 ([@xr09](https://github.com/xr09)) [#8615cd4](https://github.com/wazuh/wazuh-docker/commit/8615cd4d2152601e55becc7c3675360938e74b6a) + +### Fixed + +- Fix S3 Plugin ([@AnthonySendra](https://github.com/AnthonySendra)) [#293](https://github.com/wazuh/wazuh-docker/pull/293) + +## Wazuh Docker v3.11.1_7.5.1 + +### Added + +- Update to Wazuh version 3.11.1_7.5.1 +- Filebeat configuration file updated to latest version ([@manuasir](https://github.com/manuasir)) [#271](https://github.com/wazuh/wazuh-docker/pull/271) +- Allow using the hostname as node_name for managers ([@JPLachance](https://github.com/JPLachance)) [#261](https://github.com/wazuh/wazuh-docker/pull/261) + +## Wazuh Docker v3.11.0_7.5.1 + +### Added + +- Update to Wazuh version 3.11.0_7.5.1 + ## Wazuh Docker v3.10.2_7.5.0 ### Added @@ -158,7 +225,7 @@ All notable changes to this project will be documented in this file. - Add env credentials for nginx. ([#86](https://github.com/wazuh/wazuh-docker/pull/86)) - Improve filebeat configuration ([#88](https://github.com/wazuh/wazuh-docker/pull/88)) -### Fixed +### Fixed - Temporary fix for Wazuh cluster master node in Kubernetes. ([#84](https://github.com/wazuh/wazuh-docker/pull/84)) diff --git a/LICENSE b/LICENSE index 04fb7afc..40f5e6c3 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ - Portions Copyright (C) 2019 Wazuh, Inc. + Portions Copyright (C) 2020 Wazuh, Inc. Based on work Copyright (C) 2003 - 2013 Trend Micro, Inc. This program is a free software; you can redistribute it and/or modify diff --git a/README.md b/README.md index dbe25c0b..fc63d818 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ We thank you them and everyone else who has contributed to this project. ## License and copyright -Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) +Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2) ## Web references diff --git a/VERSION b/VERSION index 7e59f57a..a6f084f7 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="3.11.3_7.5.2" -REVISION="31130" +WAZUH-DOCKER_VERSION="3.12.2_7.6.2" +REVISION="31220" diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 679738a9..13656b2d 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -1,5 +1,5 @@ -# Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) -ARG ELASTIC_VERSION=7.5.2 +# Wazuh Docker Copyright (C) 2020 Wazuh Inc. (License GPLv2) +ARG ELASTIC_VERSION=7.6.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.11.3 +ARG TEMPLATE_VERSION=v3.12.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 9c79c12c..729ae500 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,8 +1,8 @@ # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/kibana/kibana:7.5.2 +FROM docker.elastic.co/kibana/kibana:7.6.2 USER kibana -ARG ELASTIC_VERSION=7.5.2 -ARG WAZUH_VERSION=3.11.3 +ARG ELASTIC_VERSION=7.6.2 +ARG WAZUH_VERSION=3.12.2 ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}" #ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /usr/share/kibana/ diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index d25dbeb7..9509793b 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -1,9 +1,9 @@ # Wazuh Docker Copyright (C) 2019 Wazuh Inc. (License GPLv2) FROM centos:7 -ARG FILEBEAT_VERSION=7.5.2 -ARG WAZUH_VERSION=3.11.3-1 -ARG TEMPLATE_VERSION="v3.11.3" +ARG FILEBEAT_VERSION=7.6.2 +ARG WAZUH_VERSION=3.12.2-1 +ARG TEMPLATE_VERSION="v3.12.2" ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.1.tar.gz" ENV API_USER="foo" \