mirror of
https://github.com/wazuh/wazuh-docker.git
synced 2025-10-23 16:13:42 +00:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
a979d23af0 | ||
|
|
4e77577261 |
@@ -52,11 +52,11 @@ package:
|
||||
filebeat:
|
||||
installed: true
|
||||
versions:
|
||||
- 7.10.2
|
||||
- 7.10.0
|
||||
wazuh-manager:
|
||||
installed: true
|
||||
versions:
|
||||
- 4.1.5
|
||||
- 4.1.2
|
||||
port:
|
||||
tcp:1514:
|
||||
listening: true
|
||||
|
||||
16
CHANGELOG.md
16
CHANGELOG.md
@@ -1,22 +1,6 @@
|
||||
# Change Log
|
||||
All notable changes to this project will be documented in this file.
|
||||
|
||||
## Wazuh Docker v4.1.5
|
||||
### Added
|
||||
|
||||
- Update Wazuh to version [4.1.5](https://github.com/wazuh/wazuh/blob/v4.1.5/CHANGELOG.md#v415)
|
||||
- Update ODFE compatibility to version 1.13.2
|
||||
|
||||
## Wazuh Docker v4.1.4
|
||||
### Added
|
||||
|
||||
- Update Wazuh to version [4.1.4](https://github.com/wazuh/wazuh/blob/v4.1.4/CHANGELOG.md#v414)
|
||||
|
||||
## Wazuh Docker v4.1.3
|
||||
### Added
|
||||
|
||||
- Update Wazuh to version [4.1.3](https://github.com/wazuh/wazuh/blob/v4.1.3/CHANGELOG.md#v413)
|
||||
|
||||
## Wazuh Docker v4.1.2
|
||||
### Added
|
||||
|
||||
|
||||
@@ -146,20 +146,15 @@ ADMIN_PRIVILEGES=true # App privileges
|
||||
|
||||
## Branches
|
||||
|
||||
* `4.0` branch on correspond to the latest Wazuh-Docker stable version.
|
||||
* `master` branch contains the latest code, be aware of possible bugs on this branch.
|
||||
* `stable` branch on correspond to the last Wazuh stable version.
|
||||
* `Wazuh.Version` (for example 3.13.1_7.8.0 or 4.1.0) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch.
|
||||
|
||||
|
||||
## Compatibility Matrix
|
||||
|
||||
| Wazuh version | ODFE | XPACK |
|
||||
|---------------|---------|--------|
|
||||
| v4.1.5 | 1.13.2 | 7.10.2 |
|
||||
|---------------|---------|--------|
|
||||
| v4.1.4 | 1.12.0 | 7.10.2 |
|
||||
|---------------|---------|--------|
|
||||
| v4.1.3 | 1.12.0 | 7.10.2 |
|
||||
|---------------|---------|--------|
|
||||
| v4.1.2 | 1.12.0 | 7.10.2 |
|
||||
|---------------|---------|--------|
|
||||
| v4.1.1 | 1.12.0 | 7.10.2 |
|
||||
|
||||
4
VERSION
4
VERSION
@@ -1,2 +1,2 @@
|
||||
WAZUH-DOCKER_VERSION="4.1.5"
|
||||
REVISION="40114"
|
||||
WAZUH-DOCKER_VERSION="4.1.2"
|
||||
REVISION="41100"
|
||||
|
||||
@@ -31,7 +31,7 @@ services:
|
||||
- filebeat_var:/var/lib/filebeat
|
||||
|
||||
elasticsearch:
|
||||
image: amazon/opendistro-for-elasticsearch:1.13.2
|
||||
image: amazon/opendistro-for-elasticsearch:1.12.0
|
||||
hostname: elasticsearch
|
||||
restart: always
|
||||
ports:
|
||||
|
||||
@@ -3,7 +3,7 @@ version: '3.7'
|
||||
|
||||
services:
|
||||
wazuh:
|
||||
image: wazuh/wazuh-odfe:4.1.5
|
||||
image: wazuh/wazuh-odfe:4.1.2
|
||||
hostname: wazuh-manager
|
||||
restart: always
|
||||
ports:
|
||||
@@ -30,7 +30,7 @@ services:
|
||||
- filebeat_var:/var/lib/filebeat
|
||||
|
||||
elasticsearch:
|
||||
image: amazon/opendistro-for-elasticsearch:1.13.2
|
||||
image: amazon/opendistro-for-elasticsearch:1.12.0
|
||||
hostname: elasticsearch
|
||||
restart: always
|
||||
ports:
|
||||
@@ -50,7 +50,7 @@ services:
|
||||
hard: 65536
|
||||
|
||||
kibana:
|
||||
image: wazuh/wazuh-kibana-odfe:4.1.5
|
||||
image: wazuh/wazuh-kibana-odfe:4.1.2
|
||||
hostname: kibana
|
||||
restart: always
|
||||
ports:
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
|
||||
FROM amazon/opendistro-for-elasticsearch-kibana:1.13.2
|
||||
FROM amazon/opendistro-for-elasticsearch-kibana:1.12.0
|
||||
USER kibana
|
||||
ARG ELASTIC_VERSION=7.10.2
|
||||
ARG WAZUH_VERSION=4.1.5
|
||||
ARG ELASTIC_VERSION=7.10.0
|
||||
ARG WAZUH_VERSION=4.1.2
|
||||
ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
|
||||
|
||||
WORKDIR /usr/share/kibana
|
||||
|
||||
@@ -18,6 +18,8 @@ WAZUH_MAJOR=4
|
||||
# Customize elasticsearch ip
|
||||
##############################################################################
|
||||
sed -i "s|elasticsearch.hosts:.*|elasticsearch.hosts: $el_url|g" /usr/share/kibana/config/kibana.yml
|
||||
# disable multitenancy
|
||||
sed -i "s|opendistro_security.multitenancy.enabled:.*|opendistro_security.multitenancy.enabled: false|g" /usr/share/kibana/config/kibana.yml
|
||||
|
||||
# If KIBANA_INDEX was set, then change the default index in kibana.yml configuration file. If there was an index, then delete it and recreate.
|
||||
if [ "$KIBANA_INDEX" != "" ]; then
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
if [[ $CHANGE_WELCOME == "true" ]]
|
||||
then
|
||||
echo "Set Wazuh app as the default landing page"
|
||||
echo "server.defaultRoute: /app/wazuh?security_tenant=global" >> /usr/share/kibana/config/kibana.yml
|
||||
echo "server.defaultRoute: /app/wazuh" >> /usr/share/kibana/config/kibana.yml
|
||||
|
||||
echo "Set custom welcome styles"
|
||||
cp -f /tmp/custom_welcome/template.js.hbs /usr/share/kibana/src/legacy/ui/ui_render/bootstrap/template.js.hbs
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
FROM docker.elastic.co/kibana/kibana:7.10.2
|
||||
USER kibana
|
||||
ARG ELASTIC_VERSION=7.10.2
|
||||
ARG WAZUH_VERSION=4.1.5
|
||||
ARG WAZUH_VERSION=4.1.2
|
||||
ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
|
||||
|
||||
WORKDIR /usr/share/kibana
|
||||
|
||||
@@ -3,7 +3,7 @@ version: '3.7'
|
||||
|
||||
services:
|
||||
wazuh-master:
|
||||
image: wazuh/wazuh-odfe:4.1.5
|
||||
image: wazuh/wazuh-odfe:4.1.2
|
||||
hostname: wazuh-master
|
||||
restart: always
|
||||
ports:
|
||||
@@ -38,7 +38,7 @@ services:
|
||||
- ./production_cluster/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
|
||||
|
||||
wazuh-worker:
|
||||
image: wazuh/wazuh-odfe:4.1.5
|
||||
image: wazuh/wazuh-odfe:4.1.2
|
||||
hostname: wazuh-worker
|
||||
restart: always
|
||||
environment:
|
||||
@@ -67,7 +67,7 @@ services:
|
||||
- ./production_cluster/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
|
||||
|
||||
elasticsearch:
|
||||
image: amazon/opendistro-for-elasticsearch:1.13.2
|
||||
image: amazon/opendistro-for-elasticsearch:1.12.0
|
||||
hostname: elasticsearch
|
||||
restart: always
|
||||
ports:
|
||||
@@ -90,7 +90,7 @@ services:
|
||||
- ./production_cluster/elastic_opendistro/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml
|
||||
|
||||
elasticsearch-2:
|
||||
image: amazon/opendistro-for-elasticsearch:1.13.2
|
||||
image: amazon/opendistro-for-elasticsearch:1.12.0
|
||||
hostname: elasticsearch-2
|
||||
restart: always
|
||||
environment:
|
||||
@@ -111,7 +111,7 @@ services:
|
||||
- ./production_cluster/elastic_opendistro/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml
|
||||
|
||||
elasticsearch-3:
|
||||
image: amazon/opendistro-for-elasticsearch:1.13.2
|
||||
image: amazon/opendistro-for-elasticsearch:1.12.0
|
||||
hostname: elasticsearch-3
|
||||
restart: always
|
||||
environment:
|
||||
@@ -132,7 +132,7 @@ services:
|
||||
- ./production_cluster/elastic_opendistro/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml
|
||||
|
||||
kibana:
|
||||
image: wazuh/wazuh-kibana-odfe:4.1.5
|
||||
image: wazuh/wazuh-kibana-odfe:4.1.2
|
||||
hostname: kibana
|
||||
restart: always
|
||||
ports:
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
FROM centos:7
|
||||
|
||||
ARG FILEBEAT_CHANNEL=filebeat-oss
|
||||
ARG FILEBEAT_VERSION=7.10.2
|
||||
ARG WAZUH_VERSION=4.1.5-1
|
||||
ARG FILEBEAT_VERSION=7.10.0
|
||||
ARG WAZUH_VERSION=4.1.2-1
|
||||
ARG TEMPLATE_VERSION="master"
|
||||
ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.1.tar.gz"
|
||||
|
||||
|
||||
@@ -4,7 +4,6 @@ PERMANENT_DATA[((i++))]="/var/ossec/api/configuration"
|
||||
PERMANENT_DATA[((i++))]="/var/ossec/etc"
|
||||
PERMANENT_DATA[((i++))]="/var/ossec/logs"
|
||||
PERMANENT_DATA[((i++))]="/var/ossec/queue"
|
||||
PERMANENT_DATA[((i++))]="/var/ossec/queue/tasks"
|
||||
PERMANENT_DATA[((i++))]="/var/ossec/agentless"
|
||||
PERMANENT_DATA[((i++))]="/var/ossec/var/multigroups"
|
||||
PERMANENT_DATA[((i++))]="/var/ossec/integrations"
|
||||
|
||||
@@ -3,7 +3,7 @@ version: '3.7'
|
||||
|
||||
services:
|
||||
wazuh:
|
||||
image: wazuh/wazuh:4.1.5
|
||||
image: wazuh/wazuh:4.1.2
|
||||
hostname: wazuh-manager
|
||||
restart: always
|
||||
ports:
|
||||
@@ -146,7 +146,7 @@ services:
|
||||
|
||||
|
||||
kibana:
|
||||
image: wazuh/wazuh-kibana:4.1.5
|
||||
image: wazuh/wazuh-kibana:4.1.2
|
||||
hostname: kibana
|
||||
restart: always
|
||||
ports:
|
||||
|
||||
@@ -8,7 +8,7 @@ services:
|
||||
args:
|
||||
- FILEBEAT_CHANNEL=filebeat
|
||||
- FILEBEAT_VERSION=7.10.2
|
||||
image: wazuh/wazuh:4.1.5
|
||||
image: wazuh/wazuh:4.1.2
|
||||
hostname: wazuh-manager
|
||||
restart: always
|
||||
ports:
|
||||
@@ -152,7 +152,7 @@ services:
|
||||
|
||||
kibana:
|
||||
build: kibana/
|
||||
image: wazuh/wazuh-kibana:4.1.5
|
||||
image: wazuh/wazuh-kibana:4.1.2
|
||||
hostname: kibana
|
||||
restart: always
|
||||
ports:
|
||||
|
||||
Reference in New Issue
Block a user