Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update 1-config-filebeat #809

Open
wants to merge 40 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
01d2e4a
bump release 4.5.0
vcerenu May 23, 2022
41aba4a
bump release 4.5.0
vcerenu May 23, 2022
1077ea7
bump release 4.5.0
vcerenu May 23, 2022
9099671
Merge pull request #650 from wazuh/bump_4_5
alberpilot May 23, 2022
e538188
Merge 4.3.3 into master
vcerenu Jun 1, 2022
b1c05d8
Merge 4.3.3 into master
vcerenu Jun 1, 2022
89a0def
Merge pull request #665 from wazuh/merge_master
okynos Jun 1, 2022
d5bd975
Allow other Exceptions to bubble up a stack trace instead of silently…
daxxog Feb 10, 2022
f5afd6b
Merge pull request #576 from daxxog/master
alberpilot Jun 8, 2022
5c06d22
disable filebeat metrics
fcaffieri Jul 1, 2022
907f752
disable filebeat metrics
fcaffieri Jul 4, 2022
db6ef42
Merge pull request #686 from wazuh/1667-disable-filebeat-metrics-toma…
okynos Jul 4, 2022
16aec13
Add fix to avoid GLIBC crash
fcaffieri Jul 6, 2022
6e5d746
Add fix to avoid GLIBC crash, fix identation
fcaffieri Jul 6, 2022
69d3490
Merge pull request #690 from wazuh/1665-Fix-filebeat-crash-due-to-gli…
okynos Jul 7, 2022
d227048
bump 4.3 into master
vcerenu Jul 22, 2022
9d65678
bump 4.3 into master
vcerenu Jul 22, 2022
2c52963
Merge pull request #696 from wazuh/merge-43-master
okynos Jul 25, 2022
c37f57c
doble quote for password
vcerenu Sep 9, 2022
df39999
Merge pull request #718 from wazuh/master-add-double-quote
okynos Sep 12, 2022
d4f42d4
bump 4.3 into master
vcerenu Oct 14, 2022
4dcc558
bump 4.3 into master
vcerenu Oct 17, 2022
379bbb4
Merge pull request #729 from wazuh/merge_master
teddytpc1 Oct 17, 2022
e934f6d
update 4.4 to merge into master
vcerenu Feb 1, 2023
44d742c
Merge pull request #778 from wazuh/merge-master
teddytpc1 Feb 1, 2023
fa3843f
bump 4.6 version
vcerenu Feb 1, 2023
b67f1b4
Merge pull request #780 from wazuh/bump-4-6
teddytpc1 Feb 6, 2023
e5793bf
add vuln scans
vcerenu Feb 16, 2023
50ac013
fix wazuh manager test name
vcerenu Feb 16, 2023
3fc18c3
Merge pull request #783 from wazuh/773-vulnerability-tests-master
vcerenu Feb 16, 2023
13a590d
change schedule
vcerenu Feb 16, 2023
30bda78
Merge pull request #784 from wazuh/773-modifiy-schedule
vcerenu Feb 16, 2023
267aff9
change cron schedule
vcerenu Feb 17, 2023
0413562
change filename
vcerenu Feb 17, 2023
bde91b1
Merge pull request #786 from wazuh/773-modify-scheduler
vcerenu Feb 17, 2023
c2525f9
resolving conflicts for merge
vcerenu Mar 30, 2023
e0f6f50
Merge pull request #795 from wazuh/merge-4-4-to-master
teddytpc1 Mar 31, 2023
ff6f06e
Update 1-config-filebeat
ghaem51 Apr 5, 2023
1566409
Merge branch 'master' into patch-1
ghaem51 Jun 24, 2023
1d2df5c
Merge branch 'master' into patch-1
ghaem51 Jan 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Next Next commit
bump release 4.5.0
  • Loading branch information
vcerenu committed May 23, 2022
commit 01d2e4a50e43e4c875580913a53f424e5da38635
2 changes: 1 addition & 1 deletion .github/.goss.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ package:
wazuh-manager:
installed: true
versions:
- 4.4.0
- 4.5.0
port:
tcp:1514:
listening: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
version: v0.3.16

- name: Execute Goss tests (wazuh-odfe)
run: dgoss run wazuh/wazuh-manager:4.4.0
run: dgoss run wazuh/wazuh-manager:4.5.0
env:
GOSS_SLEEP: 30
GOSS_FILE: .github/.goss.yaml
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Change Log
All notable changes to this project will be documented in this file.

## Wazuh Docker v4.5.0
### Added

