Compare commits

...
10 Commits
Author SHA1 Message Date
Alberto Rodríguez 946e3d6c5c Merge pull request #657 from wazuh/update-filebeat-module
Update filebeat module version
2022-05-30 20:13:53 +02:00
José Fernández Aguilera 259f18f96d Merge pull request #659 from wazuh/bump_4_3_2
Bump 4.3.2 to 4.3 Branch
2022-05-30 15:59:16 +02:00
vcerenu c22330761e bump 4.3.2 version 2022-05-30 10:29:46 -03:00
vcerenu a453502e9b bump 4.3.2 version 2022-05-30 07:00:22 -03:00
dfolcha 1bc73fb1c4 Update filebeat module version 2022-05-27 15:29:35 +02:00
Alberto Rodríguez dc34688b04 Merge pull request #653 from wazuh/change-copyright-format
Changed copyright format
2022-05-24 14:28:49 +02:00
Alberto R f3ae530bfa Fixed company name 2022-05-24 14:14:50 +02:00
Alberto R ae558612df Changed copyright format 2022-05-24 14:13:16 +02:00
Alberto Rodríguez 0576fcaf52 Merge pull request #652 from wazuh/fix_whitelist_4_3
Fix whitelist in 4.3
2022-05-23 16:10:00 +02:00
vcerenu 70c3a2929e fix whitelist 2022-05-23 10:54:57 -03:00
29 changed files with 60 additions and 45 deletions
+1 -1
View File
@@ -56,7 +56,7 @@ package:
wazuh-manager: wazuh-manager:
installed: true installed: true
versions: versions:
- 4.3.1 - 4.3.2
port: port:
tcp:1514: tcp:1514:
listening: true listening: true
+1 -1
View File
@@ -25,7 +25,7 @@ jobs:
version: v0.3.16 version: v0.3.16
- name: Execute Goss tests (wazuh-odfe) - name: Execute Goss tests (wazuh-odfe)
run: dgoss run wazuh/wazuh-manager:4.3.1 run: dgoss run wazuh/wazuh-manager:4.3.2
env: env:
GOSS_SLEEP: 30 GOSS_SLEEP: 30
GOSS_FILE: .github/.goss.yaml GOSS_FILE: .github/.goss.yaml
+15
View File
@@ -1,6 +1,11 @@
# Change Log # Change Log
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## Wazuh Docker v4.3.2
### Added
- Update Wazuh to version [4.3.2](https://github.com/wazuh/wazuh/blob/v4.3.2/CHANGELOG.md#v432)
## Wazuh Docker v4.3.1 ## Wazuh Docker v4.3.1
### Added ### Added
@@ -11,6 +16,16 @@ All notable changes to this project will be documented in this file.
- Update Wazuh to version [4.3.0](https://github.com/wazuh/wazuh/blob/v4.3.0/CHANGELOG.md#v430) - Update Wazuh to version [4.3.0](https://github.com/wazuh/wazuh/blob/v4.3.0/CHANGELOG.md#v430)
## Wazuh Docker v4.2.7
### Added
- Update Wazuh to version [4.2.7](https://github.com/wazuh/wazuh/blob/v4.2.7/CHANGELOG.md#v427)
## Wazuh Docker v4.2.6
### Added
- Update Wazuh to version [4.2.6](https://github.com/wazuh/wazuh/blob/v4.2.6/CHANGELOG.md#v426)
## Wazuh Docker v4.2.5 ## Wazuh Docker v4.2.5
### Added ### Added
+1 -1
View File
@@ -1,5 +1,5 @@
Portions Copyright (C) 2021 Wazuh, Inc. Portions Copyright (C) 2017, Wazuh Inc.
Based on work Copyright (C) 2003 - 2013 Trend Micro, Inc. Based on work Copyright (C) 2003 - 2013 Trend Micro, Inc.
This program is a free software; you can redistribute it and/or modify This program is a free software; you can redistribute it and/or modify
+4 -1
View File
@@ -193,8 +193,11 @@ WAZUH_MONITORING_REPLICAS=0 #
| Wazuh version | ODFE | XPACK | | Wazuh version | ODFE | XPACK |
|---------------|---------|--------| |---------------|---------|--------|
| v4.3.2 | | |
| v4.3.1 | | | | v4.3.1 | | |
| v4.3.0 | | | | v4.3.0 | | |
| v4.2.7 | 1.13.2 | 7.11.2 |
| v4.2.6 | 1.13.2 | 7.11.2 |
| v4.2.5 | 1.13.2 | 7.11.2 | | v4.2.5 | 1.13.2 | 7.11.2 |
| v4.2.4 | 1.13.2 | 7.11.2 | | v4.2.4 | 1.13.2 | 7.11.2 |
| v4.2.3 | 1.13.2 | 7.11.2 | | v4.2.3 | 1.13.2 | 7.11.2 |
@@ -224,7 +227,7 @@ We thank you them and everyone else who has contributed to this project.
## License and copyright ## License and copyright
Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
## Web references ## Web references
+2 -2
View File
@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="4.3.1" WAZUH-DOCKER_VERSION="4.3.2"
REVISION="40311" REVISION="40312"
+4 -4
View File
@@ -1,10 +1,10 @@
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3.7' version: '3.7'
services: services:
wazuh.manager: wazuh.manager:
build: wazuh-manager/ build: wazuh-manager/
image: wazuh/wazuh-manager:4.3.1 image: wazuh/wazuh-manager:4.3.2
hostname: wazuh.manager hostname: wazuh.manager
restart: always restart: always
ports: ports:
@@ -32,7 +32,7 @@ services:
wazuh.indexer: wazuh.indexer:
build: wazuh-indexer/ build: wazuh-indexer/
image: wazuh/wazuh-indexer:4.3.1 image: wazuh/wazuh-indexer:4.3.2
hostname: wazuh.indexer hostname: wazuh.indexer
restart: always restart: always
ports: ports:
@@ -49,7 +49,7 @@ services:
wazuh.dashboard: wazuh.dashboard:
build: wazuh-dashboard/ build: wazuh-dashboard/
image: wazuh/wazuh-dashboard:4.3.1 image: wazuh/wazuh-dashboard:4.3.2
hostname: wazuh.dashboard hostname: wazuh.dashboard
restart: always restart: always
ports: ports:
@@ -1,7 +1,7 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal AS builder FROM ubuntu:focal AS builder
ARG WAZUH_VERSION=4.3.1 ARG WAZUH_VERSION=4.3.2
ARG INSTALL_DIR=/usr/share/wazuh-dashboard ARG INSTALL_DIR=/usr/share/wazuh-dashboard
# Update and install dependencies # Update and install dependencies
@@ -1,4 +1,4 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
# This has to be exported to make some magic below work. # This has to be exported to make some magic below work.
export DH_OPTIONS export DH_OPTIONS
@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
INSTALL_DIR=/usr/share/wazuh-dashboard INSTALL_DIR=/usr/share/wazuh-dashboard
DASHBOARD_USERNAME="${DASHBOARD_USERNAME:-kibanaserver}" DASHBOARD_USERNAME="${DASHBOARD_USERNAME:-kibanaserver}"
@@ -1,7 +1,7 @@
--- ---
# #
# Wazuh app - App configuration file # Wazuh app - App configuration file
# Copyright (C) 2015-2021 Wazuh, Inc. # Copyright (C) 2017, Wazuh Inc.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
wazuh_url="${WAZUH_API_URL:-https://wazuh}" wazuh_url="${WAZUH_API_URL:-https://wazuh}"
wazuh_port="${API_PORT:-55000}" wazuh_port="${API_PORT:-55000}"
+1 -1
View File
@@ -1,4 +1,4 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal AS builder FROM ubuntu:focal AS builder
RUN apt-get update -y && apt-get install curl openssl xz-utils -y RUN apt-get update -y && apt-get install curl openssl xz-utils -y
@@ -1,4 +1,4 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
# This has to be exported to make some magic below work. # This has to be exported to make some magic below work.
export DH_OPTIONS export DH_OPTIONS
@@ -8,7 +8,7 @@ export TARGET_DIR=${CURDIR}/debian/${NAME}
# Package build options # Package build options
export USER=${NAME} export USER=${NAME}
export GROUP=${NAME} export GROUP=${NAME}
export VERSION=4.3.1 export VERSION=4.3.2
export LOG_DIR=/var/log/${NAME} export LOG_DIR=/var/log/${NAME}
export LIB_DIR=/var/lib/${NAME} export LIB_DIR=/var/lib/${NAME}
export PID_DIR=/run/${NAME} export PID_DIR=/run/${NAME}
@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
set -e set -e
umask 0002 umask 0002
@@ -1,3 +1,3 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
sleep 30 sleep 30
bash /usr/share/wazuh-indexer/plugins/opensearch-security/tools/securityadmin.sh -cd /usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/ -nhnv -cacert $CACERT -cert $CERT -key $KEY -p 9300 -icl bash /usr/share/wazuh-indexer/plugins/opensearch-security/tools/securityadmin.sh -cd /usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/ -nhnv -cacert $CACERT -cert $CERT -key $KEY -p 9300 -icl
+3 -3
View File
@@ -1,11 +1,11 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal FROM ubuntu:focal
ARG WAZUH_VERSION=4.3.1 ARG WAZUH_VERSION=4.3.2
ARG TEMPLATE_VERSION=4.3 ARG TEMPLATE_VERSION=4.3
ARG FILEBEAT_CHANNEL=filebeat-oss ARG FILEBEAT_CHANNEL=filebeat-oss
ARG FILEBEAT_VERSION=7.10.2 ARG FILEBEAT_VERSION=7.10.2
ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.1.tar.gz" ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.2.tar.gz"
RUN apt-get update && apt install curl apt-transport-https lsb-release gnupg -y RUN apt-get update && apt install curl apt-transport-https lsb-release gnupg -y
@@ -1,5 +1,5 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
# Variables # Variables
source /permanent_data.env source /permanent_data.env
@@ -1,5 +1,5 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
set -e set -e
@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
# Variables # Variables
source /permanent_data.env source /permanent_data.env
+1 -1
View File
@@ -1,4 +1,4 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
FROM ubuntu:focal FROM ubuntu:focal
RUN apt-get update && apt-get install openssl curl -y RUN apt-get update && apt-get install openssl curl -y
+1 -1
View File
@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
############################################################################## ##############################################################################
# Downloading Cert Gen Tool # Downloading Cert Gen Tool
@@ -222,7 +222,6 @@
<global> <global>
<white_list>127.0.0.1</white_list> <white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list> <white_list>^localhost.localdomain$</white_list>
<white_list>127.0.0.53</white_list>
</global> </global>
<command> <command>
@@ -222,7 +222,6 @@
<global> <global>
<white_list>127.0.0.1</white_list> <white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list> <white_list>^localhost.localdomain$</white_list>
<white_list>127.0.0.53</white_list>
</global> </global>
<command> <command>
+7 -7
View File
@@ -1,9 +1,9 @@
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3.7' version: '3.7'
services: services:
wazuh.master: wazuh.master:
image: wazuh/wazuh-manager:4.3.1 image: wazuh/wazuh-manager:4.3.2
hostname: wazuh.master hostname: wazuh.master
restart: always restart: always
ports: ports:
@@ -38,7 +38,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.worker: wazuh.worker:
image: wazuh/wazuh-manager:4.3.1 image: wazuh/wazuh-manager:4.3.2
hostname: wazuh.worker hostname: wazuh.worker
restart: always restart: always
environment: environment:
@@ -67,7 +67,7 @@ services:
- ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
wazuh1.indexer: wazuh1.indexer:
image: wazuh/wazuh-indexer:4.3.1 image: wazuh/wazuh-indexer:4.3.2
hostname: wazuh1.indexer hostname: wazuh1.indexer
restart: always restart: always
ports: ports:
@@ -93,7 +93,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
wazuh2.indexer: wazuh2.indexer:
image: wazuh/wazuh-indexer:4.3.1 image: wazuh/wazuh-indexer:4.3.2
hostname: wazuh2.indexer hostname: wazuh2.indexer
restart: always restart: always
environment: environment:
@@ -115,7 +115,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
wazuh3.indexer: wazuh3.indexer:
image: wazuh/wazuh-indexer:4.3.1 image: wazuh/wazuh-indexer:4.3.2
hostname: wazuh3.indexer hostname: wazuh3.indexer
restart: always restart: always
environment: environment:
@@ -137,7 +137,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
wazuh.dashboard: wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.3.1 image: wazuh/wazuh-dashboard:4.3.2
hostname: wazuh.dashboard hostname: wazuh.dashboard
restart: always restart: always
ports: ports:
+1 -1
View File
@@ -1,4 +1,4 @@
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3' version: '3'
services: services:
@@ -222,7 +222,6 @@
<global> <global>
<white_list>127.0.0.1</white_list> <white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list> <white_list>^localhost.localdomain$</white_list>
<white_list>10.0.0.106</white_list>
</global> </global>
<command> <command>
+4 -4
View File
@@ -1,9 +1,9 @@
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3.7' version: '3.7'
services: services:
wazuh.manager: wazuh.manager:
image: wazuh/wazuh-manager:4.3.1 image: wazuh/wazuh-manager:4.3.2
hostname: wazuh.manager hostname: wazuh.manager
restart: always restart: always
ports: ports:
@@ -39,7 +39,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.indexer: wazuh.indexer:
image: wazuh/wazuh-indexer:4.3.1 image: wazuh/wazuh-indexer:4.3.2
hostname: wazuh.indexer hostname: wazuh.indexer
restart: always restart: always
ports: ports:
@@ -64,7 +64,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml - ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
wazuh.dashboard: wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.3.1 image: wazuh/wazuh-dashboard:4.3.2
hostname: wazuh.dashboard hostname: wazuh.dashboard
restart: always restart: always
ports: ports:
+1 -1
View File
@@ -1,4 +1,4 @@
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2) # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3' version: '3'
services: services: