From b06e4c4a5e07cd205c52ee945e88505767723bc1 Mon Sep 17 00:00:00 2001 From: l Date: Tue, 19 Mar 2019 10:48:07 +0100 Subject: [PATCH 1/4] Upgrade Elastic stack version to 6.6.1 --- elasticsearch/Dockerfile | 2 +- kibana/Dockerfile | 4 ++-- logstash/Dockerfile | 2 +- wazuh/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 1a41604b..19a605fd 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -1,5 +1,5 @@ # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/elasticsearch/elasticsearch:6.5.4 +FROM docker.elastic.co/elasticsearch/elasticsearch:6.6.1 ENV ALERTS_SHARDS="1" \ ALERTS_REPLICAS="0" diff --git a/kibana/Dockerfile b/kibana/Dockerfile index 8bb08523..80919392 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,6 +1,6 @@ # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/kibana/kibana:6.5.4 -ARG WAZUH_APP_VERSION=3.8.2_6.5.4 +FROM docker.elastic.co/kibana/kibana:6.6.1 +ARG WAZUH_APP_VERSION=3.8.2_6.6.1 USER root ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp diff --git a/logstash/Dockerfile b/logstash/Dockerfile index 00322375..146050de 100644 --- a/logstash/Dockerfile +++ b/logstash/Dockerfile @@ -1,5 +1,5 @@ # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) -FROM docker.elastic.co/logstash/logstash:6.5.4 +FROM docker.elastic.co/logstash/logstash:6.6.1 RUN rm -f /usr/share/logstash/pipeline/logstash.conf diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index 1031c1d0..268d2a3d 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -1,6 +1,6 @@ # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) FROM phusion/baseimage:latest -ARG FILEBEAT_VERSION=6.5.4 +ARG FILEBEAT_VERSION=6.6.1 ARG WAZUH_VERSION=3.8.2-1 ENV API_USER="foo" \ From 8e5ad87619fb93a95f9f7bfc42a020876d91ea6d Mon Sep 17 00:00:00 2001 From: manuasir Date: Fri, 29 Mar 2019 18:27:17 +0100 Subject: [PATCH 2/4] Added vm.max_map_count to README --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3760f61e..8e0d446a 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,9 @@ In this repository you will find the containers to run: * wazuh-logstash: It is used to receive alerts generated by the manager and feed Elasticsearch using an alerts template * wazuh-kibana: Provides a web user interface to browse through alerts data. It includes Wazuh plugin for Kibana, that allows you to visualize agents configuration and status. * wazuh-nginx: Proxies the Kibana container, adding HTTPS (via self-signed SSL certificate) and [Basic authentication](https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication#Basic_authentication_scheme). +* wazuh-elasticsearch: An Elasticsearch container (working as a single-node cluster) using Elastic Stack Docker images. **Be aware to increase the `vm.max_map_count` setting, as it's detailed in the [Wazuh documentation](https://documentation.wazuh.com/current/docker/wazuh-container.html#increase-max-map-count-on-your-host-linux).** -In addition, a docker-compose file is provided to launch the containers mentioned above. It also launches an Elasticsearch container (working as a single-node cluster) using Elastic Stack Docker images. +In addition, a docker-compose file is provided to launch the containers mentioned above. ## Documentation @@ -58,7 +59,7 @@ In addition, a docker-compose file is provided to launch the containers mentione ## Branches -* `stable` branch on correspond to the last Wazuh-Docker stable version. +* `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.7.0_6.4.3) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch. From 86bc43a4940f450ecf22449d4511d7cc3152bfb3 Mon Sep 17 00:00:00 2001 From: manuasir Date: Fri, 29 Mar 2019 18:44:36 +0100 Subject: [PATCH 3/4] Bump version --- CHANGELOG.md | 6 ++++++ README.md | 2 +- VERSION | 2 +- docker-compose.yml | 10 +++++----- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61093b6a..83f6cd42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Docker v3.8.2_6.6.1 + +### Changed + +- Update Elastic Stack version to 6.6.1. ([#143](https://github.com/wazuh/wazuh-docker/pull/143)) + ## Wazuh Docker v3.8.2_6.5.4 ### Added diff --git a/README.md b/README.md index 8e0d446a..7272cb19 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,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.7.0_6.4.3) 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.8.2_6.6.1) 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 bb5f485c..cc705574 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="3.8.2_6.5.4" +WAZUH-DOCKER_VERSION="3.8.2_6.6.1" REVISION="3802" diff --git a/docker-compose.yml b/docker-compose.yml index 91a0d9fc..3bd76826 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: wazuh: - image: wazuh/wazuh:3.8.2_6.5.4 + image: wazuh/wazuh:3.8.2_6.6.1 hostname: wazuh-manager restart: always ports: @@ -14,7 +14,7 @@ services: depends_on: - logstash logstash: - image: wazuh/wazuh-logstash:3.8.2_6.5.4 + image: wazuh/wazuh-logstash:3.8.2_6.6.1 hostname: logstash restart: always links: @@ -26,7 +26,7 @@ services: environment: - LS_HEAP_SIZE=2048m elasticsearch: - image: wazuh/wazuh-elasticsearch:3.8.2_6.5.4 + image: wazuh/wazuh-elasticsearch:3.8.2_6.6.1 hostname: elasticsearch restart: always ports: @@ -43,7 +43,7 @@ services: hard: -1 mem_limit: 2g kibana: - image: wazuh/wazuh-kibana:3.8.2_6.5.4 + image: wazuh/wazuh-kibana:3.8.2_6.6.1 hostname: kibana restart: always depends_on: @@ -52,7 +52,7 @@ services: - elasticsearch:elasticsearch - wazuh:wazuh nginx: - image: wazuh/wazuh-nginx:3.8.2_6.5.4 + image: wazuh/wazuh-nginx:3.8.2_6.6.1 hostname: nginx restart: always environment: From 38644d380cb50021ae6e7e03ad60e4a81a173372 Mon Sep 17 00:00:00 2001 From: "Manuel J. Bernal" Date: Fri, 29 Mar 2019 18:51:52 +0100 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83f6cd42..39844ca5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Update Elastic Stack version to 6.6.1. ([#143](https://github.com/wazuh/wazuh-docker/pull/143)) +- Update Elastic Stack version to 6.6.1. ([#129](https://github.com/wazuh/wazuh-docker/pull/129)) ## Wazuh Docker v3.8.2_6.5.4