diff --git a/.github/.goss.yaml b/.github/.goss.yaml index 3ce20140..d0953629 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -6,7 +6,7 @@ package: wazuh-manager: installed: true versions: - - 4.3.1-1 + - 4.3.3 port: tcp:1514: listening: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d6d9579..25b6f14c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/LICENSE b/LICENSE index 51ab7d2f..05713a81 100644 --- a/LICENSE +++ b/LICENSE @@ -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 diff --git a/README.md b/README.md index ec18839a..90647e15 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/VERSION b/VERSION index 285e4dbc..f675ddc8 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.3.1" -REVISION="40311" +WAZUH-DOCKER_VERSION="4.3.3" +REVISION="40315" diff --git a/build-docker-images/build-images.sh b/build-docker-images/build-images.sh index 9218e49e..11ac20bf 100755 --- a/build-docker-images/build-images.sh +++ b/build-docker-images/build-images.sh @@ -1,4 +1,4 @@ -WAZUH_IMAGE_VERSION=4.3.1 +WAZUH_IMAGE_VERSION=4.3.3 WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g') WAZUH_ACTUAL_VERSION=$(curl --silent https://api.github.com/repos/wazuh/wazuh/releases/latest | grep '\"tag_name\":' | sed -E 's/.*\"([^\"]+)\".*/\1/' | cut -c 2- | sed -e 's/\.//g') diff --git a/build-docker-images/build-images.yml b/build-docker-images/build-images.yml index bf7a8f29..f842e7d6 100644 --- a/build-docker-images/build-images.yml +++ b/build-docker-images/build-images.yml @@ -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: diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile index 01bde554..0c1f9274 100644 --- a/build-docker-images/wazuh-dashboard/Dockerfile +++ b/build-docker-images/wazuh-dashboard/Dockerfile @@ -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 diff --git a/build-docker-images/wazuh-dashboard/config/config.sh b/build-docker-images/wazuh-dashboard/config/config.sh index 71cc485b..c33f8eb4 100644 --- a/build-docker-images/wazuh-dashboard/config/config.sh +++ b/build-docker-images/wazuh-dashboard/config/config.sh @@ -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 diff --git a/build-docker-images/wazuh-dashboard/config/entrypoint.sh b/build-docker-images/wazuh-dashboard/config/entrypoint.sh index d25432fa..54fe0d3e 100644 --- a/build-docker-images/wazuh-dashboard/config/entrypoint.sh +++ b/build-docker-images/wazuh-dashboard/config/entrypoint.sh @@ -1,5 +1,15 @@ #!/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}" +DASHBOARD_PASSWORD="${DASHBOARD_PASSWORD:-kibanaserver}" + +# Create and configure Wazuh dashboard keystore + +$INSTALL_DIR/bin/opensearch-dashboards-keystore create --allow-root && \ +echo $DASHBOARD_USERNAME | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.username --stdin --allow-root && \ +echo $DASHBOARD_PASSWORD | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.password --stdin --allow-root ############################################################################## # Start Wazuh dashboard diff --git a/build-docker-images/wazuh-dashboard/config/wazuh.yml b/build-docker-images/wazuh-dashboard/config/wazuh.yml index 2c5649d7..3fab9b09 100644 --- a/build-docker-images/wazuh-dashboard/config/wazuh.yml +++ b/build-docker-images/wazuh-dashboard/config/wazuh.yml @@ -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 diff --git a/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh b/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh index 3b5f2f5d..2457315a 100644 --- a/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh +++ b/build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh @@ -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}" diff --git a/build-docker-images/wazuh-indexer/Dockerfile b/build-docker-images/wazuh-indexer/Dockerfile index d613df93..216a8822 100644 --- a/build-docker-images/wazuh-indexer/Dockerfile +++ b/build-docker-images/wazuh-indexer/Dockerfile @@ -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 diff --git a/build-docker-images/wazuh-indexer/config/config.sh b/build-docker-images/wazuh-indexer/config/config.sh index 857e34b5..7647936f 100644 --- a/build-docker-images/wazuh-indexer/config/config.sh +++ b/build-docker-images/wazuh-indexer/config/config.sh @@ -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 diff --git a/build-docker-images/wazuh-indexer/config/entrypoint.sh b/build-docker-images/wazuh-indexer/config/entrypoint.sh index 084573fc..9b8747b5 100644 --- a/build-docker-images/wazuh-indexer/config/entrypoint.sh +++ b/build-docker-images/wazuh-indexer/config/entrypoint.sh @@ -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 diff --git a/build-docker-images/wazuh-indexer/config/securityadmin.sh b/build-docker-images/wazuh-indexer/config/securityadmin.sh index f9a5bb10..1fcf6467 100644 --- a/build-docker-images/wazuh-indexer/config/securityadmin.sh +++ b/build-docker-images/wazuh-indexer/config/securityadmin.sh @@ -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 \ No newline at end of file diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile index 2ba204e5..871357ae 100644 --- a/build-docker-images/wazuh-manager/Dockerfile +++ b/build-docker-images/wazuh-manager/Dockerfile @@ -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 rm /bin/sh && ln -s /bin/bash /bin/sh @@ -7,7 +7,7 @@ ARG WAZUH_VERSION 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 diff --git a/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init b/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init index c0e2ffff..0e93d33d 100644 --- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init +++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init @@ -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 diff --git a/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-config-filebeat b/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-config-filebeat index e475e357..c9062ba0 100644 --- a/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-config-filebeat +++ b/build-docker-images/wazuh-manager/config/etc/cont-init.d/1-config-filebeat @@ -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 diff --git a/build-docker-images/wazuh-manager/config/permanent_data.sh b/build-docker-images/wazuh-manager/config/permanent_data.sh index 600af0f1..4df54af5 100644 --- a/build-docker-images/wazuh-manager/config/permanent_data.sh +++ b/build-docker-images/wazuh-manager/config/permanent_data.sh @@ -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 diff --git a/indexer-certs-creator/Dockerfile b/indexer-certs-creator/Dockerfile index d9ac2941..58b2583f 100644 --- a/indexer-certs-creator/Dockerfile +++ b/indexer-certs-creator/Dockerfile @@ -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 diff --git a/indexer-certs-creator/config/entrypoint.sh b/indexer-certs-creator/config/entrypoint.sh index 86cc371f..3dd38447 100644 --- a/indexer-certs-creator/config/entrypoint.sh +++ b/indexer-certs-creator/config/entrypoint.sh @@ -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 diff --git a/multi-node/config/wazuh_cluster/wazuh_manager.conf b/multi-node/config/wazuh_cluster/wazuh_manager.conf index 70bb61fc..8747f02e 100644 --- a/multi-node/config/wazuh_cluster/wazuh_manager.conf +++ b/multi-node/config/wazuh_cluster/wazuh_manager.conf @@ -222,7 +222,6 @@ 127.0.0.1 ^localhost.localdomain$ - 127.0.0.53 diff --git a/multi-node/config/wazuh_cluster/wazuh_worker.conf b/multi-node/config/wazuh_cluster/wazuh_worker.conf index 38d72010..dc4475d2 100644 --- a/multi-node/config/wazuh_cluster/wazuh_worker.conf +++ b/multi-node/config/wazuh_cluster/wazuh_worker.conf @@ -222,7 +222,6 @@ 127.0.0.1 ^localhost.localdomain$ - 127.0.0.53 diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index e7d77de0..762fc883 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -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: diff --git a/multi-node/generate-indexer-certs.yml b/multi-node/generate-indexer-certs.yml index fb0f5c72..a3398661 100644 --- a/multi-node/generate-indexer-certs.yml +++ b/multi-node/generate-indexer-certs.yml @@ -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: diff --git a/single-node/config/wazuh_cluster/wazuh_manager.conf b/single-node/config/wazuh_cluster/wazuh_manager.conf index aff1af9d..cd432c19 100644 --- a/single-node/config/wazuh_cluster/wazuh_manager.conf +++ b/single-node/config/wazuh_cluster/wazuh_manager.conf @@ -222,7 +222,6 @@ 127.0.0.1 ^localhost.localdomain$ - 10.0.0.106 diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 0a0145a8..e506deb7 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -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: diff --git a/single-node/generate-indexer-certs.yml b/single-node/generate-indexer-certs.yml index fb0f5c72..a3398661 100644 --- a/single-node/generate-indexer-certs.yml +++ b/single-node/generate-indexer-certs.yml @@ -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: