paulmataruso/wazuh-docker-mirror
1
0
Fork 0
mirror of https://github.com/wazuh/wazuh-docker.git synced 2025-11-03 21:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

conflicts resolved in merge 3.9.1_6.8.0 over k8s branch

Browse Source
This commit is contained in:
AlfonsoRBJ
2019-05-28 12:43:16 +02:00
parent 096246abcb 7944897a0d
commit 9db0001e08
12 changed files with 54 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
CHANGELOG.md
View File

@@ -5,9 +5,25 @@ All notable changes to this project will be documented in this file.
### Added ### Added
- Option to sisable additionals X-Pack applications and hide unnecesary management links ([@SitoRBJ](https://github.com/SitoRBJ)) ([#163](https://github.com/wazuh/wazuh-docker/pull/163)) - Option to disable additionals X-Pack applications and hide unnecesary management links ([@SitoRBJ](https://github.com/SitoRBJ)) ([#163](https://github.com/wazuh/wazuh-docker/pull/163))
## Wazuh Docker v3.9.1_6.8.0
### Added
- Update to Wazuh version 3.9.1_6.8.0 ([#181](https://github.com/wazuh/wazuh-docker/pull/181))
### Fixed
- Fixed `ELASTICSEARCH_KIBANA_IP` environment variable ([@manuasir](https://github.com/manuasir)) ([#181](https://github.com/wazuh/wazuh-docker/pull/181))
## Wazuh Docker v3.9.0_6.7.2
### Changed
- Update Elastic Stack version to 6.7.2.
## Wazuh Docker v3.9.0_6.7.1 ## Wazuh Docker v3.9.0_6.7.1

2
README.md
View File

@@ -63,7 +63,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. * `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. * `master` branch contains the latest code, be aware of possible bugs on this branch.
* `Wazuh.Version_ElasticStack.Version` (for example 3.9.0_6.7.1) 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.9.1_6.8.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 ## Credits and Thank you

4
VERSION
View File

@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="3.9.0_6.7.1" WAZUH-DOCKER_VERSION="3.9.1_6.8.0"
REVISION="3900" REVISION="3901"

10
docker-compose.yml
View File

@@ -3,7 +3,7 @@ version: '2'
services: services:
wazuh: wazuh:
image: wazuh/wazuh:3.9.0_6.7.1 image: wazuh/wazuh:3.9.1_6.8.0
hostname: wazuh-manager hostname: wazuh-manager
restart: always restart: always
ports: ports:
@@ -14,7 +14,7 @@ services:
depends_on: depends_on:
- logstash - logstash
logstash: logstash:
image: wazuh/wazuh-logstash:3.9.0_6.7.1 image: wazuh/wazuh-logstash:3.9.1_6.8.0
hostname: logstash hostname: logstash
restart: always restart: always
links: links:
@@ -26,7 +26,7 @@ services:
environment: environment:
- LS_HEAP_SIZE=2048m - LS_HEAP_SIZE=2048m
elasticsearch: elasticsearch:
image: wazuh/wazuh-elasticsearch:3.9.0_6.7.1 image: wazuh/wazuh-elasticsearch:3.9.1_6.8.0
hostname: elasticsearch hostname: elasticsearch
restart: always restart: always
ports: ports:
@@ -43,7 +43,7 @@ services:
hard: -1 hard: -1
mem_limit: 2g mem_limit: 2g
kibana: kibana:
image: wazuh/wazuh-kibana:3.9.0_6.7.1 image: wazuh/wazuh-kibana:3.9.1_6.8.0
hostname: kibana hostname: kibana
restart: always restart: always
depends_on: depends_on:
@@ -52,7 +52,7 @@ services:
- elasticsearch:elasticsearch - elasticsearch:elasticsearch
- wazuh:wazuh - wazuh:wazuh
nginx: nginx:
image: wazuh/wazuh-nginx:3.9.0_6.7.1 image: wazuh/wazuh-nginx:3.9.1_6.8.0
hostname: nginx hostname: nginx
restart: always restart: always
environment: environment:

8
elasticsearch/Dockerfile
View File

@@ -1,5 +1,5 @@
# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
FROM docker.elastic.co/elasticsearch/elasticsearch:6.7.1 FROM docker.elastic.co/elasticsearch/elasticsearch:6.8.0
ENV ELASTICSEARCH_URL="http://elasticsearch:9200" ENV ELASTICSEARCH_URL="http://elasticsearch:9200"
@@ -13,7 +13,7 @@ ENV XPACK_ML="true"
ENV ENABLE_CONFIGURE_S3="false" ENV ENABLE_CONFIGURE_S3="false"
ENV TEMPLATE_VERSION=v3.9.0 ENV TEMPLATE_VERSION=v3.9.1
# Elasticearch cluster configuration environment variables # Elasticearch cluster configuration environment variables
# If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration # If ELASTIC_CLUSTER is set to "true" the following variables will be added to the Elasticsearch configuration
@@ -29,7 +29,7 @@ ENV ELASTIC_CLUSTER="false" \
CLUSTER_MAX_NODES="1" \ CLUSTER_MAX_NODES="1" \
CLUSTER_DELAYED_TIMEOUT="1m" CLUSTER_DELAYED_TIMEOUT="1m"
ADD https://raw.githubusercontent.com/wazuh/wazuh/$TEMPLATE_VERSION/extensions/elasticsearch/wazuh-elastic6-template-alerts.json /usr/share/elasticsearch/config ADD https://raw.githubusercontent.com/wazuh/wazuh/$TEMPLATE_VERSION/extensions/elasticsearch/6.x/wazuh-template.json /usr/share/elasticsearch/config
COPY config/entrypoint.sh /entrypoint.sh COPY config/entrypoint.sh /entrypoint.sh
@@ -39,7 +39,7 @@ COPY --chown=elasticsearch:elasticsearch ./config/load_settings.sh ./
RUN chmod +x ./load_settings.sh RUN chmod +x ./load_settings.sh
RUN bin/elasticsearch-plugin install --batch https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-6.7.1.zip RUN bin/elasticsearch-plugin install --batch https://artifacts.elastic.co/downloads/elasticsearch-plugins/repository-s3/repository-s3-6.8.0.zip
COPY config/configure_s3.sh ./config/configure_s3.sh COPY config/configure_s3.sh ./config/configure_s3.sh
RUN chmod 755 ./config/configure_s3.sh RUN chmod 755 ./config/configure_s3.sh

2
elasticsearch/config/entrypoint.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
# For more information https://github.com/elastic/elasticsearch-docker/blob/6.5.4/build/elasticsearch/bin/docker-entrypoint.sh # For more information https://github.com/elastic/elasticsearch-docker/blob/6.8.0/build/elasticsearch/bin/docker-entrypoint.sh
set -e set -e

4
elasticsearch/config/load_settings.sh
View File

@@ -45,9 +45,9 @@ fi
#Insert default templates #Insert default templates
sed -i 's| "index.refresh_interval": "5s"| "index.refresh_interval": "5s", "number_of_shards" : '"${ALERTS_SHARDS}"', "number_of_replicas" : '"${ALERTS_REPLICAS}"'|' /usr/share/elasticsearch/config/wazuh-elastic6-template-alerts.json sed -i 's| "index.refresh_interval": "5s"| "index.refresh_interval": "5s", "number_of_shards" : '"${ALERTS_SHARDS}"', "number_of_replicas" : '"${ALERTS_REPLICAS}"'|' /usr/share/elasticsearch/config/wazuh-template.json
cat /usr/share/elasticsearch/config/wazuh-elastic6-template-alerts.json | curl -XPUT "$el_url/_template/wazuh" ${auth} -H 'Content-Type: application/json' -d @- cat /usr/share/elasticsearch/config/wazuh-template.json | curl -XPUT "$el_url/_template/wazuh" ${auth} -H 'Content-Type: application/json' -d @-
sleep 5 sleep 5

14
kibana/Dockerfile
View File

@@ -1,16 +1,16 @@
# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
FROM docker.elastic.co/kibana/kibana:6.7.1 FROM docker.elastic.co/kibana/kibana:6.8.0
ARG WAZUH_APP_VERSION=3.9.0_6.7.1 ARG WAZUH_APP_VERSION=3.9.1_6.8.0
USER root USER root
ADD https://packages.wazuh.com/wazuhapp/wazuhapp-${WAZUH_APP_VERSION}.zip /tmp ADD https://packages-dev.wazuh.com/pre-release/app/kibana/wazuhapp-3.9.1_6.8.0.zip /tmp
RUN NODE_OPTIONS="--max-old-space-size=3072" /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-${WAZUH_APP_VERSION}.zip &&\ RUN NODE_OPTIONS="--max-old-space-size=3072" /usr/share/kibana/bin/kibana-plugin install file:///tmp/wazuhapp-3.9.1_6.8.0.zip &&\
chown -R kibana:kibana /usr/share/kibana &&\ chown -R kibana:kibana /usr/share/kibana &&\
rm -rf /tmp/* rm -rf /tmp/*
COPY config/entrypoint.sh /entrypoint.sh COPY config/entrypoint.sh ./entrypoint.sh
RUN chmod 755 /entrypoint.sh RUN chmod 755 ./entrypoint.sh
USER kibana USER kibana
@@ -75,4 +75,4 @@ RUN ./welcome_wazuh.sh
RUN /usr/local/bin/kibana-docker --optimize RUN /usr/local/bin/kibana-docker --optimize
ENTRYPOINT /entrypoint.sh ENTRYPOINT ./entrypoint.sh

3
kibana/config/kibana_settings.sh
View File

@@ -19,7 +19,8 @@ WAZUH_MAJOR=3
# Customize elasticsearch ip # Customize elasticsearch ip
############################################################################## ##############################################################################
if [ "$ELASTICSEARCH_KIBANA_IP" != "" ]; then if [ "$ELASTICSEARCH_KIBANA_IP" != "" ]; then
sed -i "s/elasticsearch:9200/$ELASTICSEARCH_KIBANA_IP:9200/" /usr/share/kibana/config/kibana.yml sed -i 's|http://elasticsearch:9200|'$ELASTICSEARCH_KIBANA_IP'|g' /usr/share/kibana/config/kibana.yml
fi fi
if [ "$KIBANA_IP" != "" ]; then if [ "$KIBANA_IP" != "" ]; then

2
logstash/Dockerfile
View File

@@ -1,5 +1,5 @@
# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
FROM docker.elastic.co/logstash/logstash:6.7.0 FROM docker.elastic.co/logstash/logstash:6.8.0
COPY --chown=logstash:logstash config/entrypoint.sh /entrypoint.sh COPY --chown=logstash:logstash config/entrypoint.sh /entrypoint.sh

20
logstash/config/entrypoint.sh
View File

@@ -17,6 +17,16 @@ else
el_url="${ELASTICSEARCH_URL}" el_url="${ELASTICSEARCH_URL}"
fi fi
##############################################################################
# Customize logstash output ip
##############################################################################
if [ "$LOGSTASH_OUTPUT" != "" ]; then
>&2 echo "Customize Logstash ouput ip."
sed -i 's|elasticsearch:9200|'$LOGSTASH_OUTPUT'|g' /usr/share/logstash/pipeline/01-wazuh.conf
sed -i 's|http://elasticsearch:9200|'$LOGSTASH_OUTPUT'|g' /usr/share/logstash/config/logstash.yml
fi
until curl -XGET $el_url; do until curl -XGET $el_url; do
>&2 echo "Elastic is unavailable - sleeping." >&2 echo "Elastic is unavailable - sleeping."
sleep 5 sleep 5
@@ -44,16 +54,6 @@ sleep 2
>&2 echo "Wazuh alerts template is loaded." >&2 echo "Wazuh alerts template is loaded."
##############################################################################
# Customize logstash output ip
##############################################################################
if [ "$LOGSTASH_OUTPUT" != "" ]; then
>&2 echo "Customize Logstash ouput ip."
sed -i "s/elasticsearch:9200/$LOGSTASH_OUTPUT:9200/" /usr/share/logstash/pipeline/01-wazuh.conf
sed -i "s/elasticsearch:9200/$LOGSTASH_OUTPUT:9200/" /usr/share/logstash/config/logstash.yml
fi
############################################################################## ##############################################################################
# Map environment variables to entries in logstash.yml. # Map environment variables to entries in logstash.yml.
# Note that this will mutate logstash.yml in place if any such settings are found. # Note that this will mutate logstash.yml in place if any such settings are found.

4
wazuh/Dockerfile
View File

@@ -1,7 +1,7 @@
# Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2) # Wazuh App Copyright (C) 2019 Wazuh Inc. (License GPLv2)
FROM phusion/baseimage:latest FROM phusion/baseimage:latest
ARG FILEBEAT_VERSION=6.7.0 ARG FILEBEAT_VERSION=6.8.0
ARG WAZUH_VERSION=3.9.0-1 ARG WAZUH_VERSION=3.9.1-1
ENV API_USER="foo" \ ENV API_USER="foo" \
API_PASS="bar" API_PASS="bar"