Skip to content

Commit 68719ac

Browse files
authored
Merge pull request #407 from wazuh/release-wazuh_4.0.2
Release wazuh 4.0.2
2 parents 752b139 + 5d32069 commit 68719ac

9 files changed

Lines changed: 102 additions & 10 deletions

File tree

.github/workflows/push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ jobs:
99
- name: Check out code
1010
uses: actions/checkout@v2
1111
- name: Build the docker-compose stack
12-
run: docker-compose up -d --build
12+
run: docker-compose -f build-from-sources.yml up -d --build
1313
- name: Check running containers
1414
run: docker ps -a

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
# Change Log
22
All notable changes to this project will be documented in this file.
33

4+
## Wazuh Docker v4.0.2_1.11.0
5+
6+
### Added
7+
8+
- Update to Wazuh version 4.0.2
9+
410
## Wazuh Docker v4.0.1_1.11.0
511

612
### Added

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ ADMIN_PRIVILEGES=true # App privileges
155155

156156
| Wazuh version | ODFE |
157157
|---------------|---------|
158+
| v4.0.2 | 1.11.0 |
159+
|---------------|---------|
158160
| v4.0.1 | 1.11.0 |
159161
|---------------|---------|
160162
| v4.0.0 | 1.10.1 |

VERSION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
WAZUH-DOCKER_VERSION="4.0.1_1.11.0"
2-
REVISION="40100"
1+
WAZUH-DOCKER_VERSION="4.0.2_1.11.0"
2+
REVISION="40200"

build-from-sources.yml

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# Wazuh App Copyright (C) 2020 Wazuh Inc. (License GPLv2)
2+
version: '3.7'
3+
4+
services:
5+
wazuh:
6+
build: wazuh-odfe/
7+
image: wazuh/wazuh-odfe:dev-version
8+
hostname: wazuh-manager
9+
restart: always
10+
ports:
11+
- "1514:1514"
12+
- "1515:1515"
13+
- "514:514/udp"
14+
- "55000:55000"
15+
environment:
16+
- ELASTICSEARCH_URL=https://elasticsearch:9200
17+
- ELASTIC_USERNAME=admin
18+
- ELASTIC_PASSWORD=admin
19+
- FILEBEAT_SSL_VERIFICATION_MODE=none
20+
volumes:
21+
- ossec_api_configuration:/var/ossec/api/configuration
22+
- ossec_etc:/var/ossec/etc
23+
- ossec_logs:/var/ossec/logs
24+
- ossec_queue:/var/ossec/queue
25+
- ossec_var_multigroups:/var/ossec/var/multigroups
26+
- ossec_integrations:/var/ossec/integrations
27+
- ossec_active_response:/var/ossec/active-response/bin
28+
- ossec_agentless:/var/ossec/agentless
29+
- ossec_wodles:/var/ossec/wodles
30+
- filebeat_etc:/etc/filebeat
31+
- filebeat_var:/var/lib/filebeat
32+
33+
elasticsearch:
34+
image: amazon/opendistro-for-elasticsearch:1.11.0
35+
hostname: elasticsearch
36+
restart: always
37+
ports:
38+
- "9200:9200"
39+
environment:
40+
- discovery.type=single-node
41+
- cluster.name=wazuh-cluster
42+
- network.host=0.0.0.0
43+
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
44+
- bootstrap.memory_lock=true
45+
ulimits:
46+
memlock:
47+
soft: -1
48+
hard: -1
49+
nofile:
50+
soft: 65536
51+
hard: 65536
52+
53+
kibana:
54+
build: kibana-odfe/
55+
image: wazuh/wazuh-kibana-odfe:dev-version
56+
hostname: kibana
57+
restart: always
58+
ports:
59+
- 443:5601
60+
environment:
61+
- ELASTICSEARCH_USERNAME=admin
62+
- ELASTICSEARCH_PASSWORD=admin
63+
- SERVER_SSL_ENABLED=true
64+
- SERVER_SSL_CERTIFICATE=/usr/share/kibana/config/opendistroforelasticsearch.example.org.cert
65+
- SERVER_SSL_KEY=/usr/share/kibana/config/opendistroforelasticsearch.example.org.key
66+
67+
depends_on:
68+
- elasticsearch
69+
links:
70+
- elasticsearch:elasticsearch
71+
- wazuh:wazuh
72+
73+
volumes:
74+
ossec_api_configuration:
75+
ossec_etc:
76+
ossec_logs:
77+
ossec_queue:
78+
ossec_var_multigroups:
79+
ossec_integrations:
80+
ossec_active_response:
81+
ossec_agentless:
82+
ossec_wodles:
83+
filebeat_etc:
84+
filebeat_var:

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: '3.7'
33

44
services:
55
wazuh:
6-
image: wazuh/wazuh-odfe:4.0.1_1.11.0
6+
image: wazuh/wazuh-odfe:4.0.2_1.11.0
77
hostname: wazuh-manager
88
restart: always
99
ports:
@@ -50,7 +50,7 @@ services:
5050
hard: 65536
5151

5252
kibana:
53-
image: wazuh/wazuh-kibana-odfe:4.0.1_1.11.0
53+
image: wazuh/wazuh-kibana-odfe:4.0.2_1.11.0
5454
hostname: kibana
5555
restart: always
5656
ports:

kibana-odfe/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM amazon/opendistro-for-elasticsearch-kibana:1.11.0
33
USER kibana
44
ARG ELASTIC_VERSION=7.9.1
5-
ARG WAZUH_VERSION=4.0.1
5+
ARG WAZUH_VERSION=4.0.2
66
ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
77

88
WORKDIR /usr/share/kibana

production-cluster.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: '3.7'
33

44
services:
55
wazuh-master:
6-
image: wazuh/wazuh-odfe:4.0.1_1.11.0
6+
image: wazuh/wazuh-odfe:4.0.2_1.11.0
77
hostname: wazuh-master
88
restart: always
99
ports:
@@ -38,7 +38,7 @@ services:
3838
- ./production_cluster/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
3939

4040
wazuh-worker:
41-
image: wazuh/wazuh-odfe:4.0.1_1.11.0
41+
image: wazuh/wazuh-odfe:4.0.2_1.11.0
4242
hostname: wazuh-worker
4343
restart: always
4444
environment:
@@ -132,7 +132,7 @@ services:
132132
- ./production_cluster/elastic_opendistro/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml
133133

134134
kibana:
135-
image: wazuh/wazuh-kibana-odfe:4.0.1_1.11.0
135+
image: wazuh/wazuh-kibana-odfe:4.0.2_1.11.0
136136
hostname: kibana
137137
restart: always
138138
ports:

wazuh-odfe/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM centos:7
33

44
ARG FILEBEAT_VERSION=7.9.1
5-
ARG WAZUH_VERSION=4.0.1-1
5+
ARG WAZUH_VERSION=4.0.2-1
66
ARG TEMPLATE_VERSION="master"
77
ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.1.tar.gz"
88

0 commit comments

Comments
 (0)