From dc0ea4d8f9e527f2fa70f86384eb011759608b7c Mon Sep 17 00:00:00 2001 From: Jesus Garcia Date: Mon, 16 Mar 2026 18:03:21 -0500 Subject: [PATCH] Update certificate configuration to use separate IP and DNS fields for proper certificate generation --- .github/workflows/5_pr_check.yml | 22 +++++++++---------- CHANGELOG.md | 1 + .../getting-started/deployment/multi-node.md | 14 ++++++------ .../getting-started/deployment/single-node.md | 8 +++---- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/.github/workflows/5_pr_check.yml b/.github/workflows/5_pr_check.yml index 7c86b3e3..6e590412 100644 --- a/.github/workflows/5_pr_check.yml +++ b/.github/workflows/5_pr_check.yml @@ -133,18 +133,18 @@ jobs: # Wazuh indexer server nodes indexer: - name: wazuh.indexer - ip: wazuh.indexer + dns: "wazuh.indexer" # Wazuh manager nodes # Use node_type only with more than one Wazuh manager manager: - name: wazuh.manager - ip: wazuh.manager + dns: "wazuh.manager" # Wazuh dashboard node dashboard: - name: wazuh.dashboard - ip: wazuh.dashboard + dns: "wazuh.dashboard" EOF cat config.yml bash ./wazuh-certs-tool.sh -A @@ -253,7 +253,7 @@ jobs: run: | for i in {1..20}; do echo "Checking Wazuh dashboard (Attempt $i/20)" - STATUS=$(curl -k -s -o /dev/null -w "%{http_code}" -u ${{ env.INDEXER_USERNAME }}:${{ env.INDEXER_PASSWORD }} "https://127.0.0.1:443/app/status") + STATUS=$(curl -k -s -o /dev/null -w "%{http_code}" -u ${{ env.INDEXER_USERNAME }}:${{ env.INDEXER_PASSWORD }} "https://127.0.0.1:443/app/status" || true) echo "Current status: $STATUS" if [[ "$STATUS" == "200" ]]; then echo "Wazuh dashboard is UP" @@ -406,26 +406,26 @@ jobs: # Wazuh indexer server nodes indexer: - name: wazuh1.indexer - ip: wazuh1.indexer + dns: "wazuh1.indexer" - name: wazuh2.indexer - ip: wazuh2.indexer + dns: "wazuh2.indexer" - name: wazuh3.indexer - ip: wazuh3.indexer + dns: "wazuh3.indexer" # Wazuh manager nodes # Use node_type only with more than one Wazuh manager manager: - name: wazuh.master - ip: wazuh.master + dns: "wazuh.master" node_type: master - name: wazuh.worker - ip: wazuh.worker + dns: "wazuh.worker" node_type: worker # Wazuh dashboard node dashboard: - name: wazuh.dashboard - ip: wazuh.dashboard + dns: "wazuh.dashboard" EOF cat config.yml bash ./wazuh-certs-tool.sh -A @@ -542,7 +542,7 @@ jobs: run: | for i in {1..20}; do echo "Checking Wazuh dashboard (Attempt $i/20)" - STATUS=$(curl -k -s -o /dev/null -w "%{http_code}" -u ${{ env.INDEXER_USERNAME }}:${{ env.INDEXER_PASSWORD }} "https://127.0.0.1:443/app/status") + STATUS=$(curl -k -s -o /dev/null -w "%{http_code}" -u ${{ env.INDEXER_USERNAME }}:${{ env.INDEXER_PASSWORD }} "https://127.0.0.1:443/app/status" || true) echo "Current status: $STATUS" if [[ "$STATUS" == "200" ]]; then echo "Wazuh dashboard is UP" diff --git a/CHANGELOG.md b/CHANGELOG.md index 5eedb691..5105b559 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file. ### Changed +- Update certificate configuration to use separate IP and DNS fields ([#2253](https://github.com/wazuh/wazuh-docker/pull/2253)) - Modify Healthchecks ([#2252](https://github.com/wazuh/wazuh-docker/pull/2252)) - Add deployment healthchecks ([#2251](https://github.com/wazuh/wazuh-docker/pull/2251)) - Update artifact generation jobs to use wz-linux dedicated runner group ([#2242](https://github.com/wazuh/wazuh-docker/pull/2242)) diff --git a/docs/ref/getting-started/deployment/multi-node.md b/docs/ref/getting-started/deployment/multi-node.md index 34a956ac..9dc06f8b 100644 --- a/docs/ref/getting-started/deployment/multi-node.md +++ b/docs/ref/getting-started/deployment/multi-node.md @@ -27,31 +27,31 @@ This deployment utilizes the `multi-node/docker-compose.yml` file, which defines 4. Edit the `config.yml` file with the configuration of the Wazuh components to be deployed - ```bash + ```yaml nodes: # Wazuh indexer server nodes indexer: - name: wazuh1.indexer - ip: wazuh1.indexer + dns: "wazuh1.indexer" - name: wazuh2.indexer - ip: wazuh2.indexer + dns: "wazuh2.indexer" - name: wazuh3.indexer - ip: wazuh3.indexer + dns: "wazuh3.indexer" # Wazuh manager nodes # Use node_type only with more than one Wazuh manager manager: - name: wazuh.master - ip: wazuh.master + dns: "wazuh.master" node_type: master - name: wazuh.worker - ip: wazuh.worker + dns: "wazuh.worker" node_type: worker # Wazuh dashboard node dashboard: - name: wazuh.dashboard - ip: wazuh.dashboard + dns: "wazuh.dashboard" ``` 5. Run the certificate creation script: diff --git a/docs/ref/getting-started/deployment/single-node.md b/docs/ref/getting-started/deployment/single-node.md index 92d426f5..d55a9ebc 100644 --- a/docs/ref/getting-started/deployment/single-node.md +++ b/docs/ref/getting-started/deployment/single-node.md @@ -27,23 +27,23 @@ This deployment uses the `single-node/docker-compose.yml` file, which defines a 4. Edit the config.yml file with the configuration of the Wazuh components to be deployed - ```bash + ```yaml nodes: # Wazuh indexer server nodes indexer: - name: wazuh.indexer - ip: wazuh.indexer + dns: "wazuh.indexer" # Wazuh manager nodes # Use node_type only with more than one Wazuh manager manager: - name: wazuh.manager - ip: wazuh.manager + dns: "wazuh.manager" # Wazuh dashboard node dashboard: - name: wazuh.dashboard - ip: wazuh.dashboard + dns: "wazuh.dashboard" ``` 5. Run the certificate creation script: