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

Merge 4.3.3 into master #665

Merged
merged 17 commits into from
Jun 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,16 @@ All notable changes to this project will be documented in this file.

- Update Wazuh to version [4.4.0](https://github.com/wazuh/wazuh/blob/v4.4.0/CHANGELOG.md#v440)

## 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

Expand All @@ -21,6 +31,11 @@ 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

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,11 @@ WAZUH_MONITORING_REPLICAS=0 #
|---------------|---------|--------|
| v4.5.0 | | |
| v4.4.0 | | |
| 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 |
Expand Down Expand Up @@ -227,7 +230,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

Expand Down
2 changes: 1 addition & 1 deletion build-docker-images/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3.7'

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

ARG WAZUH_VERSION=4.5.0
Expand Down
2 changes: 1 addition & 1 deletion build-docker-images/wazuh-dashboard/config/config.sh
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion build-docker-images/wazuh-dashboard/config/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion build-docker-images/wazuh-dashboard/config/wazuh.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion build-docker-images/wazuh-indexer/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion build-docker-images/wazuh-indexer/config/config.sh
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion build-docker-images/wazuh-indexer/config/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion build-docker-images/wazuh-indexer/config/securityadmin.sh
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions build-docker-images/wazuh-manager/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.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"
ARG WAZUH_FILEBEAT_MODULE="wazuh-filebeat-0.2.tar.gz"

RUN apt-get update && apt install curl apt-transport-https lsb-release gnupg -y

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion build-docker-images/wazuh-manager/config/permanent_data.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion indexer-certs-creator/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion indexer-certs-creator/config/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion multi-node/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3.7'

services:
Expand Down
2 changes: 1 addition & 1 deletion multi-node/generate-indexer-certs.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion single-node/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Wazuh App Copyright (C) 2021 Wazuh Inc. (License GPLv2)
# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
version: '3.7'

services:
Expand Down
2 changes: 1 addition & 1 deletion single-node/generate-indexer-certs.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down