Merge pull request #397 from wazuh/release-wazuh_4.0.0

Release 4.0.0

CHANGELOG.md

@@ -1,8 +1,35 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-# Change Log
-All notable changes to this project will be documented in this file.
+## Wazuh Docker v4.0.0
+
+### Added
+
+- Update to Wazuh version 4.0.0
+- Updating Wazuh cluster key dynamically ([@1stOfHisGame](https://github.com/1stOfHisGame))  [#393](https://github.com/wazuh/wazuh-docker/pull/393)
+- Switched to CentOS 7 for base image ([@xr09](https://github.com/xr09)) [#259](https://github.com/wazuh/wazuh-docker/issues/259)
+- Using s6-overlay for process management ([@xr09](https://github.com/xr09)) [#274](https://github.com/wazuh/wazuh-docker/issues/274)
+- Allow the creation of custom API users ([@xr09](https://github.com/xr09)) [#395](https://github.com/wazuh/wazuh-docker/issues/395)
+- OpenDistro support ([@xr09](https://github.com/xr09)) [#373](https://github.com/wazuh/wazuh-docker/pull/373)
+
+
+### Changed
+
+- Removal of Elastic images
+
+
+## Wazuh Docker v3.13.2_7.9.1
+
+### Added
+
+- Update to Wazuh version 3.13.2_7.9.1
+- Add CLUSTER_NETWORK_HOST environment variable ([@jfut](https://github.com/jfut)) [#372](https://github.com/wazuh/wazuh-docker/pull/372)
+
+### Fixed
+
+- Too many redirects when running on port 80 ([@chowmean](https://github.com/chowmean)) [#377](https://github.com/wazuh/wazuh-docker/pull/377)
+- Move Filebeat installation to build stage ([@xr09](https://github.com/xr09)) [#378](https://github.com/wazuh/wazuh-docker/pull/378)
+
 
 ## Wazuh Docker v3.13.1_7.8.0
 
@@ -10,6 +37,7 @@ All notable changes to this project will be documented in this file.
 
 - Update to Wazuh version 3.13.1_7.8.0
 
+
 ## Wazuh Docker v3.13.0_7.7.1
 
 ### Added
@@ -27,6 +55,7 @@ All notable changes to this project will be documented in this file.
 
 - Update to Wazuh version 3.12.3_7.6.2
 
+
 ## Wazuh Docker v3.12.2_7.6.2
 
 ### Added

README.md

@@ -87,37 +87,57 @@ ADMIN_PRIVILEGES=true               # App privileges
 
 ## Directory structure
 
-    wazuh-docker
     ├── CHANGELOG.md
     ├── docker-compose.yml
-    ├── elasticsearch
-    │   ├── config
-    │   │   ├── config_cluster.sh
-    │   │   ├── configure_s3.sh
-    │   │   ├── entrypoint.sh
-    │   │   └── load_settings.sh
-    │   └── Dockerfile
-    ├── kibana
+    ├── elastic_conf
+    │   └── elasticsearch.yml
+    ├── generate-opendistro-certs.yml
+    ├── kibana-odfe
     │   ├── config
+    │   │   ├── custom_welcome
+    │   │   │   ├── light_theme.style.css
+    │   │   │   ├── template.js.hbs
+    │   │   │   ├── wazuh_logo_circle.svg
+    │   │   │   └── wazuh_wazuh_bg.svg
     │   │   ├── entrypoint.sh
     │   │   ├── kibana_settings.sh
     │   │   ├── wazuh_app_config.sh
-    │   │   ├── welcome_wazuh.sh
-    │   │   └── xpack_config.sh
+    │   │   ├── wazuh.yml
+    │   │   └── welcome_wazuh.sh
     │   └── Dockerfile
     ├── LICENSE
+    ├── production_cluster
+    │   ├── elastic_opendistro
+    │   │   ├── elasticsearch-node1.yml
+    │   │   ├── elasticsearch-node2.yml
+    │   │   ├── elasticsearch-node3.yml
+    │   │   └── internal_users.yml
+    │   ├── kibana_ssl
+    │   │   └── generate-self-signed-cert.sh
+    │   ├── nginx
+    │   │   ├── nginx.conf
+    │   │   └── ssl
+    │   │       └── generate-self-signed-cert.sh
+    │   ├── ssl_certs
+    │   │   └── certs.yml
+    │   └── wazuh_cluster
+    │       ├── wazuh_manager.conf
+    │       └── wazuh_worker.conf
+    ├── production-cluster.yml
     ├── README.md
     ├── VERSION
-    └── wazuh
+    └── wazuh-odfe
         ├── config
+        │   ├── create_user.py
         │   ├── etc
         │   │   ├── cont-init.d
         │   │   │   ├── 0-wazuh-init
         │   │   │   ├── 1-config-filebeat
         │   │   │   └── 2-manager
         │   │   └── services.d
-        │   │       ├── api
         │   │       └── filebeat
+        │   │           ├── finish
+        │   │           └── run
         │   ├── filebeat.yml
         │   ├── permanent_data.env
         │   ├── permanent_data.sh
@@ -125,9 +145,10 @@ ADMIN_PRIVILEGES=true               # App privileges
         └── Dockerfile
 
 
+
 ## Branches
 
-* `stable` branch on correspond to the latest Wazuh-Docker stable version.
+* `4.0` branch on correspond to the latest Wazuh-Docker stable version.
 * `master` branch contains the latest code, be aware of possible bugs on this branch.
 * `Wazuh.Version_ElasticStack.Version` (for example 3.10.2_7.5.0) branch. This branch contains the current release referenced in Docker Hub. The container images are installed under the current version of this branch.
 

VERSION

@@ -1,2 +1,2 @@
-WAZUH-DOCKER_VERSION="3.13.1_7.8.0"
-REVISION="31310"
+WAZUH-DOCKER_VERSION="4.0.0"
+REVISION="40000"

docker-compose.yml

@@ -3,8 +3,7 @@ version: '3.7'
 
 services:
   wazuh:
-    build: wazuh-opendistro/
-    image: wazuh-opendistro
+    image: wazuh/wazuh-odfe:4.0.0
     hostname: wazuh-manager
     restart: always
     ports:
@@ -51,8 +50,7 @@ services:
         hard: 65536
 
   kibana:
-    build: kibana-opendistro/
-    image: wazuh-kibana-opendistro
+    image: wazuh/wazuh-kibana-odfe:4.0.0
     hostname: kibana
     restart: always
     ports:

production-cluster.yml

@@ -3,8 +3,7 @@ version: '3.7'
 
 services:
   wazuh-master:
-    build: wazuh-opendistro/
-    image: wazuh-opendistro
+    image: wazuh/wazuh-odfe:4.0.0
     hostname: wazuh-master
     restart: always
     ports:
@@ -39,8 +38,7 @@ services:
       - ./production_cluster/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh-worker:
-    build: wazuh-opendistro/
-    image: wazuh-opendistro
+    image: wazuh/wazuh-odfe:4.0.0
     hostname: wazuh-worker
     restart: always
     environment:
@@ -134,8 +132,7 @@ services:
       - ./production_cluster/elastic_opendistro/internal_users.yml:/usr/share/elasticsearch/plugins/opendistro_security/securityconfig/internal_users.yml
 
   kibana:
-    build: kibana-opendistro/
-    image: wazuh-kibana-opendistro
+    image: wazuh/wazuh-kibana-odfe:4.0.0
     hostname: kibana
     restart: always
     ports:

wazuh-odfe/config/etc/cont-init.d/0-wazuh-init

@@ -133,6 +133,19 @@ set_custom_hostname() {
   sed -i 's/<node_name>to_be_replaced_by_hostname<\/node_name>/<node_name>'"${HOSTNAME}"'<\/node_name>/g' ${WAZUH_INSTALL_PATH}/etc/ossec.conf
 }
 
+##############################################################################
+# Allow users to set the container cluster key dynamically on
+# container start.
+#
+# To use this:
+# 1. Create your own ossec.conf file
+# 2. In your ossec.conf file, set to_be_replaced_by_cluster_key as your key
+# 3. Mount your custom ossec.conf file at $WAZUH_CONFIG_MOUNT/etc/ossec.conf
+##############################################################################
+
+set_custom_cluster_key() {
+  sed -i 's/<key>to_be_replaced_by_cluster_key<\/key>/<key>'"${WAZUH_CLUSTER_KEY}"'<\/key>/g' ${WAZUH_INSTALL_PATH}/etc/ossec.conf
+}
 
 ##############################################################################
 # Main function
@@ -163,6 +176,9 @@ main() {
   # Allow setting custom hostname
   set_custom_hostname
 
+  # Allow setting custom cluster key
+  set_custom_cluster_key
+
   # Delete temporary data folder
   rm -rf ${WAZUH_INSTALL_PATH}/data_tmp