- Update Wazuh to version [4.5.0](https://github.com/wazuh/wazuh/blob/v4.5.0/CHANGELOG.md#v450)

## Wazuh Docker v4.4.0
### Added

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ WAZUH_MONITORING_REPLICAS=0 #

| Wazuh version | ODFE | XPACK |
|---------------|---------|--------|
| v4.5.0 | | |
| v4.4.0 | | |
| v4.3.1 | | |
| v4.3.0 | | |
Expand Down
4 changes: 2 additions & 2 deletions VERSION
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
WAZUH-DOCKER_VERSION="4.4.0"
REVISION="40400"
WAZUH-DOCKER_VERSION="4.5.0"
REVISION="40500"
6 changes: 3 additions & 3 deletions build-docker-images/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: '3.7'
services:
wazuh.manager:
build: wazuh-manager/
image: wazuh/wazuh-manager:4.4.0
image: wazuh/wazuh-manager:4.5.0
hostname: wazuh.manager
restart: always
ports:
Expand Down Expand Up @@ -32,7 +32,7 @@ services:

wazuh.indexer:
build: wazuh-indexer/
image: wazuh/wazuh-indexer:4.4.0
image: wazuh/wazuh-indexer:4.5.0
hostname: wazuh.indexer
restart: always
ports:
Expand All @@ -49,7 +49,7 @@ services:

wazuh.dashboard:
build: wazuh-dashboard/
image: wazuh/wazuh-dashboard:4.4.0
image: wazuh/wazuh-dashboard:4.5.0
hostname: wazuh.dashboard
restart: always
ports:
Expand Down
2 changes: 1 addition & 1 deletion build-docker-images/wazuh-dashboard/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
FROM ubuntu:focal AS builder

ARG WAZUH_VERSION=4.4.0
ARG WAZUH_VERSION=4.5.0
ARG INSTALL_DIR=/usr/share/wazuh-dashboard

# Update and install dependencies
Expand Down
4 changes: 2 additions & 2 deletions build-docker-images/wazuh-dashboard/config/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ export CONFIG_DIR=${INSTALLATION_DIR}/config

## Variables
CERT_TOOL=wazuh-certs-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.4/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.4/
PACKAGES_URL=https://packages.wazuh.com/4.5/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/

## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')
Expand Down
6 changes: 3 additions & 3 deletions build-docker-images/wazuh-indexer/config/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export TARGET_DIR=${CURDIR}/debian/${NAME}
# Package build options
export USER=${NAME}
export GROUP=${NAME}
export VERSION=4.4.0
export VERSION=4.5.0
export LOG_DIR=/var/log/${NAME}
export LIB_DIR=/var/lib/${NAME}
export PID_DIR=/run/${NAME}
Expand All @@ -30,8 +30,8 @@ tar -xf ${INDEXER_FILE}
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PASSWORD_TOOL=wazuh-passwords-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.4/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.4/
PACKAGES_URL=https://packages.wazuh.com/4.5/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/

## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')
Expand Down
4 changes: 2 additions & 2 deletions build-docker-images/wazuh-manager/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2)
FROM ubuntu:focal

ARG WAZUH_VERSION=4.4.0
ARG TEMPLATE_VERSION=4.4
ARG WAZUH_VERSION=4.5.0
ARG TEMPLATE_VERSION=4.5
ARG FILEBEAT_CHANNEL=filebeat-oss
ARG FILEBEAT_VERSION=7.10.2
ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.1.tar.gz"
Expand Down
4 changes: 2 additions & 2 deletions indexer-certs-creator/config/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
## Variables
CERT_TOOL=wazuh-certs-tool.sh
PASSWORD_TOOL=wazuh-passwords-tool.sh
PACKAGES_URL=https://packages.wazuh.com/4.4/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.4/
PACKAGES_URL=https://packages.wazuh.com/4.5/
PACKAGES_DEV_URL=https://packages-dev.wazuh.com/4.5/

## Check if the cert tool exists in S3 buckets
CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk '{print $2}')
Expand Down
4 changes: 2 additions & 2 deletions multi-node/config/wazuh_cluster/wazuh_worker.conf
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,8 @@
<global>
<white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list>
<white_list>4.4.0.1</white_list>
<white_list>4.4.0.2</white_list>
<white_list>4.5.0.1</white_list>
<white_list>4.5.0.2</white_list>
<white_list>208.67.220.220</white_list>
</global>

Expand Down
12 changes: 6 additions & 6 deletions multi-node/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3.7'

services:
wazuh.master:
image: wazuh/wazuh-manager:4.4.0
image: wazuh/wazuh-manager:4.5.0
hostname: wazuh.master
restart: always
ports:
Expand Down Expand Up @@ -38,7 +38,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf

wazuh.worker:
image: wazuh/wazuh-manager:4.4.0
image: wazuh/wazuh-manager:4.5.0
hostname: wazuh.worker
restart: always
environment:
Expand Down Expand Up @@ -67,7 +67,7 @@ services:
- ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf

wazuh1.indexer:
image: wazuh/wazuh-indexer:4.4.0
image: wazuh/wazuh-indexer:4.5.0
hostname: wazuh1.indexer
restart: always
ports:
Expand All @@ -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.4.0
image: wazuh/wazuh-indexer:4.5.0
hostname: wazuh2.indexer
restart: always
environment:
Expand All @@ -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.4.0
image: wazuh/wazuh-indexer:4.5.0
hostname: wazuh3.indexer
restart: always
environment:
Expand All @@ -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.4.0
image: wazuh/wazuh-dashboard:4.5.0
hostname: wazuh.dashboard
restart: always
ports:
Expand Down
4 changes: 2 additions & 2 deletions single-node/config/wazuh_cluster/wazuh_manager.conf
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,8 @@
<global>
<white_list>127.0.0.1</white_list>
<white_list>^localhost.localdomain$</white_list>
<white_list>4.4.0.1</white_list>
<white_list>4.4.0.2</white_list>
<white_list>4.5.0.1</white_list>
<white_list>4.5.0.2</white_list>
<white_list>208.67.220.220</white_list>
</global>

Expand Down
6 changes: 3 additions & 3 deletions single-node/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3.7'

services:
wazuh.manager:
image: wazuh/wazuh-manager:4.4.0
image: wazuh/wazuh-manager:4.5.0
hostname: wazuh.manager
restart: always
ports:
Expand Down Expand Up @@ -39,7 +39,7 @@ services:
- ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf

wazuh.indexer:
image: wazuh/wazuh-indexer:4.4.0
image: wazuh/wazuh-indexer:4.5.0
hostname: wazuh.indexer
restart: always
ports:
Expand All @@ -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.4.0
image: wazuh/wazuh-dashboard:4.5.0
hostname: wazuh.dashboard
restart: always
ports:
Expand Down