From a16d9ab969f9cb46155a84187b35739a5acf83ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Rodr=C3=ADguez?= Date: Tue, 26 Apr 2022 16:29:32 +0200 Subject: [PATCH 01/16] Create .gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..a2abaa56 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +single-node/config/wazuh_indexer_ssl_certs/*.pem +single-node/config/wazuh_indexer_ssl_certs/*.key +multi-node/config/wazuh_indexer_ssl_certs/*.pem +multi-node/config/wazuh_indexer_ssl_certs/*.key From 16ac5b91030ae9ab3c81d43532635ab0a4bf1059 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 26 Apr 2022 12:11:52 -0300 Subject: [PATCH 02/16] fix certs.yml path --- indexer-certs-creator/config/entrypoint.sh | 2 +- multi-node/config/{wazuh_indexer_ssl_certs => }/certs.yml | 0 multi-node/generate-indexer-certs.yml | 3 ++- single-node/config/{wazuh_indexer_ssl_certs => }/certs.yml | 0 single-node/generate-indexer-certs.yml | 3 ++- 5 files changed, 5 insertions(+), 3 deletions(-) rename multi-node/config/{wazuh_indexer_ssl_certs => }/certs.yml (100%) rename single-node/config/{wazuh_indexer_ssl_certs => }/certs.yml (100%) diff --git a/indexer-certs-creator/config/entrypoint.sh b/indexer-certs-creator/config/entrypoint.sh index 804a8d90..86cc371f 100644 --- a/indexer-certs-creator/config/entrypoint.sh +++ b/indexer-certs-creator/config/entrypoint.sh @@ -28,7 +28,7 @@ else exit 1 fi -cp /certificates/certs.yml /config.yml +cp /config/certs.yml /config.yml chmod 700 /$CERT_TOOL diff --git a/multi-node/config/wazuh_indexer_ssl_certs/certs.yml b/multi-node/config/certs.yml similarity index 100% rename from multi-node/config/wazuh_indexer_ssl_certs/certs.yml rename to multi-node/config/certs.yml diff --git a/multi-node/generate-indexer-certs.yml b/multi-node/generate-indexer-certs.yml index 0886acd3..fb0f5c72 100644 --- a/multi-node/generate-indexer-certs.yml +++ b/multi-node/generate-indexer-certs.yml @@ -6,4 +6,5 @@ services: image: wazuh/wazuh-certs-generator:0.0.1 hostname: wazuh-certs-generator volumes: - - ./config/wazuh_indexer_ssl_certs/:/certificates/ \ No newline at end of file + - ./config/wazuh_indexer_ssl_certs/:/certificates/ + - ./config/certs.yml:/config/certs.yml \ No newline at end of file diff --git a/single-node/config/wazuh_indexer_ssl_certs/certs.yml b/single-node/config/certs.yml similarity index 100% rename from single-node/config/wazuh_indexer_ssl_certs/certs.yml rename to single-node/config/certs.yml diff --git a/single-node/generate-indexer-certs.yml b/single-node/generate-indexer-certs.yml index 0886acd3..fb0f5c72 100644 --- a/single-node/generate-indexer-certs.yml +++ b/single-node/generate-indexer-certs.yml @@ -6,4 +6,5 @@ services: image: wazuh/wazuh-certs-generator:0.0.1 hostname: wazuh-certs-generator volumes: - - ./config/wazuh_indexer_ssl_certs/:/certificates/ \ No newline at end of file + - ./config/wazuh_indexer_ssl_certs/:/certificates/ + - ./config/certs.yml:/config/certs.yml \ No newline at end of file From 45011c1b6882c288382577d5c295a0338221e28c Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 28 Apr 2022 10:47:07 -0300 Subject: [PATCH 03/16] change config file permissions --- build-docker-images/wazuh-indexer/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build-docker-images/wazuh-indexer/Dockerfile b/build-docker-images/wazuh-indexer/Dockerfile index a09d9e56..26aa1afc 100644 --- a/build-docker-images/wazuh-indexer/Dockerfile +++ b/build-docker-images/wazuh-indexer/Dockerfile @@ -60,7 +60,10 @@ COPY --from=builder --chown=0:0 /debian/wazuh-indexer/usr/lib/tmpfiles.d /usr/li RUN mkdir -p /var/lib/wazuh-indexer && chown 1000:1000 /var/lib/wazuh-indexer && \ mkdir -p /usr/share/wazuh-indexer/logs && chown 1000:1000 /usr/share/wazuh-indexer/logs && \ mkdir -p /run/wazuh-indexer && chown 1000:1000 /run/wazuh-indexer && \ - mkdir -p /var/log/wazuh-indexer && chown 1000:1000 /var/log/wazuh-indexer + mkdir -p /var/log/wazuh-indexer && chown 1000:1000 /var/log/wazuh-indexer && \ + chmod 700 /usr/share/wazuh_indexer/config && \ + chmod 600 /usr/share/wazuh_indexer/config/jvm.options && \ + chmod 600 /usr/share/wazuh_indexer/config/opensearch.yml USER wazuh-indexer From 40ce99e8aa7c757be75d3e8cdacfb4846e0f94cd Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 29 Apr 2022 10:31:53 -0300 Subject: [PATCH 04/16] change config file permissions --- build-docker-images/wazuh-indexer/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-docker-images/wazuh-indexer/Dockerfile b/build-docker-images/wazuh-indexer/Dockerfile index 26aa1afc..e4c61e2a 100644 --- a/build-docker-images/wazuh-indexer/Dockerfile +++ b/build-docker-images/wazuh-indexer/Dockerfile @@ -61,9 +61,9 @@ RUN mkdir -p /var/lib/wazuh-indexer && chown 1000:1000 /var/lib/wazuh-indexer && mkdir -p /usr/share/wazuh-indexer/logs && chown 1000:1000 /usr/share/wazuh-indexer/logs && \ mkdir -p /run/wazuh-indexer && chown 1000:1000 /run/wazuh-indexer && \ mkdir -p /var/log/wazuh-indexer && chown 1000:1000 /var/log/wazuh-indexer && \ - chmod 700 /usr/share/wazuh_indexer/config && \ - chmod 600 /usr/share/wazuh_indexer/config/jvm.options && \ - chmod 600 /usr/share/wazuh_indexer/config/opensearch.yml + chmod 700 /usr/share/wazuh-indexer/config && \ + chmod 600 /usr/share/wazuh-indexer/config/jvm.options && \ + chmod 600 /usr/share/wazuh-indexer/config/opensearch.yml USER wazuh-indexer From 35c66186da0d2491290e27db1bb7954c065295d2 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Fri, 29 Apr 2022 17:51:10 -0300 Subject: [PATCH 05/16] New validation of empty dir --- .../wazuh-manager/config/etc/cont-init.d/0-wazuh-init | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 06408a2e..7a901881 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 @@ -41,12 +41,16 @@ exec_cmd_stdout() { mount_permanent_data() { for permanent_dir in "${PERMANENT_DATA[@]}"; do + data_tmp="${WAZUH_INSTALL_PATH}/data_tmp/permanent${permanent_dir}/" + print ${data_tmp} # Check if the path is not empty if find ${permanent_dir} -mindepth 1 | read; then print "The path ${permanent_dir} is already mounted" else - print "Installing ${permanent_dir}" - exec_cmd "cp -a ${WAZUH_INSTALL_PATH}/data_tmp/permanent${permanent_dir}/. ${permanent_dir}" + if find ${data_tmp} -mindepth 1 | read; then + print "Installing ${permanent_dir}" + exec_cmd "cp -a ${data_tmp}. ${permanent_dir}" + fi fi done } From 8afc88a16328c605924abf782e59a6bcb2398577 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 2 May 2022 12:30:03 -0300 Subject: [PATCH 06/16] permanent data mount fix --- .../wazuh-manager/config/etc/cont-init.d/0-wazuh-init | 2 ++ 1 file changed, 2 insertions(+) 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 7a901881..c0e2ffff 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 @@ -50,6 +50,8 @@ mount_permanent_data() { if find ${data_tmp} -mindepth 1 | read; then print "Installing ${permanent_dir}" exec_cmd "cp -a ${data_tmp}. ${permanent_dir}" + else + print "The path ${permanent_dir} is empty, skiped" fi fi done From 56c0acd1bf68935f76a8427524ac83fbeb3cd4f9 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 5 May 2022 13:38:14 -0300 Subject: [PATCH 07/16] change dashboard repository --- build-docker-images/wazuh-dashboard/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile index 3853f180..8b131f65 100644 --- a/build-docker-images/wazuh-dashboard/Dockerfile +++ b/build-docker-images/wazuh-dashboard/Dockerfile @@ -25,7 +25,7 @@ RUN $INSTALL_DIR/bin/opensearch-dashboards-keystore create --allow-root && \ echo kibanaserver | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.password --stdin --allow-root # Install Wazuh App -RUN $INSTALL_DIR/bin/opensearch-dashboards-plugin install https://packages.wazuh.com/4.x/ui/dashboard/wazuh-${WAZUH_VERSION}.zip --allow-root +RUN $INSTALL_DIR/bin/opensearch-dashboards-plugin install https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuh-${WAZUH_VERSION}.zip --allow-root # Copy and set permissions to config files COPY config/opensearch_dashboards.yml $INSTALL_DIR/config/ From e1ed44d8471843702b7155a41869e94d1ee33b52 Mon Sep 17 00:00:00 2001 From: Alberto R Date: Fri, 6 May 2022 08:36:59 +0200 Subject: [PATCH 08/16] Changed artifacts dev URLs --- build-docker-images/wazuh-dashboard/Dockerfile | 4 ++-- build-docker-images/wazuh-indexer/config/config.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile index 8b131f65..adb2faac 100644 --- a/build-docker-images/wazuh-dashboard/Dockerfile +++ b/build-docker-images/wazuh-dashboard/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update && apt install curl libcap2-bin xz-utils -y RUN mkdir -p $INSTALL_DIR # Download and extract Wazuh dashboard base -RUN curl -o wazuh-dashboard-base.tar.xz https://packages-dev.wazuh.com/stack/dashboard/base/wazuh-dashboard-base-${WAZUH_VERSION}-linux-x64.tar.xz && \ +RUN curl -o wazuh-dashboard-base.tar.xz https://packages.wazuh.com/stack/dashboard/base/wazuh-dashboard-base-${WAZUH_VERSION}-linux-x64.tar.xz && \ tar -xf wazuh-dashboard-base.tar.xz --directory $INSTALL_DIR --strip-components=1 # Generate certificates @@ -25,7 +25,7 @@ RUN $INSTALL_DIR/bin/opensearch-dashboards-keystore create --allow-root && \ echo kibanaserver | $INSTALL_DIR/bin/opensearch-dashboards-keystore add opensearch.password --stdin --allow-root # Install Wazuh App -RUN $INSTALL_DIR/bin/opensearch-dashboards-plugin install https://packages-dev.wazuh.com/pre-release/ui/dashboard/wazuh-${WAZUH_VERSION}.zip --allow-root +RUN $INSTALL_DIR/bin/opensearch-dashboards-plugin install https://packages.wazuh.com/4.x/ui/dashboard/wazuh-${WAZUH_VERSION}.zip --allow-root # Copy and set permissions to config files COPY config/opensearch_dashboards.yml $INSTALL_DIR/config/ diff --git a/build-docker-images/wazuh-indexer/config/config.sh b/build-docker-images/wazuh-indexer/config/config.sh index a598ecf8..e5b0624b 100644 --- a/build-docker-images/wazuh-indexer/config/config.sh +++ b/build-docker-images/wazuh-indexer/config/config.sh @@ -22,7 +22,7 @@ export REPO_DIR=/unattended_installer rm -rf ${INSTALLATION_DIR}/ -curl -o ${INDEXER_FILE} https://packages-dev.wazuh.com/stack/indexer/base/${BASE_FILE} +curl -o ${INDEXER_FILE} https://packages.wazuh.com/stack/indexer/base/${BASE_FILE} tar -xf ${INDEXER_FILE} ## TOOLS From 8d8b9e1336f2633bbeb035225327652e527b5b4a Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 6 May 2022 09:32:14 -0300 Subject: [PATCH 09/16] add dependencies for Wazuh dashboard --- build-docker-images/wazuh-dashboard/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile index adb2faac..3d911c41 100644 --- a/build-docker-images/wazuh-dashboard/Dockerfile +++ b/build-docker-images/wazuh-dashboard/Dockerfile @@ -80,6 +80,9 @@ ENV PATTERN="" \ WAZUH_MONITORING_SHARDS="" \ WAZUH_MONITORING_REPLICAS="" +#Install dependencies +RUN apt update && apt install -y libnss3-dev fonts-liberation libfontconfig1 + # Create wazuh-dashboard user and group RUN getent group $GROUP || groupadd -r -g 1000 $GROUP RUN useradd --system \ From 3be8078248f9c1fa3b7f9d1895ba810a40e93f30 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 6 May 2022 10:03:32 -0300 Subject: [PATCH 10/16] add dependencies for Wazuh dashboard --- build-docker-images/wazuh-dashboard/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile index 3d911c41..d8f5d00d 100644 --- a/build-docker-images/wazuh-dashboard/Dockerfile +++ b/build-docker-images/wazuh-dashboard/Dockerfile @@ -80,7 +80,7 @@ ENV PATTERN="" \ WAZUH_MONITORING_SHARDS="" \ WAZUH_MONITORING_REPLICAS="" -#Install dependencies +# Install dependencies RUN apt update && apt install -y libnss3-dev fonts-liberation libfontconfig1 # Create wazuh-dashboard user and group From ddcad4446866234f22277f8c021367c1134da614 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Wed, 11 May 2022 13:40:46 -0300 Subject: [PATCH 11/16] change Wazuh API user --- multi-node/config/wazuh_dashboard/wazuh.yml | 4 ++-- multi-node/docker-compose.yml | 8 ++++---- single-node/config/wazuh_dashboard/wazuh.yml | 4 ++-- single-node/docker-compose.yml | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/multi-node/config/wazuh_dashboard/wazuh.yml b/multi-node/config/wazuh_dashboard/wazuh.yml index 72ec6612..275be671 100644 --- a/multi-node/config/wazuh_dashboard/wazuh.yml +++ b/multi-node/config/wazuh_dashboard/wazuh.yml @@ -2,6 +2,6 @@ hosts: - 1513629884013: url: "https://wazuh.master" port: 55000 - username: acme-user - password: MyS3cr37P450r.*- + username: wazuh-wui + password: wazuh-wui run_as: false diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 877e684a..92f45cc2 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -18,8 +18,8 @@ services: - SSL_CERTIFICATE_AUTHORITIES=/etc/ssl/root-ca.pem - SSL_CERTIFICATE=/etc/ssl/filebeat.pem - SSL_KEY=/etc/ssl/filebeat.key - - API_USERNAME=acme-user - - API_PASSWORD=MyS3cr37P450r.*- + - API_USERNAME=wazuh-wui + - API_PASSWORD=wazuh-wui volumes: - master-wazuh-api-configuration:/var/ossec/api/configuration - master-wazuh-etc:/var/ossec/etc @@ -145,8 +145,8 @@ services: environment: - OPENSEARCH_HOSTS="https://wazuh1.indexer:9200" - WAZUH_API_URL="https://wazuh.master" - - API_USERNAME=acme-user - - API_PASSWORD=MyS3cr37P450r.*- + - API_USERNAME=wazuh-wui + - API_PASSWORD=wazuh-wui volumes: - ./config/wazuh_indexer_ssl_certs/wazuh.dashboard.pem:/usr/share/wazuh-dashboard/certs/wazuh-dashboard.pem - ./config/wazuh_indexer_ssl_certs/wazuh.dashboard-key.pem:/usr/share/wazuh-dashboard/certs/wazuh-dashboard-key.pem diff --git a/single-node/config/wazuh_dashboard/wazuh.yml b/single-node/config/wazuh_dashboard/wazuh.yml index 75ba953c..7a38d3c5 100644 --- a/single-node/config/wazuh_dashboard/wazuh.yml +++ b/single-node/config/wazuh_dashboard/wazuh.yml @@ -2,6 +2,6 @@ hosts: - 1513629884013: url: "https://wazuh.manager" port: 55000 - username: acme-user - password: MyS3cr37P450r.*- + username: wazuh-wui + password: wazuh-wui run_as: false diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 827421cb..f5f40cd7 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -19,8 +19,8 @@ services: - SSL_CERTIFICATE_AUTHORITIES=/etc/ssl/root-ca.pem - SSL_CERTIFICATE=/etc/ssl/filebeat.pem - SSL_KEY=/etc/ssl/filebeat.key - - API_USERNAME=acme-user - - API_PASSWORD=MyS3cr37P450r.*- + - API_USERNAME=wazuh-wui + - API_PASSWORD=wazuh-wui volumes: - wazuh_api_configuration:/var/ossec/api/configuration - wazuh_etc:/var/ossec/etc @@ -73,8 +73,8 @@ services: - INDEXER_USERNAME=admin - INDEXER_PASSWORD=SecretPassword - WAZUH_API_URL=https://wazuh.manager - - API_USERNAME=acme-user - - API_PASSWORD=MyS3cr37P450r.*- + - API_USERNAME=wazuh-wui + - API_PASSWORD=wazuh-wui volumes: - ./config/wazuh_indexer_ssl_certs/wazuh.dashboard.pem:/usr/share/wazuh-dashboard/certs/wazuh-dashboard.pem - ./config/wazuh_indexer_ssl_certs/wazuh.dashboard-key.pem:/usr/share/wazuh-dashboard/certs/wazuh-dashboard-key.pem From 446ecd86e68d48020a875ac9169cd36235c0d4f5 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Wed, 11 May 2022 14:05:44 -0300 Subject: [PATCH 12/16] change Wazuh API user --- multi-node/config/wazuh_dashboard/wazuh.yml | 2 +- multi-node/docker-compose.yml | 4 ++-- single-node/config/wazuh_dashboard/wazuh.yml | 2 +- single-node/docker-compose.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/multi-node/config/wazuh_dashboard/wazuh.yml b/multi-node/config/wazuh_dashboard/wazuh.yml index 275be671..425686a3 100644 --- a/multi-node/config/wazuh_dashboard/wazuh.yml +++ b/multi-node/config/wazuh_dashboard/wazuh.yml @@ -3,5 +3,5 @@ hosts: url: "https://wazuh.master" port: 55000 username: wazuh-wui - password: wazuh-wui + password: MyS3cr37P450r.*- run_as: false diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 92f45cc2..7a95f09d 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -19,7 +19,7 @@ services: - SSL_CERTIFICATE=/etc/ssl/filebeat.pem - SSL_KEY=/etc/ssl/filebeat.key - API_USERNAME=wazuh-wui - - API_PASSWORD=wazuh-wui + - API_PASSWORD=MyS3cr37P450r.*- volumes: - master-wazuh-api-configuration:/var/ossec/api/configuration - master-wazuh-etc:/var/ossec/etc @@ -146,7 +146,7 @@ services: - OPENSEARCH_HOSTS="https://wazuh1.indexer:9200" - WAZUH_API_URL="https://wazuh.master" - API_USERNAME=wazuh-wui - - API_PASSWORD=wazuh-wui + - API_PASSWORD=MyS3cr37P450r.*- volumes: - ./config/wazuh_indexer_ssl_certs/wazuh.dashboard.pem:/usr/share/wazuh-dashboard/certs/wazuh-dashboard.pem - ./config/wazuh_indexer_ssl_certs/wazuh.dashboard-key.pem:/usr/share/wazuh-dashboard/certs/wazuh-dashboard-key.pem diff --git a/single-node/config/wazuh_dashboard/wazuh.yml b/single-node/config/wazuh_dashboard/wazuh.yml index 7a38d3c5..ea5e82b4 100644 --- a/single-node/config/wazuh_dashboard/wazuh.yml +++ b/single-node/config/wazuh_dashboard/wazuh.yml @@ -3,5 +3,5 @@ hosts: url: "https://wazuh.manager" port: 55000 username: wazuh-wui - password: wazuh-wui + password: MyS3cr37P450r.*- run_as: false diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index f5f40cd7..5d47ce39 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -20,7 +20,7 @@ services: - SSL_CERTIFICATE=/etc/ssl/filebeat.pem - SSL_KEY=/etc/ssl/filebeat.key - API_USERNAME=wazuh-wui - - API_PASSWORD=wazuh-wui + - API_PASSWORD=MyS3cr37P450r.*- volumes: - wazuh_api_configuration:/var/ossec/api/configuration - wazuh_etc:/var/ossec/etc @@ -74,7 +74,7 @@ services: - INDEXER_PASSWORD=SecretPassword - WAZUH_API_URL=https://wazuh.manager - API_USERNAME=wazuh-wui - - API_PASSWORD=wazuh-wui + - API_PASSWORD=MyS3cr37P450r.*- volumes: - ./config/wazuh_indexer_ssl_certs/wazuh.dashboard.pem:/usr/share/wazuh-dashboard/certs/wazuh-dashboard.pem - ./config/wazuh_indexer_ssl_certs/wazuh.dashboard-key.pem:/usr/share/wazuh-dashboard/certs/wazuh-dashboard-key.pem From 3adb7809ddf1add3fccff6849b2861fb6cc2052f Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 12 May 2022 11:23:46 -0300 Subject: [PATCH 13/16] change doc migration --- multi-node/Migration-to-Wazuh-4.3.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multi-node/Migration-to-Wazuh-4.3.md b/multi-node/Migration-to-Wazuh-4.3.md index 97d49f0e..611e14b8 100644 --- a/multi-node/Migration-to-Wazuh-4.3.md +++ b/multi-node/Migration-to-Wazuh-4.3.md @@ -17,7 +17,7 @@ Assuming that you have a v4.2 production deployment, perform the following steps **4. Spin down the 4.2 environment.** `docker-compose -f production-cluster.yml down` -**Steps 5 and 6 can be done with the volume-migrator.sh script, specifying Docker version and project name as parameters.** +**Steps 5 and 6 can be done with the volume-migrator.sh script, specifying Docker compose version and project name as parameters.** Ex: $ multi-node/volume-migrator.sh 1.25.0 multi-node From 80bfc148d0fcf8f3ab58972db3bb125fd162ec3f Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 12 May 2022 13:28:13 -0300 Subject: [PATCH 14/16] Change dashboard port --- .../wazuh-dashboard/config/opensearch_dashboards.yml | 2 +- multi-node/config/wazuh_dashboard/opensearch_dashboards.yml | 2 +- multi-node/docker-compose.yml | 2 +- single-node/config/wazuh_dashboard/opensearch_dashboards.yml | 2 +- single-node/docker-compose.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-docker-images/wazuh-dashboard/config/opensearch_dashboards.yml b/build-docker-images/wazuh-dashboard/config/opensearch_dashboards.yml index bec41c18..994b83e2 100644 --- a/build-docker-images/wazuh-dashboard/config/opensearch_dashboards.yml +++ b/build-docker-images/wazuh-dashboard/config/opensearch_dashboards.yml @@ -1,5 +1,5 @@ server.host: 0.0.0.0 -server.port: 443 +server.port: 5601 opensearch.hosts: https://wazuh.indexer:9200 opensearch.ssl.verificationMode: none opensearch.requestHeadersWhitelist: [ authorization,securitytenant ] diff --git a/multi-node/config/wazuh_dashboard/opensearch_dashboards.yml b/multi-node/config/wazuh_dashboard/opensearch_dashboards.yml index 012657ff..b065a625 100644 --- a/multi-node/config/wazuh_dashboard/opensearch_dashboards.yml +++ b/multi-node/config/wazuh_dashboard/opensearch_dashboards.yml @@ -1,5 +1,5 @@ server.host: 0.0.0.0 -server.port: 443 +server.port: 5601 opensearch.hosts: https://wazuh1.indexer:9200 opensearch.ssl.verificationMode: certificate opensearch.requestHeadersWhitelist: ["securitytenant","Authorization"] diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 7a95f09d..5a6c9766 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -141,7 +141,7 @@ services: hostname: wazuh.dashboard restart: always ports: - - 443:443 + - 443:5601 environment: - OPENSEARCH_HOSTS="https://wazuh1.indexer:9200" - WAZUH_API_URL="https://wazuh.master" diff --git a/single-node/config/wazuh_dashboard/opensearch_dashboards.yml b/single-node/config/wazuh_dashboard/opensearch_dashboards.yml index b6526731..2a9cdba2 100644 --- a/single-node/config/wazuh_dashboard/opensearch_dashboards.yml +++ b/single-node/config/wazuh_dashboard/opensearch_dashboards.yml @@ -1,5 +1,5 @@ server.host: 0.0.0.0 -server.port: 443 +server.port: 5601 opensearch.hosts: https://wazuh.indexer:9200 opensearch.ssl.verificationMode: certificate opensearch.requestHeadersWhitelist: ["securitytenant","Authorization"] diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 5d47ce39..882cb8f0 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -68,7 +68,7 @@ services: hostname: wazuh.dashboard restart: always ports: - - 443:443 + - 443:5601 environment: - INDEXER_USERNAME=admin - INDEXER_PASSWORD=SecretPassword From 86fbf77aa95b16362cb533b25a65a677157a0d22 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 13 May 2022 12:16:42 -0300 Subject: [PATCH 15/16] Bump 4.3.1 version --- .github/.goss.yaml | 2 +- .github/workflows/push.yml | 2 +- CHANGELOG.md | 5 +++++ README.md | 1 + VERSION | 4 ++-- build-docker-images/docker-compose.yml | 6 +++--- build-docker-images/wazuh-dashboard/Dockerfile | 2 +- build-docker-images/wazuh-indexer/config/config.sh | 2 +- build-docker-images/wazuh-manager/Dockerfile | 2 +- multi-node/docker-compose.yml | 12 ++++++------ single-node/docker-compose.yml | 6 +++--- 11 files changed, 25 insertions(+), 19 deletions(-) diff --git a/.github/.goss.yaml b/.github/.goss.yaml index 292c1a66..d0248b51 100644 --- a/.github/.goss.yaml +++ b/.github/.goss.yaml @@ -56,7 +56,7 @@ package: wazuh-manager: installed: true versions: - - 4.3.0 + - 4.3.1 port: tcp:1514: listening: true diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 4baac58a..37b0a58f 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -25,7 +25,7 @@ jobs: version: v0.3.16 - name: Execute Goss tests (wazuh-odfe) - run: dgoss run wazuh/wazuh-manager:4.3.0 + run: dgoss run wazuh/wazuh-manager:4.3.1 env: GOSS_SLEEP: 30 GOSS_FILE: .github/.goss.yaml \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e6992ca..4d6d9579 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log All notable changes to this project will be documented in this file. +## Wazuh Docker v4.3.1 +### Added + +- Update Wazuh to version [4.3.1](https://github.com/wazuh/wazuh/blob/v4.3.1/CHANGELOG.md#v431) + ## Wazuh Docker v4.3.0 ### Added diff --git a/README.md b/README.md index f08f61fd..ec18839a 100644 --- a/README.md +++ b/README.md @@ -193,6 +193,7 @@ WAZUH_MONITORING_REPLICAS=0 # | Wazuh version | ODFE | XPACK | |---------------|---------|--------| +| v4.3.1 | | | | v4.3.0 | | | | v4.2.5 | 1.13.2 | 7.11.2 | | v4.2.4 | 1.13.2 | 7.11.2 | diff --git a/VERSION b/VERSION index 5fedc35e..285e4dbc 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-DOCKER_VERSION="4.3.0" -REVISION="43100" +WAZUH-DOCKER_VERSION="4.3.1" +REVISION="40311" diff --git a/build-docker-images/docker-compose.yml b/build-docker-images/docker-compose.yml index 0d9b9524..e7baf189 100644 --- a/build-docker-images/docker-compose.yml +++ b/build-docker-images/docker-compose.yml @@ -4,7 +4,7 @@ version: '3.7' services: wazuh.manager: build: wazuh-manager/ - image: wazuh/wazuh-manager:4.3.0 + image: wazuh/wazuh-manager:4.3.1 hostname: wazuh.manager restart: always ports: @@ -32,7 +32,7 @@ services: wazuh.indexer: build: wazuh-indexer/ - image: wazuh/wazuh-indexer:4.3.0 + image: wazuh/wazuh-indexer:4.3.1 hostname: wazuh.indexer restart: always ports: @@ -49,7 +49,7 @@ services: wazuh.dashboard: build: wazuh-dashboard/ - image: wazuh/wazuh-dashboard:4.3.0 + image: wazuh/wazuh-dashboard:4.3.1 hostname: wazuh.dashboard restart: always ports: diff --git a/build-docker-images/wazuh-dashboard/Dockerfile b/build-docker-images/wazuh-dashboard/Dockerfile index d8f5d00d..e53f84c7 100644 --- a/build-docker-images/wazuh-dashboard/Dockerfile +++ b/build-docker-images/wazuh-dashboard/Dockerfile @@ -1,7 +1,7 @@ # Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) FROM ubuntu:focal AS builder -ARG WAZUH_VERSION=4.3.0 +ARG WAZUH_VERSION=4.3.1 ARG INSTALL_DIR=/usr/share/wazuh-dashboard # Update and install dependencies diff --git a/build-docker-images/wazuh-indexer/config/config.sh b/build-docker-images/wazuh-indexer/config/config.sh index e5b0624b..6043789b 100644 --- a/build-docker-images/wazuh-indexer/config/config.sh +++ b/build-docker-images/wazuh-indexer/config/config.sh @@ -8,7 +8,7 @@ export TARGET_DIR=${CURDIR}/debian/${NAME} # Package build options export USER=${NAME} export GROUP=${NAME} -export VERSION=4.3.0 +export VERSION=4.3.1 export LOG_DIR=/var/log/${NAME} export LIB_DIR=/var/lib/${NAME} export PID_DIR=/run/${NAME} diff --git a/build-docker-images/wazuh-manager/Dockerfile b/build-docker-images/wazuh-manager/Dockerfile index 11a852e1..27b2418b 100644 --- a/build-docker-images/wazuh-manager/Dockerfile +++ b/build-docker-images/wazuh-manager/Dockerfile @@ -1,7 +1,7 @@ # Wazuh Docker Copyright (C) 2021 Wazuh Inc. (License GPLv2) FROM ubuntu:focal -ARG WAZUH_VERSION=4.3.0 +ARG WAZUH_VERSION=4.3.1 ARG TEMPLATE_VERSION=4.3 ARG FILEBEAT_CHANNEL=filebeat-oss ARG FILEBEAT_VERSION=7.10.2 diff --git a/multi-node/docker-compose.yml b/multi-node/docker-compose.yml index 5a6c9766..e7d77de0 100644 --- a/multi-node/docker-compose.yml +++ b/multi-node/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh.master: - image: wazuh/wazuh-manager:4.3.0 + image: wazuh/wazuh-manager:4.3.1 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.0 + image: wazuh/wazuh-manager:4.3.1 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.0 + image: wazuh/wazuh-indexer:4.3.1 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.0 + image: wazuh/wazuh-indexer:4.3.1 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.0 + image: wazuh/wazuh-indexer:4.3.1 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.0 + image: wazuh/wazuh-dashboard:4.3.1 hostname: wazuh.dashboard restart: always ports: diff --git a/single-node/docker-compose.yml b/single-node/docker-compose.yml index 882cb8f0..0a0145a8 100644 --- a/single-node/docker-compose.yml +++ b/single-node/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.7' services: wazuh.manager: - image: wazuh/wazuh-manager:4.3.0 + image: wazuh/wazuh-manager:4.3.1 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.0 + image: wazuh/wazuh-indexer:4.3.1 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.0 + image: wazuh/wazuh-dashboard:4.3.1 hostname: wazuh.dashboard restart: always ports: From 65fd592d52e60db667493354adbae0fce19385a9 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 16 May 2022 12:37:48 -0300 Subject: [PATCH 16/16] Bump 4.3.1 version --- build-docker-images/wazuh-indexer/config/entrypoint.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-docker-images/wazuh-indexer/config/entrypoint.sh b/build-docker-images/wazuh-indexer/config/entrypoint.sh index 157a9ba5..084573fc 100644 --- a/build-docker-images/wazuh-indexer/config/entrypoint.sh +++ b/build-docker-images/wazuh-indexer/config/entrypoint.sh @@ -84,9 +84,10 @@ if [[ "$(id -u)" == "0" ]]; then fi -if [[ "$DISCOVERY" == "single-node" ]]; then +if [[ "$DISCOVERY" == "single-node" ]] && [[ ! -f "/var/lib/wazuh-indexer/.flag" ]]; then # run securityadmin.sh for single node with CACERT, CERT and KEY parameter nohup /securityadmin.sh & + touch "/var/lib/wazuh-indexer/.flag" fi run_as_other_user_if_needed /usr/share/wazuh-indexer/bin/opensearch <<<"$KEYSTORE_PASSWORD" \ No newline at end of file