Compare commits

...

17 Commits

Author SHA1 Message Date
Gonzalo Acuña
fb66a358c8 Merge pull request #667 from wazuh/bump_4_3_3
Bump 4.3.3 into 4.3
2022-06-02 10:53:25 -03:00
vcerenu
83400ba1e5 bump 4.3.3 2022-06-02 10:31:20 -03:00
Alberto Rodríguez
8889c1237d Merge pull request #663 from wazuh/bump_4_3_3
Bump 4.3.3 to 4.3 Branch
2022-05-31 23:12:53 +02:00
vcerenu
f220927849 bump 4.3.3 version 2022-05-31 15:57:14 -03:00
vcerenu
480f0b7bef bump 4.3.3 version 2022-05-31 15:46:04 -03:00
vcerenu
af8627b992 bump 4.3.3 version 2022-05-31 10:55:09 -03:00
vcerenu
384ed07584 bump 4.3.3 version 2022-05-31 10:44:06 -03:00
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 66 additions and 45 deletions

2
.github/.goss.yaml vendored
View File

@@ -56,7 +56,7 @@ package:
wazuh-manager:
installed: true
versions:
- 4.3.1
- 4.3.3
port:
tcp:1514:
listening: true

View File

@@ -25,7 +25,7 @@ jobs:
version: v0.3.16
- name: Execute Goss tests (wazuh-odfe)
run: dgoss run wazuh/wazuh-manager:4.3.1
run: dgoss run wazuh/wazuh-manager:4.3.3
env:
GOSS_SLEEP: 30
GOSS_FILE: .github/.goss.yaml

View File

@@ -1,6 +1,16 @@
# Change Log
All notable changes to this project will be documented in this file.
## Wazuh Docker v4.3.3
### Added
- Update Wazuh to version [4.3.3](https://github.com/wazuh/wazuh/blob/v4.3.3/CHANGELOG.md#v433)
## 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
### Added
@@ -11,6 +21,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)
## 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
### Added

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.
This program is a free software; you can redistribute it and/or modify

View File

@@ -193,8 +193,12 @@ WAZUH_MONITORING_REPLICAS=0 #
| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.3.3 | | |
| v4.3.2 | | |
| v4.3.1 | | |
| 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.4 | 1.13.2 | 7.11.2 |
| v4.2.3 | 1.13.2 | 7.11.2 |
@@ -224,7 +228,7 @@ We thank you them and everyone else who has contributed to this project.
## License and copyright
Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
## Web references

View File

@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="4.3.1"
REVISION="40311"
WAZUH-DOCKER_VERSION="4.3.3"
REVISION="40315"

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'
services:
wazuh.manager:
build: wazuh-manager/
image: wazuh/wazuh-manager:4.3.1
image: wazuh/wazuh-manager:4.3.3
hostname: wazuh.manager
restart: always
ports:
@@ -32,7 +32,7 @@ services:
wazuh.indexer:
build: wazuh-indexer/
image: wazuh/wazuh-indexer:4.3.1
image: wazuh/wazuh-indexer:4.3.3
hostname: wazuh.indexer
restart: always
ports:
@@ -49,7 +49,7 @@ services:
wazuh.dashboard:
build: wazuh-dashboard/
image: wazuh/wazuh-dashboard:4.3.1
image: wazuh/wazuh-dashboard:4.3.3
hostname: wazuh.dashboard
restart: always
ports:

View File

@@ -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
ARG WAZUH_VERSION=4.3.1
ARG WAZUH_VERSION=4.3.3
ARG INSTALL_DIR=/usr/share/wazuh-dashboard
# Update and install dependencies

View File

@@ -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.
export DH_OPTIONS

View File

@@ -1,5 +1,5 @@
#!/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
DASHBOARD_USERNAME="${DASHBOARD_USERNAME:-kibanaserver}"

View File

@@ -1,7 +1,7 @@
---
#
# 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
# it under the terms of the GNU General Public License as published by

View File

@@ -1,5 +1,5 @@
#!/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_port="${API_PORT:-55000}"

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
RUN apt-get update -y && apt-get install curl openssl xz-utils -y

View File

@@ -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.
export DH_OPTIONS
@@ -8,7 +8,7 @@ export TARGET_DIR=${CURDIR}/debian/${NAME}
# Package build options
export USER=${NAME}
export GROUP=${NAME}
export VERSION=4.3.1
export VERSION=4.3.3
export LOG_DIR=/var/log/${NAME}
export LIB_DIR=/var/lib/${NAME}
export PID_DIR=/run/${NAME}

View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
set -e
umask 0002

View File

@@ -1,3 +1,3 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
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

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
ARG WAZUH_VERSION=4.3.1
ARG WAZUH_VERSION=4.3.3
ARG TEMPLATE_VERSION=4.3
ARG FILEBEAT_CHANNEL=filebeat-oss
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

View File

@@ -1,5 +1,5 @@
#!/usr/bin/with-contenv bash
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
# Variables
source /permanent_data.env

View File

@@ -1,5 +1,5 @@
#!/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

View File

@@ -1,5 +1,5 @@
#!/bin/bash
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
# Variables
source /permanent_data.env

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
RUN apt-get update && apt-get install openssl curl -y

View File

@@ -1,5 +1,5 @@
#!/bin/bash
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
##############################################################################
# Downloading Cert Gen Tool

View File

@@ -222,7 +222,6 @@
<global>
<white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list>
<white_list>127.0.0.53</white_list>
</global>
<command>

View File

@@ -222,7 +222,6 @@
<global>
<white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list>
<white_list>127.0.0.53</white_list>
</global>
<command>

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'
services:
wazuh.master:
image: wazuh/wazuh-manager:4.3.1
image: wazuh/wazuh-manager:4.3.3
hostname: wazuh.master
restart: always
ports:
@@ -38,7 +38,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.worker:
image: wazuh/wazuh-manager:4.3.1
image: wazuh/wazuh-manager:4.3.3
hostname: wazuh.worker
restart: always
environment:
@@ -67,7 +67,7 @@ services:
- ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
wazuh1.indexer:
image: wazuh/wazuh-indexer:4.3.1
image: wazuh/wazuh-indexer:4.3.3
hostname: wazuh1.indexer
restart: always
ports:
@@ -93,7 +93,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
wazuh2.indexer:
image: wazuh/wazuh-indexer:4.3.1
image: wazuh/wazuh-indexer:4.3.3
hostname: wazuh2.indexer
restart: always
environment:
@@ -115,7 +115,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
wazuh3.indexer:
image: wazuh/wazuh-indexer:4.3.1
image: wazuh/wazuh-indexer:4.3.3
hostname: wazuh3.indexer
restart: always
environment:
@@ -137,7 +137,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.3.1
image: wazuh/wazuh-dashboard:4.3.3
hostname: wazuh.dashboard
restart: always
ports:

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'
services:

View File

@@ -222,7 +222,6 @@
<global>
<white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list>
<white_list>10.0.0.106</white_list>
</global>
<command>

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'
services:
wazuh.manager:
image: wazuh/wazuh-manager:4.3.1
image: wazuh/wazuh-manager:4.3.3
hostname: wazuh.manager
restart: always
ports:
@@ -39,7 +39,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
wazuh.indexer:
image: wazuh/wazuh-indexer:4.3.1
image: wazuh/wazuh-indexer:4.3.3
hostname: wazuh.indexer
restart: always
ports:
@@ -64,7 +64,7 @@ services:
- ./config/wazuh_indexer/internal_users.yml:/usr/share/wazuh-indexer/plugins/opensearch-security/securityconfig/internal_users.yml
wazuh.dashboard:
image: wazuh/wazuh-dashboard:4.3.1
image: wazuh/wazuh-dashboard:4.3.3
hostname: wazuh.dashboard
restart: always
ports:

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'
services: