From b8294dba69fda2f9f282600b53766db468ba376a Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Fri, 4 Jan 2019 11:52:43 +0100 Subject: [PATCH 1/7] Update CHANGELOG.md --- CHANGELOG.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65d2b1c6..55e9fc8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,14 +3,19 @@ All notable changes to this project will be documented in this file. ## Wazuh Docker v3.7.2_6.5.4 +### Added + +- Add Kibana environmental variables for Wazuh APP config.yml. ([#89](https://github.com/wazuh/wazuh-docker/pull/89)) + ### Changed - Update Elastic Stack version to 6.5.4. ([#82](https://github.com/wazuh/wazuh-docker/pull/82)) -- Add env credentials for nginx ([#86](https://github.com/wazuh/wazuh-docker/pull/86)) +- 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 -- Temporary fix for Wazuh cluster master node in Kubernetes ([#84](https://github.com/wazuh/wazuh-docker/pull/84)) +- Temporary fix for Wazuh cluster master node in Kubernetes. ([#84](https://github.com/wazuh/wazuh-docker/pull/84)) ## Wazuh Docker v3.7.2_6.5.3 From 8913df62840c3e382a04a64bad8cddd33c9097f4 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Fri, 4 Jan 2019 11:53:19 +0100 Subject: [PATCH 2/7] Bump version 3732 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c848da98..35b0ae65 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-DOCKER_VERSION="3.7.2_6.5.4" -REVISION="3731" +REVISION="3732" From 0ab0db67baf797c2e6289c6fc7fdb9e9c3eac705 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 10 Jan 2019 13:15:38 +0100 Subject: [PATCH 3/7] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55e9fc8b..16e48dce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Docker v3.8.0_6.5.4 + ## Wazuh Docker v3.7.2_6.5.4 ### Added From 986635c3669555b7015fe461f423736d5e063d34 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Thu, 10 Jan 2019 13:16:39 +0100 Subject: [PATCH 4/7] Bump version 3.8.0 --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 35b0ae65..d9f8c63e 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="3.7.2_6.5.4" -REVISION="3732" +WAZUH-DOCKER_VERSION="3.8.0_6.5.4" +REVISION="3800" From eed4b0b9dcc8af535a3847fb047786f44560793f Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Mon, 14 Jan 2019 17:17:00 +0100 Subject: [PATCH 5/7] Upgrade version 3.8.0_6.5.4 (#97) --- CHANGELOG.md | 4 ++++ README.md | 4 ---- docker-compose.yml | 8 ++++---- kibana/Dockerfile | 4 ++-- wazuh/Dockerfile | 2 +- wazuh/config/entrypoint.sh | 3 --- 6 files changed, 11 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16e48dce..9de56025 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.8.0_6.5.4 +### Changed + +- Upgrade version 3.8.0_6.5.4 ([#97](https://github.com/wazuh/wazuh-docker/pull/97)) + ## Wazuh Docker v3.7.2_6.5.4 ### Added diff --git a/README.md b/README.md index 7900e49e..fbc3084f 100644 --- a/README.md +++ b/README.md @@ -20,10 +20,6 @@ In addition, a docker-compose file is provided to launch the containers mentione * [Wazuh documentation for Docker](https://documentation.wazuh.com/current/docker/index.html) * [Docker hub](https://hub.docker.com/u/wazuh) -## Current release - -Containers are currently tested on Wazuh version 3.7.2 and Elastic Stack version 6.5.4. We will do our best to keep this repository updated to latest versions of both Wazuh and Elastic Stack. - ## Directory structure wazuh-docker diff --git a/docker-compose.yml b/docker-compose.yml index 083d698a..77d34ca3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: wazuh: - image: wazuh/wazuh:3.7.2_6.5.4 + image: wazuh/wazuh:3.8.0_6.5.4 hostname: wazuh-manager restart: always ports: @@ -23,7 +23,7 @@ services: depends_on: - logstash logstash: - image: wazuh/wazuh-logstash:3.7.2_6.5.4 + image: wazuh/wazuh-logstash:3.8.0_6.5.4 hostname: logstash restart: always # volumes: @@ -61,7 +61,7 @@ services: networks: - docker_elk kibana: - image: wazuh/wazuh-kibana:3.7.2_6.5.4 + image: wazuh/wazuh-kibana:3.8.0_6.5.4 hostname: kibana restart: always # ports: @@ -76,7 +76,7 @@ services: - elasticsearch:elasticsearch - wazuh:wazuh nginx: - image: wazuh/wazuh-nginx:3.7.2_6.5.4 + image: wazuh/wazuh-nginx:3.8.0_6.5.4 hostname: nginx restart: always environment: diff --git a/kibana/Dockerfile b/kibana/Dockerfile index 980d8e15..256dd679 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,11 +1,11 @@ # Wazuh App Copyright (C) 2018 Wazuh Inc. (License GPLv2) FROM docker.elastic.co/kibana/kibana:6.5.4 -ARG WAZUH_APP_VERSION=3.7.2_6.5.4 +ARG WAZUH_APP_VERSION=3.8.0_6.5.4 USER root ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp -ADD https://raw.githubusercontent.com/wazuh/wazuh/3.7/extensions/elasticsearch/wazuh-elastic6-template-alerts.json /usr/share/kibana/config +ADD https://raw.githubusercontent.com/wazuh/wazuh/3.8/extensions/elasticsearch/wazuh-elastic6-template-alerts.json /usr/share/kibana/config RUN NODE_OPTIONS="--max-old-space-size=3072" /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-${WAZUH_APP_VERSION}.zip &&\ chown -R kibana:kibana /usr/share/kibana &&\ diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index e59d5113..68444f2a 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.4 -ARG WAZUH_VERSION=3.7.2-1 +ARG WAZUH_VERSION=3.8.0-1 # Updating image RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" diff --git a/wazuh/config/entrypoint.sh b/wazuh/config/entrypoint.sh index 760fd158..9ee42aec 100644 --- a/wazuh/config/entrypoint.sh +++ b/wazuh/config/entrypoint.sh @@ -107,9 +107,6 @@ else print "No Wazuh configuration files to mount..." fi -# Enabling ossec-authd. -exec_cmd "/var/ossec/bin/ossec-control enable auth" - function ossec_shutdown(){ ${WAZUH_INSTALL_PATH}/bin/ossec-control stop; } From e184e7c6924d983acb9b1036f3004c7bb4fbecdb Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Mon, 14 Jan 2019 17:34:54 +0100 Subject: [PATCH 6/7] Update Slack link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fbc3084f..d35a3178 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Wazuh containers for Docker -[![Slack](https://img.shields.io/badge/slack-join-blue.svg)](https://goo.gl/forms/M2AoZC4b2R9A9Zy12) +[![Slack](https://img.shields.io/badge/slack-join-blue.svg)](https://wazuh.com/community/join-us-on-slack/) [![Email](https://img.shields.io/badge/email-join-blue.svg)](https://groups.google.com/forum/#!forum/wazuh) [![Documentation](https://img.shields.io/badge/docs-view-green.svg)](https://documentation.wazuh.com) [![Documentation](https://img.shields.io/badge/web-view-green.svg)](https://wazuh.com) From e85c9419b7988d5dbbae9e30a5ced6129e662773 Mon Sep 17 00:00:00 2001 From: AlfonsoRBJ Date: Fri, 18 Jan 2019 16:38:41 +0100 Subject: [PATCH 7/7] Remove cluster.py work around (#99) --- CHANGELOG.md | 6 +++++- wazuh/Dockerfile | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9de56025..69ffe458 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,11 @@ All notable changes to this project will be documented in this file. ### Changed -- Upgrade version 3.8.0_6.5.4 ([#97](https://github.com/wazuh/wazuh-docker/pull/97)) +- Upgrade version 3.8.0_6.5.4. ([#97](https://github.com/wazuh/wazuh-docker/pull/97)) + +### Removed + +- Remove cluster.py work around. ([#99](https://github.com/wazuh/wazuh-docker/pull/99)) ## Wazuh Docker v3.7.2_6.5.4 diff --git a/wazuh/Dockerfile b/wazuh/Dockerfile index 68444f2a..b572f110 100644 --- a/wazuh/Dockerfile +++ b/wazuh/Dockerfile @@ -76,8 +76,5 @@ RUN mkdir /etc/service/filebeat COPY config/filebeat.runit.service /etc/service/filebeat/run RUN chmod +x /etc/service/filebeat/run -# Temporary fix for Wazuh cluster master node in Kubernetes -RUN sed -i '87d;88d' /var/ossec/framework/wazuh/cluster/cluster.py - # Run all services ENTRYPOINT ["/entrypoint.sh"]