Compare commits

...
18 Commits
Author SHA1 Message Date
Gonzalo Acuña 4ebeaba873 Merge pull request #538 from wazuh/535-release-4.2.4
Update release 4.2.4
2021-10-20 10:09:52 -03:00
vcerenu aa59a302c3 Update release 4.2.4 2021-10-19 16:37:13 -03:00
Gonzalo Acuña 67d92fc992 Merge pull request #537 from wazuh/535-release-4.2.4
Release v4.2.4
2021-10-18 15:28:34 -03:00
vcerenu fbe7a0a571 update release 4.2.4 2021-10-14 16:39:41 -03:00
vcerenu ffffe5539a update release 4.2.4 2021-10-14 16:23:43 -03:00
José Fernández Aguilera d46ce7aee3 Merge pull request #530 from wazuh/529-release-423
Release v4.2.3
2021-10-07 15:54:45 +02:00
vcerenu 4d0b06b91e bump release 4.2.3 2021-10-06 08:38:25 -03:00
vcerenu 391b5d237c bump release 4.2.3 2021-10-05 12:57:25 -03:00
Alberto Rodríguez e99ba259e0 Added util.py to permanent data 2021-09-23 20:00:03 +02:00
Alberto Rodríguez f00245007d Merge pull request #516 from wazuh/4.2.2
Release v4.2.2
2021-09-15 16:50:12 +02:00
vcerenu 084407f9c9 Update 4.2.2 2021-09-15 10:55:43 -03:00
vcerenu f0ebabad89 Update 4.2.2 2021-09-15 10:51:19 -03:00
Alberto Rodríguez afd70ff5f9 Merge pull request #513 from wazuh/4.2.1
Release v4.2.1
2021-09-14 15:12:06 +02:00
vcerenu 61f3e080a3 Update 4.2.1 2021-09-14 10:08:48 -03:00
vcerenu 2dd9fdfa99 Update 4.2.1 2021-09-14 10:03:16 -03:00
vcerenu daaac09c9c Update 4.2.1 2021-09-13 15:21:53 -03:00
vcerenu 8d0dd5baeb Update 4.2.1 2021-09-09 11:13:04 -03:00
vcerenu 9e9de07322 Update 4.2.1 2021-09-09 09:23:36 -03:00
16 changed files with 52 additions and 25 deletions
+1 -1
View File
@@ -56,7 +56,7 @@ package:
wazuh-manager:
installed: true
versions:
- 4.2.0
- 4.2.4
port:
tcp:1514:
listening: true
+21
View File
@@ -1,6 +1,27 @@
# Change Log
All notable changes to this project will be documented in this file.
## Wazuh Docker v4.2.4
### Added
- Update Wazuh to version [4.2.4](https://github.com/wazuh/wazuh/blob/v4.2.4/CHANGELOG.md#v424)
## Wazuh Docker v4.2.3
### Added
- Update Wazuh to version [4.2.3](https://github.com/wazuh/wazuh/blob/v4.2.3/CHANGELOG.md#v423)
## Wazuh Docker v4.2.2
### Added
- Update Wazuh to version [4.2.2](https://github.com/wazuh/wazuh/blob/v4.2.2/CHANGELOG.md#v422)
## Wazuh Docker v4.2.1
### Added
- Update Wazuh to version [4.2.1](https://github.com/wazuh/wazuh/blob/v4.2.1/CHANGELOG.md#v421)
## Wazuh Docker v4.2.0
### Added
+4
View File
@@ -154,6 +154,10 @@ ADMIN_PRIVILEGES=true # App privileges
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.2.4 | 1.13.2 | 7.11.2 |
| v4.2.3 | 1.13.2 | 7.11.2 |
| v4.2.2 | 1.13.2 | 7.11.2 |
| v4.2.1 | 1.13.2 | 7.11.2 |
| v4.2.0 | 1.13.2 | 7.10.2 |
| v4.1.5 | 1.13.2 | 7.10.2 |
| v4.1.4 | 1.12.0 | 7.10.2 |
+2 -2
View File
@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="4.2.0"
REVISION="40212"
WAZUH-DOCKER_VERSION="4.2.4"
REVISION="40219"
+2 -2
View File
@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh:
image: wazuh/wazuh-odfe:4.2.0
image: wazuh/wazuh-odfe:4.2.4
hostname: wazuh-manager
restart: always
ports:
@@ -50,7 +50,7 @@ services:
hard: 65536
kibana:
image: wazuh/wazuh-kibana-odfe:4.2.0
image: wazuh/wazuh-kibana-odfe:4.2.4
hostname: kibana
restart: always
ports:
+1 -1
View File
@@ -10,7 +10,7 @@ services:
bin/elasticsearch-certutil cert --silent --pem --in config/certificates/instances.yml -out config/certificates/bundle.zip;
unzip config/certificates/bundle.zip -d config/certificates/;
fi;
chown -R 1000:0 /certs
chown -R 1000:0 config/certificates
'
user: "0"
working_dir: /usr/share/elasticsearch
+1 -1
View File
@@ -2,7 +2,7 @@
FROM amazon/opendistro-for-elasticsearch-kibana:1.13.2
USER kibana
ARG ELASTIC_VERSION=7.10.2
ARG WAZUH_VERSION=4.2.0
ARG WAZUH_VERSION=4.2.4
ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
WORKDIR /usr/share/kibana
+1 -1
View File
@@ -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.2.0
ARG WAZUH_VERSION=4.2.4
ARG WAZUH_APP_VERSION="${WAZUH_VERSION}_${ELASTIC_VERSION}"
WORKDIR /usr/share/kibana
+3 -3
View File
@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh-master:
image: wazuh/wazuh-odfe:4.2.0
image: wazuh/wazuh-odfe:4.2.4
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.2.0
image: wazuh/wazuh-odfe:4.2.4
hostname: wazuh-worker
restart: always
environment:
@@ -134,7 +134,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.2.0
image: wazuh/wazuh-kibana-odfe:4.2.4
hostname: kibana
restart: always
ports:
@@ -9,4 +9,5 @@ then
exit
else
openssl req -x509 -batch -nodes -days 365 -newkey rsa:2048 -keyout key.pem -out cert.pem
chown -R 1000:1000 *.pem
fi
@@ -200,8 +200,8 @@
<global>
<white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list>
<white_list>4.2.2.1</white_list>
<white_list>4.2.2.2</white_list>
<white_list>4.2.4.1</white_list>
<white_list>4.2.4.2</white_list>
<white_list>208.67.220.220</white_list>
</global>
@@ -200,8 +200,8 @@
<global>
<white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list>
<white_list>4.2.2.1</white_list>
<white_list>4.2.2.2</white_list>
<white_list>4.2.4.1</white_list>
<white_list>4.2.4.2</white_list>
<white_list>208.67.220.220</white_list>
</global>
+1 -1
View File
@@ -3,7 +3,7 @@ FROM centos:7
ARG FILEBEAT_CHANNEL=filebeat-oss
ARG FILEBEAT_VERSION=7.10.2
ARG WAZUH_VERSION=4.2.0-1
ARG WAZUH_VERSION=4.2.4
ARG TEMPLATE_VERSION="master"
ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.1.tar.gz"
+2 -1
View File
@@ -58,6 +58,7 @@ PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/gcloud"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/gcloud.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/integration.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/tools.py"
PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/utils.py"
export PERMANENT_DATA_EXCP
# Files mounted in a volume that should be deleted
@@ -68,4 +69,4 @@ export PERMANENT_DATA_DEL
i=0
PERMANENT_DATA_MOVE[((i++))]="/var/ossec/logs/ossec /var/ossec/logs/wazuh"
PERMANENT_DATA_MOVE[((i++))]="/var/ossec/queue/ossec /var/ossec/queue/sockets"
export PERMANENT_DATA_MOVE
export PERMANENT_DATA_MOVE
+2 -2
View File
@@ -3,7 +3,7 @@ version: '3.7'
services:
wazuh:
image: wazuh/wazuh:4.2.0
image: wazuh/wazuh:4.2.4
hostname: wazuh-manager
restart: always
ports:
@@ -146,7 +146,7 @@ services:
kibana:
image: wazuh/wazuh-kibana:4.2.0
image: wazuh/wazuh-kibana:4.2.4
hostname: kibana
restart: always
ports:
+6 -6
View File
@@ -7,8 +7,8 @@ services:
context: wazuh-odfe/
args:
- FILEBEAT_CHANNEL=filebeat
- FILEBEAT_VERSION=7.10.2
image: wazuh/wazuh:4.2.0
- FILEBEAT_VERSION=7.11.2
image: wazuh/wazuh:4.2.4
hostname: wazuh-manager
restart: always
ports:
@@ -42,7 +42,7 @@ services:
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:7.10.2
image: docker.elastic.co/elasticsearch/elasticsearch:7.11.2
hostname: elasticsearch
restart: always
ports:
@@ -79,7 +79,7 @@ services:
- ./xpack/elasticsearch/elasticsearch.crt:/usr/share/elasticsearch/config/elasticsearch.crt
elasticsearch2:
image: docker.elastic.co/elasticsearch/elasticsearch:7.10.2
image: docker.elastic.co/elasticsearch/elasticsearch:7.11.2
hostname: elasticsearch2
restart: always
environment:
@@ -114,7 +114,7 @@ services:
- ./xpack/elasticsearch2/elasticsearch2.crt:/usr/share/elasticsearch/config/elasticsearch.crt
elasticsearch3:
image: docker.elastic.co/elasticsearch/elasticsearch:7.10.2
image: docker.elastic.co/elasticsearch/elasticsearch:7.11.2
hostname: elasticsearch3
restart: always
environment:
@@ -152,7 +152,7 @@ services:
kibana:
build: kibana/
image: wazuh/wazuh-kibana:4.2.0
image: wazuh/wazuh-kibana:4.2.4
hostname: kibana
restart: always
ports: