Compare commits

...

11 Commits

Author SHA1 Message Date
manuasir
61d3f460be Updated CHANGELOG. 2019-04-03 14:44:02 +02:00
Manuel J. Bernal
9ed503b6e8 Merge pull request #144 from wazuh/update-3.8.2_6.7.0
Update to 3.8.2_6.7.0
2019-04-03 13:32:48 +02:00
manuasir
274d6248d3 Bump version. 2019-04-02 18:21:04 +02:00
Manuel J. Bernal
b47f723285 Merge pull request #130 from wazuh/update-3.8.2_6.6.2
Upgrade Elastic stack version to 6.6.2
2019-03-29 19:05:17 +01:00
manuasir
b99d54eb25 Bump version 2019-03-29 19:03:28 +01:00
Manuel J. Bernal
2b0f2955d0 Merge pull request #129 from wazuh/update-3.8.2_6.6.1
Upgrade Elastic stack version to 6.6.1
2019-03-29 18:52:41 +01:00
Manuel J. Bernal
38644d380c Update CHANGELOG.md 2019-03-29 18:51:52 +01:00
manuasir
86bc43a494 Bump version 2019-03-29 18:44:36 +01:00
manuasir
8e5ad87619 Added vm.max_map_count to README 2019-03-29 18:27:17 +01:00
manuasir
2bd0138d6f Merge branch '3.8.2_6.5.4' into update-3.8.2_6.6.1 2019-03-29 16:20:10 +01:00
l
b06e4c4a5e Upgrade Elastic stack version to 6.6.1 2019-03-19 10:48:07 +01:00
8 changed files with 35 additions and 16 deletions

View File

@@ -1,6 +1,24 @@
# Change Log
All notable changes to this project will be documented in this file.
## Wazuh Docker v3.8.2_6.7.0
### Changed
- Update Elastic Stack version to 6.7.0. ([#144](https://github.com/wazuh/wazuh-docker/pull/144))
## Wazuh Docker v3.8.2_6.6.2
### Changed
- Update Elastic Stack version to 6.6.2. ([#130](https://github.com/wazuh/wazuh-docker/pull/130))
## Wazuh Docker v3.8.2_6.6.1
### Changed
- 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
### Added

View File

@@ -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,9 +59,9 @@ 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.
* `Wazuh.Version_ElasticStack.Version` (for example 3.8.2_6.7.0) 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

View File

@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="3.8.2_6.5.4"
REVISION="3802"
WAZUH-DOCKER_VERSION="3.8.2_6.7.0"
REVISION="3803"

View File

@@ -3,7 +3,7 @@ version: '2'
services:
wazuh:
image: wazuh/wazuh:3.8.2_6.5.4
image: wazuh/wazuh:3.8.2_6.7.0
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.7.0
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.7.0
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.7.0
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.7.0
hostname: nginx
restart: always
environment:

View File

@@ -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.7.0
ENV ALERTS_SHARDS="1" \
ALERTS_REPLICAS="0"
@@ -23,7 +23,7 @@ COPY --chown=elasticsearch:elasticsearch ./config/load_settings.sh ./
RUN chmod +x ./load_settings.sh
RUN elasticsearch-plugin install --batch repository-s3
RUN bin/elasticsearch-plugin install --batch https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-6.7.0.zip
COPY config/configure_s3.sh ./config/configure_s3.sh
RUN chmod 755 ./config/configure_s3.sh

View File

@@ -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.7.0
ARG WAZUH_APP_VERSION=3.8.2_6.7.0
USER root
ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp

View File

@@ -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.7.0
COPY --chown=logstash:logstash config/entrypoint.sh /entrypoint.sh

View File

@@ -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.7.0
ARG WAZUH_VERSION=3.8.2-1
ENV API_USER="foo" \