Merge pull request #1896 from wazuh/enhancement/1892-bumper-6.0.0

Enhancement/1892 bumper 6.0.0

.env

@@ -1,4 +1,6 @@
-WAZUH_VERSION=5.0.0
-WAZUH_IMAGE_VERSION=5.0.0
-WAZUH_REGISTRY=docker.io
-IMAGE_TAG=5.0.0
+WAZUH_VERSION=6.0.0
+WAZUH_IMAGE_VERSION=6.0.0
+WAZUH_TAG_REVISION=1
+FILEBEAT_TEMPLATE_BRANCH=6.0.0
+WAZUH_FILEBEAT_MODULE=wazuh-filebeat-0.4.tar.gz
+WAZUH_UI_REVISION=1

.github/.goss.yaml

@@ -1,39 +1,103 @@
 file:
-  /var/wazuh-manager/bin/wazuh-manager-control:
-    exists: true
-    mode: "0750"
-    owner: root
-    group: root
-    filetype: file
-    contains: []
-  /var/wazuh-manager/etc/wazuh-manager.conf:
-    exists: true
-    mode: "0660"
-    owner: root
-    group: wazuh-manager
-    filetype: file
-    contains: []
-  /var/wazuh-manager/etc/sslmanager.cert:
+  /etc/filebeat/filebeat.yml:
     exists: true
     mode: "0644"
     owner: root
     group: root
     filetype: file
     contains: []
-  /var/wazuh-manager/etc/sslmanager.key:
+  /var/ossec/bin/wazuh-control:
     exists: true
-    mode: "0600"
+    mode: "0750"
     owner: root
     group: root
     filetype: file
     contains: []
-user:
+  /var/ossec/etc/lists/audit-keys:
+    exists: true
+    mode: "0660"
+    owner: wazuh
+    group: wazuh
+    filetype: file
+    contains: []
+  /var/ossec/etc/ossec.conf:
+    exists: true
+    mode: "0660"
+    owner: root
+    group: wazuh
+    filetype: file
+    contains: []
+  /var/ossec/etc/rules/local_rules.xml:
+    exists: true
+    mode: "0660"
+    owner: wazuh
+    group: wazuh
+    filetype: file
+    contains: []
+  /var/ossec/etc/sslmanager.cert:
+    exists: true
+    mode: "0640"
+    owner: root
+    group: root
+    filetype: file
+    contains: []
+  /var/ossec/etc/sslmanager.key:
+    exists: true
+    mode: "0640"
+    owner: root
+    group: root
+    filetype: file
+    contains: []
+package:
+  filebeat:
+    installed: true
+    versions:
+    - 7.10.2
   wazuh-manager:
+    installed: true
+    versions:
+    - 6.0.0
+port:
+  tcp:1514:
+    listening: true
+    ip:
+    - 0.0.0.0
+  tcp:1515:
+    listening: true
+    ip:
+    - 0.0.0.0
+  tcp:55000:
+    listening: true
+    ip:
+    - 0.0.0.0
+process:
+  filebeat:
+    running: true
+  wazuh-analysisd:
+    running: true
+  wazuh-authd:
+    running: true
+  wazuh-execd:
+    running: true
+  wazuh-monitord:
+    running: true
+  wazuh-remoted:
+    running: true
+  wazuh-syscheckd:
+    running: true
+  s6-supervise:
+    running: true
+  wazuh-db:
+    running: true
+  wazuh-modulesd:
+    running: true
+user:
+  wazuh:
     exists: true
     groups:
-    - wazuh-manager
-    home: /var/wazuh-manager
+    - wazuh
+    home: /var/ossec
     shell: /sbin/nologin
 group:
-  wazuh-manager:
-    exists: true
+  wazuh:
+    exists: true

.github/multi-node-filebeat-check.sh

@@ -0,0 +1,39 @@
+COMMAND_TO_EXECUTE="filebeat test output"
+
+MASTER_CONTAINERS=$(docker ps --format '{{.Names}}' | grep -E 'master')
+
+if [ -z "$MASTER_CONTAINERS" ]; then
+  echo "No containers were found with 'master' in their name."
+else
+  for MASTER_CONTAINERS in $MASTER_CONTAINERS; do
+    FILEBEAT_OUTPUT=$(docker exec "$MASTER_CONTAINERS" $COMMAND_TO_EXECUTE)
+    FILEBEAT_STATUS=$(echo "${FILEBEAT_OUTPUT}" | grep -c OK)
+    if [[ $FILEBEAT_STATUS -eq 7 ]]; then
+      echo "No errors in filebeat"
+      echo "${FILEBEAT_OUTPUT}"
+    else
+      echo "Errors in filebeat"
+      echo "${FILEBEAT_OUTPUT}"
+      exit 1
+    fi
+  done
+fi
+
+MASTER_CONTAINERS=$(docker ps --format '{{.Names}}' | grep -E 'worker')
+
+if [ -z "$MASTER_CONTAINERS" ]; then
+  echo "No containers were found with 'worker' in their name."
+else
+  for MASTER_CONTAINERS in $MASTER_CONTAINERS; do
+    FILEBEAT_OUTPUT=$(docker exec "$MASTER_CONTAINERS" $COMMAND_TO_EXECUTE)
+    FILEBEAT_STATUS=$(echo "${FILEBEAT_OUTPUT}" | grep -c OK)
+    if [[ $FILEBEAT_STATUS -eq 7 ]]; then
+      echo "No errors in filebeat"
+      echo "${FILEBEAT_OUTPUT}"
+    else
+      echo "Errors in filebeat"
+      echo "${FILEBEAT_OUTPUT}"
+      exit 1
+    fi
+  done
+fi

.github/multi-node-log-check.sh

@@ -1,16 +1,16 @@
-log1=$(docker exec multi-node_wazuh.master_1 sh -c 'cat /var/wazuh-manager/logs/wazuh-manager.log' | grep -P "ERR|WARN|CRIT")
+log1=$(docker exec multi-node_wazuh.master_1 sh -c 'cat /var/ossec/logs/ossec.log' | grep -P "ERR|WARN|CRIT")
 if [[ -z "$log1" ]]; then
-  echo "No errors in master wazuh-manager.log"
+  echo "No errors in master ossec.log"
 else
-  echo "Errors in master wazuh-manager.log:"
+  echo "Errors in master ossec.log:"
   echo "${log1}"
   exit 1
 fi
-log2=$(docker exec multi-node_wazuh.worker_1 sh -c 'cat /var/wazuh-manager/logs/wazuh-manager.log' | grep -P "ERR|WARN|CRIT")
+log2=$(docker exec multi-node_wazuh.worker_1 sh -c 'cat /var/ossec/logs/ossec.log' | grep -P "ERR|WARN|CRIT")
 if [[ -z "${log2}" ]]; then
-  echo "No errors in worker wazuh-manager.log"
+  echo "No errors in worker ossec.log"
 else
-  echo "Errors in worker wazuh-manager.log:"
+  echo "Errors in worker ossec.log:"
   echo "${log2}"
   exit 1
-fi
+fi

.github/single-node-filebeat-check.sh

@@ -0,0 +1,20 @@
+COMMAND_TO_EXECUTE="filebeat test output"
+
+MASTER_CONTAINERS=$(docker ps --format '{{.Names}}' | grep -E 'manager')
+
+if [ -z "$MASTER_CONTAINERS" ]; then
+  echo "No containers were found with 'manager' in their name."
+else
+  for MASTER_CONTAINERS in $MASTER_CONTAINERS; do
+    FILEBEAT_OUTPUT=$(docker exec "$MASTER_CONTAINERS" $COMMAND_TO_EXECUTE)
+    FILEBEAT_STATUS=$(echo "${FILEBEAT_OUTPUT}" | grep -c OK)
+    if [[ $FILEBEAT_STATUS -eq 7 ]]; then
+      echo "No errors in filebeat"
+      echo "${FILEBEAT_OUTPUT}"
+    else
+      echo "Errors in filebeat"
+      echo "${FILEBEAT_OUTPUT}"
+      exit 1
+    fi
+  done
+fi

.github/single-node-log-check.sh

@@ -1,8 +1,8 @@
-log=$(docker exec single-node_wazuh.manager_1 sh -c 'cat /var/wazuh-manager/logs/wazuh-manager.log' | grep -P "ERR|WARN|CRIT")
+log=$(docker exec single-node_wazuh.manager_1 sh -c 'cat /var/ossec/logs/ossec.log' | grep -P "ERR|WARN|CRIT")
 if [[ -z "$log" ]]; then
-  echo "No errors in wazuh-manager.log"
+  echo "No errors in ossec.log"
 else
-  echo "Errors in wazuh-manager.log:"
+  echo "Errors in ossec.log:"
   echo "${log}"
   exit 1
-fi
+fi

.github/workflows/4_bumper_repository.yml

@@ -1,4 +1,4 @@
-name: Repository bumper 4.x
+name: Repository bumper
 run-name: Bump ${{ github.ref_name }} (${{ inputs.id }})
 
 on:
@@ -30,8 +30,8 @@ on:
 
 jobs:
   bump:
-    name: Repository bumper 4.x
-    runs-on: ubuntu-24.04
+    name: Repository bumper
+    runs-on: ubuntu-22.04
     permissions:
       contents: write
       pull-requests: write
@@ -70,7 +70,7 @@ jobs:
           export GPG_TTY=$(tty)
 
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
         with:
           # Using workflow-specific GITHUB_TOKEN because currently CI_WAZUHCI_BUMPER_TOKEN
           # doesn't have all the necessary permissions
@@ -139,4 +139,4 @@ jobs:
           echo "Branch: ${{ steps.vars.outputs.branch_name }}"
           echo "PR: ${{ steps.create_pr.outputs.pull_request_url }}"
           echo "Bumper scripts logs:"
-          cat ${BUMP_LOG_PATH}/repository_bumper*log
+          cat ${BUMP_LOG_PATH}/repository_bumper*log

.github/workflows/5_bumper_repository.yml

@@ -1,221 +0,0 @@
-name: Repository bumper 5.x
-run-name: Bump ${{ github.ref_name }} (${{ inputs.id }})
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Target version (e.g. 1.2.3)'
-        default: ''
-        required: false
-        type: string
-      stage:
-        description: 'Version stage (e.g. alpha0)'
-        default: ''
-        required: false
-        type: string
-      tag:
-        description: 'Change branches references to tag-like references (e.g. v4.12.0-alpha7)'
-        default: false
-        required: false
-        type: boolean
-      set_as_main:
-        description: "Enable main branch mode: bump version values only, keep branch references pointing to main"
-        required: false
-        type: boolean
-        default: false
-      issue-link:
-        description: 'Issue link in format https://github.com/wazuh/<REPO>/issues/<ISSUE-NUMBER>'
-        required: true
-        type: string
-      id:
-        description: 'Optional identifier for the run'
-        required: false
-        type: string
-      revert:
-        description: 'Set to true to revert the bump changes applied for this issue'
-        default: false
-        required: false
-        type: boolean
-jobs:
-  bump:
-    name: Repository bumper 5.x
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: write
-      pull-requests: write
-
-    env:
-      CI_COMMIT_AUTHOR: wazuhci
-      CI_COMMIT_EMAIL: 22834044+wazuhci@users.noreply.github.com
-      CI_GPG_PRIVATE_KEY: ${{ secrets.CI_WAZUHCI_GPG_PRIVATE }}
-      GH_TOKEN: ${{ secrets.CI_WAZUHCI_BUMPER_TOKEN }}
-      BUMP_SCRIPT_PATH: tools/repository_bumper.sh
-      BUMP_LOG_PATH: tools
-
-    steps:
-      - name: Dump event payload
-        run: |
-          cat $GITHUB_EVENT_PATH | jq '.inputs'
-
-      - name: Set up GPG key
-        id: signing_setup
-        run: |
-          echo "${{ env.CI_GPG_PRIVATE_KEY }}" | gpg --batch --import
-          KEY_ID=$(gpg --list-secret-keys --with-colons | awk -F: '/^sec/ {print $5; exit}')
-          echo "gpg_key_id=$KEY_ID" >> $GITHUB_OUTPUT
-
-      - name: Set up git
-        run: |
-          git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
-          git config --global user.email "${{ env.CI_COMMIT_EMAIL }}"
-          git config --global commit.gpgsign true
-          git config --global user.signingkey "${{ steps.signing_setup.outputs.gpg_key_id }}"
-          echo "use-agent" >> ~/.gnupg/gpg.conf
-          echo "pinentry-mode loopback" >> ~/.gnupg/gpg.conf
-          echo "allow-loopback-pinentry" >> ~/.gnupg/gpg-agent.conf
-          echo RELOADAGENT | gpg-connect-agent
-          export DEBIAN_FRONTEND=noninteractive
-          export GPG_TTY=$(tty)
-
-      - name: Checkout repository
-        uses: actions/checkout@v6
-        with:
-          # Using workflow-specific GITHUB_TOKEN because currently CI_WAZUHCI_BUMPER_TOKEN
-          # doesn't have all the necessary permissions
-          token: ${{ env.GH_TOKEN }}
-
-      - name: Determine branch name
-        id: vars
-        env:
-          VERSION: ${{ inputs.version }}
-          STAGE: ${{ inputs.stage }}
-          TAG: ${{ inputs.tag }}
-        run: |
-          script_params=""
-          version=${{ env.VERSION }}
-          stage=${{ env.STAGE }}
-          tag=${{ env.TAG }}
-
-          set_as_main=${{ inputs.set_as_main }}
-
-          if [[ "$set_as_main" == "true" ]]; then
-            script_params="--set-as-main"
-          fi
-
-          # Both version and stage provided
-          if [[ -n "$version" && -n "$stage" && "$tag" != "true" ]]; then
-            script_params+=" --version ${version} --stage ${stage}"
-          elif [[ -n "$version" && -n "$stage" && "$tag" == "true" ]]; then
-            script_params+=" --version ${version} --stage ${stage} --tag ${tag}"
-          fi
-
-          issue_number=$(echo "${{ inputs.issue-link }}" | awk -F'/' '{print $NF}')
-
-          if [[ "${{ inputs.revert }}" == "true" ]]; then
-            BRANCH_NAME="enhancement/wqa${issue_number}-revert-bump-${{ github.ref_name }}"
-            echo "pr_title=Revert bump ${{ github.ref_name }} branch" >> $GITHUB_OUTPUT
-          else
-            BRANCH_NAME="enhancement/wqa${issue_number}-bump-${{ github.ref_name }}"
-            echo "pr_title=Bump ${{ github.ref_name }} branch" >> $GITHUB_OUTPUT
-          fi
-          echo "branch_name=$BRANCH_NAME" >> $GITHUB_OUTPUT
-          echo "script_params=${script_params}" >> $GITHUB_OUTPUT
-
-      - name: Create and switch to bump branch
-        run: |
-          git checkout -b ${{ steps.vars.outputs.branch_name }}
-
-      - name: Make version bump changes
-        if: inputs.revert != true
-        run: |
-          echo "Running bump script"
-          bash ${{ env.BUMP_SCRIPT_PATH }} ${{ steps.vars.outputs.script_params }}
-
-      - name: Commit changes (Bump)
-        if: inputs.revert != true
-        run: |
-          git add .
-          git commit -m "feat: bump ${{ github.ref_name }}"
-
-      - name: Fetch full history (Revert)
-        if: inputs.revert == true
-        run: git fetch --unshallow
-
-      - name: Revert references (Revert)
-        id: revert_step
-        if: inputs.revert == true
-        run: |
-          ISSUE_NUMBER=$(echo "${{ inputs.issue-link }}" | awk -F'/' '{print $NF}')
-
-          BUMP_BRANCH="enhancement/wqa${ISSUE_NUMBER}-bump-${{ github.ref_name }}"
-
-          PR_NUMBER=$(gh pr list --head "$BUMP_BRANCH" --base "${{ github.ref_name }}" --state merged --json number --jq '.[0].number')
-
-          if [ -z "$PR_NUMBER" ] || [ "$PR_NUMBER" == "null" ]; then
-            echo "Error: The original PR for the bump was not found"
-            echo "Searching merged PR from: $BUMP_BRANCH to ${{ github.ref_name }}"
-            exit 1
-          fi
-
-          echo "Original PR found: #$PR_NUMBER"
-
-          MERGE_COMMIT=$(gh pr view $PR_NUMBER --json mergeCommit --jq '.mergeCommit.oid')
-
-          git revert -m 1 $MERGE_COMMIT --no-commit
-
-          # Remove the files to prevent them from being included in the revert commit
-          git checkout HEAD -- VERSION.json 2>/dev/null || true
-          git checkout HEAD -- CHANGELOG.md 2>/dev/null || true
-          # Add any other repository-specific version files here
-
-          if git diff --staged --quiet; then
-            echo "No references to revert. Skipping commit."
-            echo "has_changes=false" >> $GITHUB_OUTPUT
-          else
-            git commit -m "feat: revert ${{ github.ref_name }} references"
-            echo "has_changes=true" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Push changes
-        if: inputs.revert != true || (inputs.revert == true && steps.revert_step.outputs.has_changes == 'true')
-        run: |
-          git push origin ${{ steps.vars.outputs.branch_name }}
-
-      - name: Create pull request
-        id: create_pr
-        if: inputs.revert != true || (inputs.revert == true && steps.revert_step.outputs.has_changes == 'true')
-        run: |
-          gh auth setup-git
-          PR_URL=$(gh pr create \
-            --title "${{ steps.vars.outputs.pr_title }}" \
-            --body "Issue: ${{ inputs.issue-link }}" \
-            --base ${{ github.ref_name }} \
-            --head ${{ steps.vars.outputs.branch_name }})
-
-          echo "Pull request created: ${PR_URL}"
-          echo "pull_request_url=${PR_URL}" >> $GITHUB_OUTPUT
-
-      - name: Merge pull request
-        if: inputs.revert != true || (inputs.revert == true && steps.revert_step.outputs.has_changes == 'true')
-        run: |
-          # Any checks for the PR are bypassed since the branch is expected to be functional
-          gh pr merge "${{ steps.create_pr.outputs.pull_request_url }}" --merge --admin
-
-      - name: Show logs
-        if: inputs.revert != true
-        run: |
-          echo "Bump complete."
-          echo "Branch: ${{ steps.vars.outputs.branch_name }}"
-          echo "PR: ${{ steps.create_pr.outputs.pull_request_url }}"
-          echo "Bumper scripts logs:"
-          cat ${BUMP_LOG_PATH}/repository_bumper*log
-
-      - name: Show revert logs
-        if: inputs.revert == true
-        run: |
-          echo "Revert bump complete."
-          echo "Branch: ${{ steps.vars.outputs.branch_name }}"
-          echo "PR: ${{ steps.create_pr.outputs.pull_request_url }}"
-          echo "Revert bumper scripts logs:"
-          cat ${BUMP_LOG_PATH}/repository_bumper*log || true

.github/workflows/5_pr_check.yml

@@ -1,649 +0,0 @@
-name: Wazuh Docker pipeline
-permissions:
-  contents: read
-  id-token: write
-on:
-  pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
-  workflow_dispatch:
-    inputs:
-      docker_reference:
-        description: 'Branch or tag to build from'
-        required: true
-        type: string
-
-jobs:
-
-  prepare-variables:
-    if: ${{ !github.event.pull_request.draft }}
-    runs-on: ubuntu-latest
-    outputs:
-      WAZUH_VERSION: ${{ steps.dotenv.outputs.WAZUH_VERSION }}
-      WAZUH_IMAGE_VERSION: ${{ steps.dotenv.outputs.WAZUH_IMAGE_VERSION }}
-      WAZUH_REGISTRY: ${{ vars.IMAGE_REGISTRY_DEV }}
-      IMAGE_TAG: ${{ steps.dotenv.outputs.IMAGE_TAG }}
-      WAZUH_MINOR_VERSION: ${{ steps.dotenv.outputs.WAZUH_MINOR_VERSION }}
-    steps:
-
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Export .env variables
-        id: dotenv
-        shell: bash
-        run: |
-          if [ ! -f .env ]; then echo "::error::.env missing"; exit 1; fi
-          grep -v '^#' .env | grep -v '^\s*$' >> "$GITHUB_OUTPUT"
-          FULL_VERSION=$(grep "^WAZUH_VERSION=" .env | cut -d'=' -f2)
-          MINOR_VERSION=$(echo "$FULL_VERSION" | cut -d'.' -f1,2)
-          echo "WAZUH_MINOR_VERSION=$MINOR_VERSION" >> "$GITHUB_OUTPUT"
-
-
-  build-images:
-    needs: prepare-variables
-    uses: ./.github/workflows/Procedure_push_docker_images.yml
-    secrets: inherit
-    with:
-      image_tag: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }}
-      docker_reference: ${{ github.head_ref || inputs.docker_reference }}
-      wazuh_automation_reference: 'main'
-      commit_list: '["latest", "latest", "latest", "latest"]'
-      assistant_revision: 'latest'
-      id: ${{ github.run_id }}
-      dev: true
-
-  Execute-Goss-tests:
-    needs: [prepare-variables, build-images]
-    runs-on: ubuntu-22.04
-    env:
-      WAZUH_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }}
-      WAZUH_REGISTRY: ${{ needs.prepare-variables.outputs.WAZUH_REGISTRY }}
-    steps:
-
-    - name: Check out code
-      uses: actions/checkout@v4
-
-    - name: Install Goss
-      uses: e1himself/goss-installation-action@v1.0.3
-      with:
-        version: 'v0.4.4'
-
-    - name: Configure aws credentials
-      uses: aws-actions/configure-aws-credentials@v4
-      with:
-        role-to-assume: ${{ secrets.AWS_IAM_DOCKER_ROLE }}
-        aws-region: "${{ secrets.AWS_REGION }}"
-
-    - name: Log in to Amazon ECR
-      uses: aws-actions/amazon-ecr-login@v2
-
-    - name: Execute Goss tests (wazuh-manager)
-      run: dgoss run ${{ env.WAZUH_REGISTRY }}/wazuh/wazuh-manager:${{ env.WAZUH_IMAGE_VERSION }}-latest
-      env:
-        GOSS_SLEEP: 30
-        GOSS_FILE: .github/.goss.yaml
-
-  check-single-node:
-    name: Check single node on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-22.04, ubuntu-22.04-arm]
-      fail-fast: false
-    needs: [prepare-variables, Execute-Goss-tests]
-    env:
-      WAZUH_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }}
-      WAZUH_MINOR_VERSION: ${{ needs.prepare-variables.outputs.WAZUH_MINOR_VERSION }}
-      WAZUH_REGISTRY: ${{ needs.prepare-variables.outputs.WAZUH_REGISTRY }}
-      INDEXER_USERNAME: admin
-      INDEXER_PASSWORD: admin
-      MANAGER_NODES: "manager"
-      API_USERNAME: wazuh-wui
-      API_PASSWORD: wazuh-wui
-    steps:
-
-    - name: Check out code
-      uses: actions/checkout@v4
-
-    - name: free disk space
-      uses: ./.github/free-disk-space
-
-    - name: Configure aws credentials
-      uses: aws-actions/configure-aws-credentials@v4
-      with:
-        role-to-assume: ${{ secrets.AWS_IAM_DOCKER_ROLE }}
-        aws-region: "${{ secrets.AWS_REGION }}"
-
-    - name: Log in to Amazon ECR
-      uses: aws-actions/amazon-ecr-login@v2
-
-    - name: Download artifact_urls.yaml
-      uses: actions/download-artifact@v4
-      with:
-        name: presigned-artifact-urls-${{ github.run_id }}
-        path: ./single-node/
-
-    - name: Add environment variables into GITHUB_ENV
-      run: |
-        # Export variables to the environment
-        awk -F':' '!/^#/ && NF>1 {name=$1; val=substr($0,length(name)+3); gsub(/[-.]/,"_",name); print name "=" val}' ${{ vars.ARTIFACT_URL_FILE_NAME }} >> "$GITHUB_ENV"
-      working-directory: ./single-node/
-
-    - name: Create single node certficates
-      run: |
-        curl --output ./wazuh-certs-tool.sh "${{ env.wazuh_certs_tool }}"
-        cat > config.yml <<EOF
-        nodes:
-          # Wazuh indexer server nodes
-          indexer:
-            - name: wazuh.indexer
-              dns: "wazuh.indexer"
-
-          # Wazuh manager nodes
-          # Use node_type only with more than one Wazuh manager
-          manager:
-            - name: wazuh.manager
-              dns: "wazuh.manager"
-
-          # Wazuh dashboard node
-          dashboard:
-            - name: wazuh.dashboard
-              dns: "wazuh.dashboard"
-        EOF
-        cat config.yml
-        sudo bash ../tools/utils/deployment/certificates-conf.sh --cert --copy --priv
-        sudo sysctl -w vm.max_map_count=262144
-      working-directory: ./single-node
-
-    - name: Edit single node docker-compose file
-      shell: bash
-      env:
-        WAZUH_REGISTRY: ${{ env.WAZUH_REGISTRY }}
-      run: |
-        TARGET_FILE="single-node/docker-compose.yml"
-        if [ -f "$TARGET_FILE" ]; then
-          echo "Updating registry in $TARGET_FILE to: ${{ env.WAZUH_REGISTRY }}"
-          sed -i "s|wazuh/wazuh-|${{ env.WAZUH_REGISTRY }}/wazuh/wazuh-|g" "$TARGET_FILE"
-          sed -i "s/\(.*wazuh\/wazuh-.*:\)${{ env.WAZUH_IMAGE_VERSION }}/\1${{ env.WAZUH_IMAGE_VERSION }}-latest/g" "$TARGET_FILE"
-        else
-          echo "File $TARGET_FILE not found"
-          exit 1
-        fi
-
-    - name: Start single node stack
-      id: start_single_node_stack
-      run: docker compose up -d
-      working-directory: ./single-node
-
-    - name: Check Wazuh indexer start
-      if: ${{ always() && steps.start_single_node_stack.outcome == 'success' }}
-      run: |
-        for i in {1..20}; do
-          echo "Checking Wazuh indexer health (Attempt $i/20)"
-          RESPONSE=$(curl -XGET "https://127.0.0.1:9200/_cluster/health?pretty" -u ${{ env.INDEXER_USERNAME }}:${{ env.INDEXER_PASSWORD }} -k -s --retry 2 || true)
-          INDEXER_CONTAINERS=$(docker ps --format '{{.Names}}' | grep "indexer")
-          if echo "$RESPONSE" | grep -qE "green|yellow"; then
-            echo "Cluster Online"
-            echo "$RESPONSE"
-            exit 0
-          fi
-          echo "Waiting for cluster to be online"
-          for CONTAINER_NAME in $INDEXER_CONTAINERS; do
-            echo ""
-            echo "========================================================="
-            echo "Container logs for $CONTAINER_NAME"
-            echo "========================================================="
-            docker logs --tail 30 "$CONTAINER_NAME"
-            echo "---------------------------------------------------------"
-          done
-          [ $i -lt 20 ] && sleep 60
-        done
-        status_index="`curl -XGET "https://127.0.0.1:9200/_cat/indices" -u ${{ env.INDEXER_USERNAME }}:${{ env.INDEXER_PASSWORD }} -k -s | wc -l`"
-        status_index_green="`curl -XGET "https://127.0.0.1:9200/_cat/indices" -u ${{ env.INDEXER_USERNAME }}:${{ env.INDEXER_PASSWORD }} -k -s | grep -E "green|yellow" | wc -l`"
-        if [[ $status_index_green -eq $status_index ]]; then
-          curl -XGET "https://127.0.0.1:9200/_cat/indices" -u ${{ env.INDEXER_USERNAME }}:${{ env.INDEXER_PASSWORD }} -k -s
-        else
-          curl -XGET "https://127.0.0.1:9200/_cat/indices" -u ${{ env.INDEXER_USERNAME }}:${{ env.INDEXER_PASSWORD }} -k -s
-          exit 1
-        fi
-
-
-    - name: Check Wazuh indexer nodes
-      if: ${{ always() && steps.start_single_node_stack.outcome == 'success' }}
-      run: |
-        nodes="`curl -XGET "https://127.0.0.1:9200/_cat/nodes" -u ${{ env.INDEXER_USERNAME }}:${{ env.INDEXER_PASSWORD }} -k -s | grep -E "indexer" | wc -l`"
-        echo "Wazuh indexer nodes: ${nodes}"
-
-    - name: Check Wazuh templates
-      if: ${{ always() && steps.start_single_node_stack.outcome == 'success' }}
-      run: |
-        qty_templates="`curl -XGET "https://127.0.0.1:9200/_cat/templates" -u ${{ env.INDEXER_USERNAME }}:${{ env.INDEXER_PASSWORD }} -k -s | grep -P "wazuh|wazuh-agent|wazuh-statistics" | wc -l`"
-        templates="`curl -XGET "https://127.0.0.1:9200/_cat/templates" -u ${{ env.INDEXER_USERNAME }}:${{ env.INDEXER_PASSWORD }} -k -s | grep -P "wazuh|wazuh-agent|wazuh-statistics"`"
-        if [[ $qty_templates -gt 3 ]]; then
-          echo "wazuh templates:"
-          echo "${templates}"
-        else
-          echo "wazuh templates:"
-          echo "${templates}"
-          exit 1
-        fi
-
-    - name: Check Wazuh manager start
-      if: ${{ always() && steps.start_single_node_stack.outcome == 'success' }}
-      run: |
-        for NODE in "${{ env.MANAGER_NODES }}"; do
-          ok=false
-          for i in {1..20}; do
-            TOKEN=$(curl -s -u ${{ env.API_USERNAME }}:${{ env.API_PASSWORD }} -k -X POST "https://127.0.0.1:55000/security/user/authenticate?raw=true")
-            services="`curl -k -s -X GET "https://127.0.0.1:55000/cluster/$NODE/status?pretty=true" -H  "Authorization: Bearer ${TOKEN}" | jq -r .data.affected_items | grep running | wc -l`"
-            if [[ $services -gt 7 ]]; then
-              echo "Wazuh Manager $NODE Services: ${services}"
-              echo "OK"
-              ok=true
-              break
-            else
-              curl -k -X GET "https://127.0.0.1:55000/cluster/$NODE/status?pretty=true" -H  "Authorization: Bearer ${TOKEN}" | jq -r .data.affected_items
-              echo "Wazuh Manager $NODE Services: ${services}. Retrying in 30s"
-              [ $i -lt 20 ] && sleep 30
-            fi
-          done
-          if [[ "$ok" != "true" ]]; then
-            echo "Error: Wazuh Manager $NODE did not reach expected running services threshold"
-            exit 1
-          fi
-        done
-
-    - name: Check Wazuh dashboard service URL
-      if: ${{ always() && steps.start_single_node_stack.outcome == 'success' }}
-      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" || true)
-          echo "Current status: $STATUS"
-          if [[ "$STATUS" == "200" ]]; then
-            echo "Wazuh dashboard is UP"
-            exit 0
-          elif [[ "$STATUS" == "429" || "$STATUS" == "503" ]]; then
-            echo "Dashboard is busy or initializing (Status $STATUS). Retrying in 30s"
-          else
-            echo "Unexpected status $STATUS. Retrying in 30s"
-          fi
-          sleep 30
-        done
-        echo "Error: Dashboard did not reach 200 status in time."
-        exit 1
-
-    - name: Modify Docker endpoint into Wazuh agent docker-compose.yml file
-      if: ${{ always() && steps.start_single_node_stack.outcome == 'success' }}
-      run: sed -i "s/<WAZUH_MANAGER_IP>/$(ip addr show docker0 | grep 'inet ' | awk '{print $2}' | cut -d'/' -f1)/g" wazuh-agent/docker-compose.yml
-
-    - name: Edit Wazuh agent docker-compose file
-      if: ${{ always() && steps.start_single_node_stack.outcome == 'success' }}
-      shell: bash
-      env:
-        WAZUH_REGISTRY: ${{ env.WAZUH_REGISTRY }}
-      run: |
-        TARGET_FILE="wazuh-agent/docker-compose.yml"
-        if [ -f "$TARGET_FILE" ]; then
-          echo "Updating registry in $TARGET_FILE to: ${{ env.WAZUH_REGISTRY }}"
-          sed -i "s|wazuh/wazuh-|${{ env.WAZUH_REGISTRY }}/wazuh/wazuh-|g" "$TARGET_FILE"
-          sed -i "s/\(.*wazuh\/wazuh-.*:\)${{ env.WAZUH_IMAGE_VERSION }}/\1${{ env.WAZUH_IMAGE_VERSION }}-latest/g" "$TARGET_FILE"
-        else
-          echo "File $TARGET_FILE not found"
-          exit 1
-        fi
-
-    - name: Start Wazuh agent
-      if: ${{ always() && steps.start_single_node_stack.outcome == 'success' }}
-      run: docker compose up -d
-      working-directory: ./wazuh-agent
-
-    - name: Check Wazuh agent enrollment
-      if: ${{ always() && steps.start_single_node_stack.outcome == 'success' }}
-      run: |
-        enrolled=false
-        for i in {1..5}; do
-          TOKEN=$(curl -s -u ${{ env.API_USERNAME }}:${{ env.API_PASSWORD }} -k -X POST "https://127.0.0.1:55000/security/user/authenticate?raw=true")
-          agents="`curl -k -s -X GET "https://127.0.0.1:55000/agents?pretty=true" -H  "Authorization: Bearer ${TOKEN}" | jq -r .data.affected_items | grep active | wc -l`"
-          if [[ $agents -gt 0 ]]; then
-            echo "Wazuh agents: ${agents}"
-            echo "OK"
-            enrolled=true
-            break
-          else
-            curl -k -s -X GET "https://127.0.0.1:55000/agents?pretty=true" -H  "Authorization: Bearer ${TOKEN}"
-            echo "Wazuh agents: ${agents}. Retrying in 10s"
-            [ $i -lt 5 ] && sleep 10
-          fi
-        done
-        if [[ "$enrolled" != "true" ]]; then
-          echo "Error: Wazuh agent enrollment did not reach expected active agents threshold"
-          exit 1
-        fi
-
-    - name: Check errors in wazuh-manager.log for Wazuh manager
-      if: ${{ always() && steps.start_single_node_stack.outcome == 'success' }}
-      run: ./.github/single-node-log-check.sh
-
-    - name: Check documents into wazuh-states index
-      if: ${{ always() && steps.start_single_node_stack.outcome == 'success' }}
-      run: |
-        for i in {1..20}; do
-          echo "Checking documents in wazuh-states (Attempt $i/20)..."
-          RESPONSE=$(curl -XGET "https://127.0.0.1:9200/wazuh-states*/_count" -u ${{ env.INDEXER_USERNAME }}:${{ env.INDEXER_PASSWORD }} -k -s || echo "{}")
-          DOCS=$(echo "$RESPONSE" | jq -r '.count // 0')
-          if [[ "$DOCS" -gt 0 ]]; then
-            echo "wazuh-states index has documents: ${DOCS}"
-            exit 0
-          fi
-          echo "The index is empty or does not exist yet (Count: $DOCS). Waiting 60s"
-          [ $i -lt 20 ] && sleep 60
-        done
-        echo "Error: No documents found in wazuh-states after 20 attempts."
-        echo "Last response: $RESPONSE"
-        exit 1
-
-    - name: Docker logs
-      if: always()
-      continue-on-error: true
-      run: |
-        INDEXER_CONTAINERS=$(docker ps --format '{{.Names}}')
-        for CONTAINER_NAME in $INDEXER_CONTAINERS; do
-          echo ""
-          echo "========================================================="
-          echo "Container logs for $CONTAINER_NAME"
-          echo "========================================================="
-          docker logs "$CONTAINER_NAME"
-          echo "---------------------------------------------------------"
-        done
-      working-directory: ./single-node
-
-  check-multi-node:
-    name: Check multi node on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-22.04, ubuntu-22.04-arm]
-      fail-fast: false
-    needs: [prepare-variables, Execute-Goss-tests]
-    env:
-      WAZUH_IMAGE_VERSION: ${{ needs.prepare-variables.outputs.WAZUH_IMAGE_VERSION }}
-      WAZUH_MINOR_VERSION: ${{ needs.prepare-variables.outputs.WAZUH_MINOR_VERSION }}
-      WAZUH_REGISTRY: ${{ needs.prepare-variables.outputs.WAZUH_REGISTRY }}
-      INDEXER_USERNAME: admin
-      INDEXER_PASSWORD: admin
-      MANAGER_NODES: "master,worker01"
-      API_USERNAME: wazuh-wui
-      API_PASSWORD: wazuh-wui
-    steps:
-
-    - name: Check out code
-      uses: actions/checkout@v4
-
-    - name: free disk space
-      uses: ./.github/free-disk-space
-
-    - name: Configure aws credentials
-      uses: aws-actions/configure-aws-credentials@v4
-      with:
-        role-to-assume: ${{ secrets.AWS_IAM_DOCKER_ROLE }}
-        aws-region: "${{ secrets.AWS_REGION }}"
-
-    - name: Log in to Amazon ECR
-      uses: aws-actions/amazon-ecr-login@v2
-
-    - name: Download artifact_urls.yaml
-      uses: actions/download-artifact@v4
-      with:
-        name: presigned-artifact-urls-${{ github.run_id }}
-        path: ./multi-node/
-
-    - name: Add environment variables into GITHUB_ENV
-      run: |
-        # Export variables to the environment
-        awk -F':' '!/^#/ && NF>1 {name=$1; val=substr($0,length(name)+3); gsub(/[-.]/,"_",name); print name "=" val}' ${{ vars.ARTIFACT_URL_FILE_NAME }} >> "$GITHUB_ENV"
-      working-directory: ./multi-node/
-
-    - name: Create multi node certficates
-      run: |
-        curl --output ./wazuh-certs-tool.sh "${{ env.wazuh_certs_tool }}"
-        cat > config.yml <<EOF
-        nodes:
-          # Wazuh indexer server nodes
-          indexer:
-            - name: wazuh1.indexer
-              dns: "wazuh1.indexer"
-            - name: wazuh2.indexer
-              dns: "wazuh2.indexer"
-            - name: wazuh3.indexer
-              dns: "wazuh3.indexer"
-
-          # Wazuh manager nodes
-          # Use node_type only with more than one Wazuh manager
-          manager:
-            - name: wazuh.master
-              dns: "wazuh.master"
-              node_type: master
-            - name: wazuh.worker
-              dns: "wazuh.worker"
-              node_type: worker
-
-          # Wazuh dashboard node
-          dashboard:
-            - name: wazuh.dashboard
-              dns: "wazuh.dashboard"
-        EOF
-        cat config.yml
-        sudo bash ../tools/utils/deployment/certificates-conf.sh --cert --copy --priv
-        sudo sysctl -w vm.max_map_count=262144
-      working-directory: ./multi-node
-
-    - name: Edit multi node docker-compose file
-      shell: bash
-      run: |
-        TARGET_FILE="multi-node/docker-compose.yml"
-        if [ -f "$TARGET_FILE" ]; then
-          echo "Updating registry in $TARGET_FILE to: ${{ env.WAZUH_REGISTRY }}"
-          sed -i "s|wazuh/wazuh-|${{ env.WAZUH_REGISTRY }}/wazuh/wazuh-|g" "$TARGET_FILE"
-          sed -i "s/\(.*wazuh\/wazuh-.*:\)${{ env.WAZUH_IMAGE_VERSION }}/\1${{ env.WAZUH_IMAGE_VERSION }}-latest/g" "$TARGET_FILE"
-        else
-          echo "File $TARGET_FILE not found"
-          exit 1
-        fi
-
-    - name: Start multi node stack
-      id: start_multi_node_stack
-      run: docker compose up -d
-      working-directory: ./multi-node
-
-    - name: Check Wazuh indexer start
-      if: ${{ always() && steps.start_multi_node_stack.outcome == 'success' }}
-      run: |
-        for i in {1..20}; do
-          echo "Checking Wazuh indexer health (Attempt $i/20)"
-          RESPONSE=$(curl -XGET "https://127.0.0.1:9200/_cluster/health?pretty" -u ${{ env.INDEXER_USERNAME }}:${{ env.INDEXER_PASSWORD }} -k -s --retry 2 || true)
-          INDEXER_CONTAINERS=$(docker ps --format '{{.Names}}' | grep "indexer")
-          if echo "$RESPONSE" | grep -qE "green|yellow"; then
-            echo "Cluster Online"
-            echo "$RESPONSE"
-            exit 0
-          fi
-          echo "Waiting for cluster to be online"
-          for CONTAINER_NAME in $INDEXER_CONTAINERS; do
-            echo ""
-            echo "========================================================="
-            echo "Container logs for $CONTAINER_NAME"
-            echo "========================================================="
-            docker logs --tail 30 "$CONTAINER_NAME"
-            echo "---------------------------------------------------------"
-          done
-          [ $i -lt 20 ] && sleep 60
-        done
-        status_index="`curl -XGET "https://127.0.0.1:9200/_cat/indices" -u ${{ env.INDEXER_USERNAME }}:${{ env.INDEXER_PASSWORD }} -k -s | wc -l`"
-        status_index_green="`curl -XGET "https://127.0.0.1:9200/_cat/indices" -u ${{ env.INDEXER_USERNAME }}:${{ env.INDEXER_PASSWORD }} -k -s | grep -E "green" | wc -l`"
-        if [[ $status_index_green -eq $status_index ]]; then
-          curl -XGET "https://127.0.0.1:9200/_cat/indices" -u ${{ env.INDEXER_USERNAME }}:${{ env.INDEXER_PASSWORD }} -k -s
-        else
-          curl -XGET "https://127.0.0.1:9200/_cat/indices" -u ${{ env.INDEXER_USERNAME }}:${{ env.INDEXER_PASSWORD }} -k -s
-          exit 1
-        fi
-
-    - name: Check Wazuh indexer nodes
-      if: ${{ always() && steps.start_multi_node_stack.outcome == 'success' }}
-      run: |
-        nodes="`curl -XGET "https://127.0.0.1:9200/_cat/nodes" -u ${{ env.INDEXER_USERNAME }}:${{ env.INDEXER_PASSWORD }} -k -s | grep -E "indexer" | wc -l`"
-        if [[ $nodes -eq 3 ]]; then
-          echo "Wazuh indexer nodes: ${nodes}"
-        else
-          echo "Wazuh indexer nodes: ${nodes}"
-          exit 1
-        fi
-
-    - name: Check Wazuh templates
-      if: ${{ always() && steps.start_multi_node_stack.outcome == 'success' }}
-      run: |
-        qty_templates="`curl -XGET "https://127.0.0.1:9200/_cat/templates" -u ${{ env.INDEXER_USERNAME }}:${{ env.INDEXER_PASSWORD }} -k -s | grep "wazuh" | wc -l`"
-        templates="`curl -XGET "https://127.0.0.1:9200/_cat/templates" -u ${{ env.INDEXER_USERNAME }}:${{ env.INDEXER_PASSWORD }} -k -s | grep "wazuh"`"
-        if [[ $qty_templates -gt 3 ]]; then
-          echo "wazuh templates:"
-          echo "${templates}"
-        else
-          echo "wazuh templates:"
-          echo "${templates}"
-          exit 1
-        fi
-
-    - name: Check Wazuh manager start
-      if: ${{ always() && steps.start_multi_node_stack.outcome == 'success' }}
-      run: |
-        IFS=',' read -r -a NODES <<< "${{ env.MANAGER_NODES }}"
-        for NODE in "${NODES[@]}"; do
-          if [[ "$NODE" == "master" ]]; then
-            THRESHOLD=8
-          else
-            THRESHOLD=7
-          fi
-          ok=false
-          for i in {1..20}; do
-            TOKEN=$(curl -s -u ${{ env.API_USERNAME }}:${{ env.API_PASSWORD }} -k -X POST "https://127.0.0.1:55000/security/user/authenticate?raw=true")
-            services="`curl -k -s -X GET "https://127.0.0.1:55000/cluster/$NODE/status?pretty=true" -H  "Authorization: Bearer ${TOKEN}" | jq -r .data.affected_items | grep running | wc -l`"
-            if [[ $services -ge $THRESHOLD ]]; then
-              echo "Wazuh Manager $NODE Services: ${services}"
-              echo "OK"
-              ok=true
-              break
-            else
-              curl -k -X GET "https://127.0.0.1:55000/cluster/$NODE/status?pretty=true" -H  "Authorization: Bearer ${TOKEN}" | jq -r .data.affected_items
-              echo "Wazuh Manager $NODE Services: ${services}. Retrying in 30s"
-              [ $i -lt 20 ] && sleep 30
-            fi
-          done
-          if [[ "$ok" != "true" ]]; then
-            echo "Error: Wazuh Manager $NODE did not reach expected running services threshold"
-            exit 1
-          fi
-        done
-
-    - name: Check Wazuh dashboard service URL
-      if: ${{ always() && steps.start_multi_node_stack.outcome == 'success' }}
-      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" || true)
-          echo "Current status: $STATUS"
-          if [[ "$STATUS" == "200" ]]; then
-            echo "Wazuh dashboard is UP"
-            exit 0
-          elif [[ "$STATUS" == "429" || "$STATUS" == "503" ]]; then
-            echo "Dashboard is busy or initializing (Status $STATUS). Retrying in 30s"
-          else
-            echo "Unexpected status $STATUS. Retrying in 30s"
-          fi
-          sleep 30
-        done
-        echo "Error: Dashboard did not reach 200 status in time."
-        exit 1
-
-    - name: Modify Docker endpoint into Wazuh agent docker-compose.yml file
-      if: ${{ always() && steps.start_multi_node_stack.outcome == 'success' }}
-      run: sed -i "s/<WAZUH_MANAGER_IP>/$(ip addr show docker0 | grep 'inet ' | awk '{print $2}' | cut -d'/' -f1)/g" wazuh-agent/docker-compose.yml
-
-    - name: Edit Wazuh agent docker-compose file
-      if: ${{ always() && steps.start_multi_node_stack.outcome == 'success' }}
-      shell: bash
-      env:
-        WAZUH_REGISTRY: ${{ env.WAZUH_REGISTRY }}
-      run: |
-        TARGET_FILE="wazuh-agent/docker-compose.yml"
-        if [ -f "$TARGET_FILE" ]; then
-          echo "Updating registry in $TARGET_FILE to: ${{ env.WAZUH_REGISTRY }}"
-          sed -i "s|wazuh/wazuh-|${{ env.WAZUH_REGISTRY }}/wazuh/wazuh-|g" "$TARGET_FILE"
-          sed -i "s/\(.*wazuh\/wazuh-.*:\)${{ env.WAZUH_IMAGE_VERSION }}/\1${{ env.WAZUH_IMAGE_VERSION }}-latest/g" "$TARGET_FILE"
-        else
-          echo "File $TARGET_FILE not found"
-          exit 1
-        fi
-
-    - name: Start Wazuh agent
-      if: ${{ always() && steps.start_multi_node_stack.outcome == 'success' }}
-      run: docker compose -f wazuh-agent/docker-compose.yml up -d
-
-    - name: Check Wazuh agent enrollment
-      if: ${{ always() && steps.start_multi_node_stack.outcome == 'success' }}
-      run: |
-        enrolled=false
-        for i in {1..5}; do
-          TOKEN=$(curl -s -u ${{ env.API_USERNAME }}:${{ env.API_PASSWORD }} -k -X POST "https://127.0.0.1:55000/security/user/authenticate?raw=true")
-          agents="`curl -k -s -X GET "https://127.0.0.1:55000/agents?pretty=true" -H  "Authorization: Bearer ${TOKEN}" | jq -r .data.affected_items | grep active | wc -l`"
-          if [[ $agents -gt 0 ]]; then
-            echo "Wazuh agents: ${agents}"
-            echo "OK"
-            enrolled=true
-            break
-          else
-            curl -k -s -X GET "https://127.0.0.1:55000/agents?pretty=true" -H  "Authorization: Bearer ${TOKEN}"
-            echo "Wazuh agents: ${agents}. Retrying in 10s"
-            [ $i -lt 5 ] && sleep 10
-          fi
-        done
-        if [[ "$enrolled" != "true" ]]; then
-          echo "Error: Wazuh agent enrollment did not reach expected active agents threshold"
-          exit 1
-        fi
-
-    - name: Check errors in wazuh-manager.log for Wazuh manager
-      if: ${{ always() && steps.start_multi_node_stack.outcome == 'success' }}
-      run: ./.github/multi-node-log-check.sh
-
-    - name: Check documents into wazuh-states index
-      if: ${{ always() && steps.start_multi_node_stack.outcome == 'success' }}
-      run: |
-        for i in {1..20}; do
-          echo "Checking documents in wazuh-states (Attempt $i/20)..."
-          RESPONSE=$(curl -XGET "https://127.0.0.1:9200/wazuh-states*/_count" -u ${{ env.INDEXER_USERNAME }}:${{ env.INDEXER_PASSWORD }} -k -s || echo "{}")
-          DOCS=$(echo "$RESPONSE" | jq -r '.count // 0')
-          if [[ "$DOCS" -gt 0 ]]; then
-            echo "wazuh-states index has documents: ${DOCS}"
-            exit 0
-          fi
-          echo "The index is empty or does not exist yet (Count: $DOCS). Waiting 60s"
-          [ $i -lt 20 ] && sleep 60
-        done
-        echo "Error: No documents found in wazuh-states after 20 attempts."
-        echo "Last response: $RESPONSE"
-        exit 1
-
-    - name: Docker logs
-      if: always()
-      continue-on-error: true
-      run: |
-        INDEXER_CONTAINERS=$(docker ps --format '{{.Names}}')
-        for CONTAINER_NAME in $INDEXER_CONTAINERS; do
-          echo ""
-          echo "========================================================="
-          echo "Container logs for $CONTAINER_NAME"
-          echo "========================================================="
-          docker logs "$CONTAINER_NAME"
-          echo "---------------------------------------------------------"
-        done
-      working-directory: ./multi-node

.github/workflows/Procedure_push_docker_images.yml

@@ -6,29 +6,28 @@ on:
     inputs:
       image_tag:
         description: 'Docker image tag'
-        default: '5.0.0'
+        default: '6.0.0'
         required: true
       docker_reference:
         description: 'wazuh-docker reference'
         required: true
-      wazuh_automation_reference:
-        description: 'Branch or tag of the wazuh-automation repository'
-        required: false
-        default: 'main'
       products:
         description: 'Comma-separated list of the image names to build and push'
         default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent'
-        required: false
-        type: string
-      commit_list:
-        description: 'Wazuh components revisions (only for dev): json array with commit-hash for each product'
-        type: string
-        default: '["latest", "latest", "latest", "latest"]'
-      assistant_revision:
-        description: 'Revision for Wazuh installation assistant tools like Wazuh password tool (only for dev)'
-        type: string
-        default: 'latest'
-        required: false
+        required: true
+      filebeat_module_version:
+        description: 'Filebeat module version'
+        default: '0.4'
+        required: true
+      revision:
+        description: 'Package revision'
+        default: '1'
+        required: true
+      push_images:
+        description: 'Push images'
+        type: boolean
+        default: true
+        required: true
       id:
         description: "ID used to identify the workflow uniquely."
         type: string
@@ -42,32 +41,33 @@ on:
     inputs:
       image_tag:
         description: 'Docker image tag'
-        default: '5.0.0'
+        default: '6.0.0'
         required: true
         type: string
       docker_reference:
         description: 'wazuh-docker reference'
         required: false
         type: string
-      wazuh_automation_reference:
-        description: 'Branch or tag of the wazuh-automation repository'
-        required: false
-        default: 'main'
-        type: string
       products:
         description: 'Comma-separated list of the image names to build and push'
         default: 'wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent'
-        required: false
+        required: true
         type: string
-      commit_list:
-        description: 'Wazuh components revisions (only for dev): json array with commit-hash for each product'
+      filebeat_module_version:
+        description: 'Filebeat module version'
+        default: '0.4'
+        required: true
         type: string
-        default: '["latest", "latest", "latest", "latest"]'
-      assistant_revision:
-        description: 'Revision for Wazuh installation assistant tools like Wazuh password tool (only for dev)'
+      revision:
+        description: 'Package revision'
+        default: '1'
+        required: true
         type: string
-        default: 'latest'
-        required: false
+      push_images:
+        description: 'Push images'
+        type: boolean
+        default: true
+        required: true
       id:
         description: "ID used to identify the workflow uniquely."
         type: string
@@ -78,19 +78,9 @@ on:
         default: false
         required: false
 
-permissions:
-      id-token: write
-      contents: read
-
 jobs:
-  setup:
-    runs-on:
-      group: wz-linux-amd64
-
-    outputs:
-      WAZUH_COMPONENTS: ${{ steps.compute-outputs.outputs.WAZUH_COMPONENTS }}
-      COMMIT_LIST: ${{ steps.compute-outputs.outputs.COMMIT_LIST }}
-      ALL_PRODUCTS_SELECTED: ${{ steps.compute-outputs.outputs.ALL_PRODUCTS_SELECTED }}
+  build-and-push:
+    runs-on: ubuntu-22.04
 
     steps:
     - name: Print inputs
@@ -106,249 +96,30 @@ jobs:
         echo "* id: ${{ inputs.id }}"
         echo "* image_tag: ${{ inputs.image_tag }}"
         echo "* docker_reference: ${{ inputs.docker_reference }}"
-        echo "* wazuh_automation_reference: ${{ inputs.wazuh_automation_reference }}"
         echo "* products: ${{ inputs.products }}"
+        echo "* filebeat_module_version: ${{ inputs.filebeat_module_version }}"
+        echo "* revision: ${{ inputs.revision }}"
+        echo "* push_images: ${{ inputs.push_images }}"
         echo "* dev: ${{ inputs.dev }}"
-        echo "* commit_list: ${{ inputs.commit_list }}"
-        echo "* assistant_revision: ${{ inputs.assistant_revision }}"
         echo "---------------------------------------------"
 
-    - name: Set up variables
-      id: compute-outputs
-      run: |
-        # Use the default list if products is empty
-        PRODUCTS="${{ inputs.products }}"
-        if [[ -z "$PRODUCTS" || "$PRODUCTS" == "null" ]]; then
-          PRODUCTS="wazuh-manager,wazuh-dashboard,wazuh-indexer,wazuh-agent"
-        fi
-        # Check if all 4 core components are present in the string
-        if [[ "$PRODUCTS" == *"wazuh-manager"* && "$PRODUCTS" == *"wazuh-dashboard"* && "$PRODUCTS" == *"wazuh-indexer"* && "$PRODUCTS" == *"wazuh-agent"* ]]; then
-          echo "ALL_PRODUCTS_SELECTED=true" >> $GITHUB_OUTPUT
-        else
-          echo "ALL_PRODUCTS_SELECTED=false" >> $GITHUB_OUTPUT
-        fi
-        # Set WAZUH_COMPONENTS
-        # Convert to JSON for the matrix (Your existing logic)
-        IFS=',' read -ra COMPONENTS <<< "$PRODUCTS"
-        JSON_ARRAY=$(printf '%s\n' "${COMPONENTS[@]}" | jq -R . | jq -s -c .)
-        echo "WAZUH_COMPONENTS=$JSON_ARRAY" >> $GITHUB_OUTPUT
-
-        # Set COMMIT_LIST
-        WC_COMMIT_LIST=""
-        if [[ "${{ inputs.dev }}" == "true" ]]; then
-          if [[ "${{ inputs.commit_list }}" != "null" && "${{ inputs.commit_list }}" != "" ]]; then
-            WC_COMMIT_LIST='${{ inputs.commit_list }}'
-          else
-            # Set commit list to "latest" for all components using WAZUH_COMPONENTS
-            COMPONENTS=($(echo "$WC_JSON_ARRAY" | jq -r '.[]'))
-            WC_COMMIT_LIST="["
-            for i in "${!COMPONENTS[@]}"; do
-              if [ $i -gt 0 ]; then
-                WC_COMMIT_LIST+=" ,"
-              fi
-              WC_COMMIT_LIST+="\"latest\""
-            done
-            WC_COMMIT_LIST+="]"
-          fi
-          echo "Revision list: $WC_COMMIT_LIST"
-        fi
-        echo "COMMIT_LIST=$WC_COMMIT_LIST" >> $GITHUB_OUTPUT
-
-  package-urls:
-    name: generate package urls
-    runs-on:
-      group: wz-linux-amd64
-    needs: setup
-
-    env:
-      WORKFLOW_VENV: "${{ github.workspace }}/workflow_venv"
-      GENERATE_PRESIGNED_URLS_SCRIPT_PATH: ${{ github.workspace }}/wazuh-automation/tools/sign_urls/generate_presigned_dev_urls.py
-      PRESIGNED_URLS_SCRIPT_PROCESS: "build_docker"
-      LOCAL_ARTIFACT_URLS_FILEPATH: /tmp/${{ vars.ARTIFACT_URL_FILE_NAME }}
-      COMMIT_LIST: ${{ inputs.commit_list }}
-      ASSISTANT_REVISION: ${{ inputs.assistant_revision }}
-
-    steps:
-      - name: Checkout repository
-        if: ${{ inputs.dev == true }}
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.docker_reference }}
-
-      - name: Checkout wazuh/wazuh-automation repository
-        if: ${{ inputs.dev == true }}
-        uses: actions/checkout@v4
-        with:
-          repository: wazuh/wazuh-automation
-          ref: ${{ inputs.wazuh_automation_reference }}
-          token: ${{ secrets.GH_CLONE_TOKEN }}
-          path: wazuh-automation
-
-      - name: Configure AWS credentials
-        if: ${{ inputs.dev == true }}
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          role-to-assume: ${{ secrets.AWS_IAM_DOCKER_ROLE }}
-          aws-region: ${{ secrets.AWS_REGION }}
-
-      - name: Set up Python
-        if: ${{ inputs.dev == true }}
-        uses: actions/setup-python@v6
-        with:
-          python-version: '3.12'
-
-      - name: Install and configure python and workflow dependencies
-        if: ${{ inputs.dev == true }}
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y jq
-          # Install yq
-          sudo curl -sL "https://github.com/mikefarah/yq/releases/download/v4.44.3/yq_linux_amd64" -o /usr/local/bin/yq
-          sudo chmod +x /usr/local/bin/yq
-          sudo apt-get install -y python3-venv
-          python3 -m venv ${{ env.WORKFLOW_VENV }}
-          source ${{ env.WORKFLOW_VENV }}/bin/activate
-          pip install --upgrade pip
-          pip install pyyaml
-
-      - name: Get Wazuh version
-        if: ${{ inputs.dev == true }}
-        run: |
-          WAZUH_VERSION=$(jq -r '.version' VERSION.json)
-          WAZUH_MAJOR=$(echo "$WAZUH_VERSION" | cut -d '.' -f 1)
-          WAZUH_MINOR=$(echo "$WAZUH_VERSION" | cut -d '.' -f 1-2)
-          echo WAZUH_VERSION=$WAZUH_VERSION >> $GITHUB_ENV
-          echo WAZUH_MAJOR=$WAZUH_MAJOR >> $GITHUB_ENV
-          echo WAZUH_MINOR=$WAZUH_MINOR >> $GITHUB_ENV
-
-      - name: Get artifacts URLs file
-        if: ${{ inputs.dev == true }}
-        run: |
-          LOCAL_AWS_S3_BUCKET_DEV=${{ vars.AWS_S3_BUCKET_DEV }}
-          echo LOCAL_AWS_S3_BUCKET_DEV=$LOCAL_AWS_S3_BUCKET_DEV >> $GITHUB_ENV
-
-      - name: Generate presigned URLs for artifacts for dev packages
-        if: ${{ inputs.dev == true }}
-        run: |
-          source ${{ env.WORKFLOW_VENV }}/bin/activate
-          WAZUH_COMPONENTS='${{ needs.setup.outputs.WAZUH_COMPONENTS }}'
-          COMMIT_LIST='${{ needs.setup.outputs.COMMIT_LIST }}'
-          SCRIPT_PARAMS="--process ${{ env.PRESIGNED_URLS_SCRIPT_PROCESS }} \
-                            --wazuh-version ${{ env.WAZUH_VERSION }} \
-                            --aws-s3-bucket-dev ${{ env.LOCAL_AWS_S3_BUCKET_DEV }} \
-                            --assistant-revision $ASSISTANT_REVISION "
-
-
-          # Parse components and their revisions
-          COMPONENTS=($(echo "$WAZUH_COMPONENTS" | jq -r '.[]'))
-          REVISIONS=($(echo "$COMMIT_LIST" | jq -r '.[]'))
-
-          # Ensure the number of components matches the number of revisions
-          if [[ ${#COMPONENTS[@]} -ne ${#REVISIONS[@]} ]]; then
-            echo "Error: WAZUH_COMPONENTS and COMMIT_LIST length mismatch." >&2
-            echo "       Components: ${#COMPONENTS[@]}, Revisions: ${#REVISIONS[@]}." >&2
-            echo "       WAZUH_COMPONENTS=${WAZUH_COMPONENTS}" >&2
-            echo "       COMMIT_LIST=${COMMIT_LIST}" >&2
-            exit 1
-          fi
-
-          # Map revisions to component names
-          for i in "${!COMPONENTS[@]}"; do
-          case "${COMPONENTS[$i]}" in
-            wazuh-manager)
-            SCRIPT_PARAMS+="--manager-revision ${REVISIONS[$i]} "
-            ;;
-            wazuh-dashboard)
-            SCRIPT_PARAMS+="--dashboard-revision ${REVISIONS[$i]} "
-            ;;
-            wazuh-indexer)
-            SCRIPT_PARAMS+="--indexer-revision ${REVISIONS[$i]} "
-            ;;
-            wazuh-agent)
-            SCRIPT_PARAMS+="--agent-revision ${REVISIONS[$i]} "
-            ;;
-          esac
-          done
-
-          python ${{ env.GENERATE_PRESIGNED_URLS_SCRIPT_PATH }} \
-              $SCRIPT_PARAMS
-
-      - name: Save presigned URLs file to artifact
-        if: ${{ inputs.dev == true }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: presigned-artifact-urls-${{ github.run_id }}
-          path: ${{ env.LOCAL_ARTIFACT_URLS_FILEPATH }}
-
-  build-and-push:
-    runs-on:
-      group: wz-linux-amd64
-
-    needs:
-      - setup
-      - package-urls
-
-    strategy:
-      fail-fast: false # all jobs will run even if one fails
-      matrix:
-        wazuh_component: ${{ fromJson(needs.setup.outputs.WAZUH_COMPONENTS) }}
-
-    env:
-      IMAGE_REGISTRY: ${{ inputs.dev && vars.IMAGE_REGISTRY_DEV || vars.IMAGE_REGISTRY_PROD }}
-      IMAGE_TAG: ${{ inputs.image_tag }}
-
-    steps:
     - name: Checkout repository
-      uses: actions/checkout@v6
+      uses: actions/checkout@v4
       with:
         ref: ${{ inputs.docker_reference }}
 
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v4
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v4
-
-    - name: Configure aws credentials
-      if: ${{ inputs.dev == true }}
-      uses: aws-actions/configure-aws-credentials@v6
-      with:
-        role-to-assume: ${{ secrets.AWS_IAM_DOCKER_ROLE }}
-        aws-region: "${{ secrets.AWS_REGION }}"
-
-    - name: Log in to Amazon ECR
-      if: ${{ inputs.dev == true }}
-      uses: aws-actions/amazon-ecr-login@v2
-
     - name: Log in to Docker Hub
-      if: ${{ inputs.dev == false }}
-      uses: docker/login-action@v4
+      uses: docker/login-action@v3
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
-    - name: Download artifact_urls.yaml (dev)
-      if: ${{ inputs.dev == true }}
-      uses: actions/download-artifact@v4
-      with:
-        name: presigned-artifact-urls-${{ github.run_id }}
-        path: ./build-docker-images
-
-    - name: Compute component reference (dev)
-      if: ${{ inputs.dev == true }}
-      run: |
-        COMPONENT='${{ matrix.wazuh_component }}'
-        WAZUH_COMPONENTS='${{ needs.setup.outputs.WAZUH_COMPONENTS }}'
-        COMMIT_LIST='${{ needs.setup.outputs.COMMIT_LIST }}'
-
-        idx=$(jq -r --arg c "$COMPONENT" 'index($c)' <<<"$WAZUH_COMPONENTS")
-        ref=$(jq -r --argjson i "$idx" '.[ $i ]' <<<"$COMMIT_LIST")
-
-        echo "COMPONENT_REFS_JSON=[\"$ref\"]" >> "$GITHUB_ENV"
-        echo "Using component ref for $COMPONENT: $ref"
-
     - name: Build Wazuh images
       run: |
+        IMAGE_TAG=${{ inputs.image_tag }}
+        FILEBEAT_MODULE_VERSION=${{ inputs.filebeat_module_version }}
+        REVISION=${{ inputs.revision }}
+
         if [[ "$IMAGE_TAG" == *"-"* ]]; then
           IFS='-' read -r -a tokens <<< "$IMAGE_TAG"
           if [ -z "${tokens[1]}" ]; then
@@ -357,42 +128,13 @@ jobs:
           fi
           DEV_STAGE=${tokens[1]}
           WAZUH_VER=${tokens[0]}
-          if [ "${{ inputs.dev }}" = true ]; then
-            ./build-images.sh \
-              -v $WAZUH_VER \
-              -d $DEV_STAGE \
-              -rg $IMAGE_REGISTRY \
-              -m \
-              --dev \
-              -refs "$COMPONENT_REFS_JSON" \
-              -c ${{ matrix.wazuh_component }}
-          else
-            ./build-images.sh \
-              -v $WAZUH_VER \
-              -d $DEV_STAGE \
-              -rg $IMAGE_REGISTRY \
-              -m \
-              -c ${{ matrix.wazuh_component }}
-          fi
+          ./build-docker-images/build-images.sh -v $WAZUH_VER -r $REVISION -d $DEV_STAGE -f $FILEBEAT_MODULE_VERSION
         else
-          if [ "${{ inputs.dev }}" = true ]; then
-            ./build-images.sh \
-              -v $IMAGE_TAG \
-              -rg $IMAGE_REGISTRY \
-              -m \
-              --dev \
-              -refs "$COMPONENT_REFS_JSON" \
-              -c ${{ matrix.wazuh_component }}
-          else
-            ./build-images.sh \
-              -v $IMAGE_TAG \
-              -rg $IMAGE_REGISTRY \
-              -m \
-              -c ${{ matrix.wazuh_component }}
-          fi
+          ./build-docker-images/build-images.sh -v $IMAGE_TAG -r $REVISION -f $FILEBEAT_MODULE_VERSION
         fi
+
         # Save .env file (generated by build-images.sh) contents to $GITHUB_ENV
-        ENV_FILE_PATH="../.env"
+        ENV_FILE_PATH=".env"
 
         if [ -f $ENV_FILE_PATH ]; then
           while IFS= read -r line || [ -n "$line" ]; do
@@ -402,98 +144,16 @@ jobs:
           echo "The environment file $ENV_FILE_PATH does not exist!"
           exit 1
         fi
-      working-directory: ./build-docker-images
 
-
-  notify:
-    runs-on: ubuntu-22.04
-    needs: [setup, build-and-push]
-    # Only run if NOT dev AND all products were selected
-    if: ${{ inputs.dev == false && needs.setup.outputs.ALL_PRODUCTS_SELECTED == 'true' }}
-
-    steps:
-    - name: Image exists validation
-      id: validation
+    - name: Tag and Push Wazuh images
+      if: ${{ inputs.push_images }}
       run: |
-        IMAGE_TAG=${{ inputs.image_tag }}
-        IMAGE_REGISTRY="${{ vars.IMAGE_REGISTRY_PROD }}"
-        PURPOSE=""
-
-        if [[ "$IMAGE_TAG" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-          if docker manifest inspect $IMAGE_REGISTRY/wazuh/wazuh-manager:$IMAGE_TAG > /dev/null 2>&1; then
-            PURPOSE="regeneration"
-            echo "Image wazuh/wazuh-manager:$IMAGE_TAG exists. Setting PURPOSE to 'regeneration'"
-          else
-            PURPOSE="new release"
-            echo "Image wazuh/wazuh-manager:$IMAGE_TAG does NOT exist. Setting PURPOSE to 'new release'"
-          fi
-          echo "✅ Release tag: '$IMAGE_TAG'"
-        elif [[ "$IMAGE_TAG" =~ ^[0-9]+\.[0-9]+\.[0-9]+-(alpha|beta|rc)[0-9]+$ ]]; then
-          PURPOSE="new stage"
-          echo "✅ Stage tag: '$IMAGE_TAG'. Setting PURPOSE to 'new stage'"
-        else
-          echo "❌ No release or stage tag ('$IMAGE_TAG'), the GH issue will not be created"
-        fi
-
-        echo "purpose=$PURPOSE" >> $GITHUB_OUTPUT
-
-    - name: GH issue notification
-      if: ${{ steps.validation.outputs.purpose != '' }}
-      env:
-        GH_TOKEN: ${{ secrets.NOTIFICATION_GH_ARTIFACT_TOKEN }}
-      run: |
-        IMAGE_TAG=${{ inputs.image_tag }}
-        PURPOSE="${{ steps.validation.outputs.purpose }}"
-
-        GH_TITLE=""
-        GH_MESSAGE=""
-
-        ## Setting GH issue title
-        GH_TITLE="Artifactory vulnerabilities update \`v$IMAGE_TAG\`"
-
-        ## Setting GH issue body
-        GH_MESSAGE=$(cat <<- EOF | tr -d '\r' | sed 's/^[[:space:]]*//'
-        ### Description
-        - [ ] Update the [Artifactory vulnerabilities](${{ secrets.NOTIFICATION_SHEET_URL }}) sheet with the \`v$IMAGE_TAG\` vulnerabilities.
-
-        **Purpose**: $PURPOSE
-        >[!NOTE]
-        >To update the \`Tentative Release\` column, follow these steps:
-        https://github.com/wazuh/${{ secrets.NOTIFICATION_REPO }}/issues/2049#issuecomment-2671590268
-        EOF
-        )
-
-        # Print the GH Variables content
-        echo "--- Variable Content ---"
-        echo "$GH_TITLE"
-        echo "------------------------"
-
-        echo "--- Variable Content ---"
-        echo "$GH_MESSAGE"
-        echo "------------------------"
-
-        ## GH issue creation
-        ISSUE_URL=$(gh issue create \
-          -R wazuh/${{ secrets.NOTIFICATION_REPO }} \
-          --title "$GH_TITLE" \
-          --body "$GH_MESSAGE" \
-          --label "level/task" \
-          --label "type/maintenance" \
-          --label "request/operational")
-
-        ## Adding the issue to the team project
-        PROJECT_ITEM_ID=$(gh project item-add \
-          ${{ secrets.NOTIFICATION_PROJECT_NUMBER }} \
-          --url $ISSUE_URL \
-          --owner wazuh \
-          --format json \
-          | jq -r '.id')
-
-          ## Setting Objective
-          gh project item-edit --id $PROJECT_ITEM_ID --project-id ${{ secrets.NOTIFICATION_PROJECT_ID }} --field-id ${{ secrets.NOTIFICATION_PROJECT_OBJECTIVE_ID }} --text  "Security scans"
-          ## Setting Priority
-          gh project item-edit --id $PROJECT_ITEM_ID --project-id ${{ secrets.NOTIFICATION_PROJECT_ID }} --field-id ${{ secrets.NOTIFICATION_PROJECT_PRIORITY_ID }} --single-select-option-id ${{ secrets.NOTIFICATION_PROJECT_PRIORITY_OPTION_ID }}
-          ## Setting Size
-          gh project item-edit --id $PROJECT_ITEM_ID --project-id ${{ secrets.NOTIFICATION_PROJECT_ID }} --field-id ${{ secrets.NOTIFICATION_PROJECT_SIZE_ID }} --single-select-option-id ${{ secrets.NOTIFICATION_PROJECT_SIZE_OPTION_ID }}
-          ## Setting Subteam
-          gh project item-edit --id $PROJECT_ITEM_ID --project-id ${{ secrets.NOTIFICATION_PROJECT_ID }} --field-id ${{ secrets.NOTIFICATION_PROJECT_SUBTEAM_ID }} --single-select-option-id ${{ secrets.NOTIFICATION_PROJECT_SUBTEAM_OPTION_ID }}
+        IMAGE_TAG="${{ inputs.image_tag }}$( [ "${{ inputs.dev }}" == "true" ] && echo '-dev' || true )"
+        IMAGE_NAMES=${{ inputs.products }}
+        IFS=',' read -r -a images <<< "$IMAGE_NAMES"
+        for image in "${images[@]}"; do
+          echo "Tagging and pushing wazuh/$image:${WAZUH_VERSION} to wazuh/$image:$IMAGE_TAG"
+          docker tag wazuh/$image:${WAZUH_VERSION} wazuh/$image:$IMAGE_TAG
+          echo "Pushing wazuh/$image:$IMAGE_TAG ..."
+          docker push wazuh/$image:$IMAGE_TAG
+        done

.github/workflows/check_integration_tools.yaml

@@ -1,32 +0,0 @@
-name: PR Check - Docker Integration Tests
-
-on:
-  workflow_dispatch:
-    inputs:
-      pr_head_ref:
-        description: 'Branch of wazuh-docker to test'
-        required: true
-        type: string
-      automation_reference:
-        description: 'Branch of wazuh-automation to use'
-        required: false
-        default: 'main'
-        type: string
-      deployment_type:
-        description: 'Deployment type to test'
-        required: true
-        type: choice
-        options:
-          - single-node
-          - multi-node
-          - both
-
-permissions:
-  id-token: write
-  contents: read
-
-jobs:
-  placeholder:
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo "Workflow registered. Use workflow_dispatch selecting the feature branch."

.github/workflows/push.yml

@@ -0,0 +1,393 @@
+name: Wazuh Docker pipeline
+
+on: [pull_request]
+
+jobs:
+  build-docker-images:
+    runs-on: ubuntu-22.04
+    steps:
+
+    - name: Check out code
+      uses: actions/checkout@v4
+
+    - name: Build Wazuh images
+      run: build-docker-images/build-images.sh
+
+    - name: Create enviroment variables
+      run: cat .env > $GITHUB_ENV
+
+    - name: Create backup Docker images
+      run: |
+        mkdir -p /home/runner/work/wazuh-docker/wazuh-docker/docker-images/
+        docker save wazuh/wazuh-manager:${{env.WAZUH_IMAGE_VERSION}} -o /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-manager.tar
+        docker save wazuh/wazuh-indexer:${{env.WAZUH_IMAGE_VERSION}} -o /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-indexer.tar
+        docker save wazuh/wazuh-dashboard:${{env.WAZUH_IMAGE_VERSION}} -o /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-dashboard.tar
+        docker save wazuh/wazuh-agent:${{env.WAZUH_IMAGE_VERSION}} -o /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-agent.tar
+        docker save wazuh/wazuh-cert-tool:${{env.WAZUH_IMAGE_VERSION}} -o /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-cert-tool.tar
+
+    - name: Temporarily save Wazuh manager Docker image
+      uses: actions/upload-artifact@v4
+      with:
+        name: docker-artifact-manager
+        path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-manager.tar
+        retention-days: 1
+
+    - name: Temporarily save Wazuh indexer Docker image
+      uses: actions/upload-artifact@v4
+      with:
+        name: docker-artifact-indexer
+        path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-indexer.tar
+        retention-days: 1
+
+    - name: Temporarily save Wazuh dashboard Docker image
+      uses: actions/upload-artifact@v4
+      with:
+        name: docker-artifact-dashboard
+        path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-dashboard.tar
+        retention-days: 1
+
+    - name: Temporarily save Wazuh agent Docker image
+      uses: actions/upload-artifact@v4
+      with:
+        name: docker-artifact-agent
+        path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-agent.tar
+    - name: Temporarily save Wazuh Cert Tool Docker image
+      uses: actions/upload-artifact@v3
+      with:
+        name: docker-artifact-cert-tool
+        path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-cert-tool.tar
+        retention-days: 1
+
+    - name: Install Goss
+      uses: e1himself/goss-installation-action@v1.0.3
+      with:
+        version: v0.3.16
+
+    - name: Execute Goss tests (wazuh-manager)
+      run: dgoss run wazuh/wazuh-manager:${{env.WAZUH_IMAGE_VERSION}}
+      env:
+        GOSS_SLEEP: 30
+        GOSS_FILE: .github/.goss.yaml
+
+  check-single-node:
+    runs-on: ubuntu-22.04
+    needs: build-docker-images
+    steps:
+
+    - name: Check out code
+      uses: actions/checkout@v4
+
+    - name: Create enviroment variables
+      run: cat .env > $GITHUB_ENV
+
+    - name: Retrieve saved Wazuh indexer Docker image
+      uses: actions/download-artifact@v4
+      with:
+        name: docker-artifact-indexer
+
+    - name: Retrieve saved Wazuh manager Docker image
+      uses: actions/download-artifact@v4
+      with:
+        name: docker-artifact-manager
+
+    - name: Retrieve saved Wazuh dashboard Docker image
+      uses: actions/download-artifact@v4
+      with:
+        name: docker-artifact-dashboard
+
+    - name: Retrieve saved Wazuh agent Docker image
+      uses: actions/download-artifact@v4
+      with:
+        name: docker-artifact-agent
+    - name: Retrieve saved Wazuh Cert Tool Docker image
+      uses: actions/download-artifact@v3
+      with:
+        name: docker-artifact-cert-tool
+
+    - name: Docker load
+      run: |
+        docker load --input ./wazuh-indexer.tar
+        docker load --input ./wazuh-dashboard.tar
+        docker load --input ./wazuh-manager.tar
+        docker load --input ./wazuh-agent.tar
+
+    - name: Create single node certficates
+      run: docker compose -f single-node/generate-certs.yml run --rm generator
+        docker load --input ./wazuh-cert-tool.tar
+        rm -rf wazuh-manager.tar wazuh-indexer.tar wazuh-dashboard.tar wazuh-cert-tool.tar
+
+
+    - name: Create single node certficates
+      run: docker-compose -f single-node/generate-certs.yml run --rm generator
+
+    - name: Start single node stack
+      run: docker compose -f single-node/docker-compose.yml up -d
+
+    - name: Check Wazuh indexer start
+      run: |
+       sleep 60
+       status_green="`curl -XGET "https://0.0.0.0:9200/_cluster/health" -u admin:SecretPassword -k -s | grep green | wc -l`"
+       if [[ $status_green -eq 1 ]]; then
+        curl -XGET "https://0.0.0.0:9200/_cluster/health" -u admin:SecretPassword -k -s
+       else
+        curl -XGET "https://0.0.0.0:9200/_cluster/health" -u admin:SecretPassword -k -s
+        exit 1
+       fi
+       status_index="`curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s | wc -l`"
+       status_index_green="`curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s | grep "green" | wc -l`"
+       if [[ $status_index_green -eq $status_index ]]; then
+        curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s
+       else
+        curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s
+        exit 1
+       fi
+
+
+    - name: Check Wazuh indexer nodes
+      run: |
+       nodes="`curl -XGET "https://0.0.0.0:9200/_cat/nodes" -u admin:SecretPassword -k -s | grep -E "indexer" | wc -l`"
+       if [[ $nodes -eq 1 ]]; then
+        echo "Wazuh indexer nodes: ${nodes}"
+       else
+        echo "Wazuh indexer nodes: ${nodes}"
+        exit 1
+       fi
+
+    - name: Check documents into wazuh-alerts index
+      run: |
+       sleep 120
+       docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"`"
+       if [[ $docs -gt 0 ]]; then
+        echo "wazuh-alerts index documents: ${docs}"
+       else
+        echo "wazuh-alerts index documents: ${docs}"
+        exit 1
+       fi
+
+    - name: Check Wazuh templates
+      run: |
+       qty_templates="`curl -XGET "https://0.0.0.0:9200/_cat/templates" -u admin:SecretPassword -k -s | grep -P "wazuh|wazuh-agent|wazuh-statistics" | wc -l`"
+       templates="`curl -XGET "https://0.0.0.0:9200/_cat/templates" -u admin:SecretPassword -k -s | grep -P "wazuh|wazuh-agent|wazuh-statistics"`"
+       if [[ $qty_templates -gt 3 ]]; then
+        echo "wazuh templates:"
+        echo "${templates}"
+       else
+        echo "wazuh templates:"
+        echo "${templates}"
+        exit 1
+       fi
+
+    - name: Check Wazuh manager start
+      run: |
+        services="`curl -k -s -X GET "https://0.0.0.0:55000/manager/status?pretty=true" -H  "Authorization: Bearer ${{env.TOKEN}}" | jq -r .data.affected_items | grep running | wc -l`"
+        if [[ $services -gt 9 ]]; then
+          echo "Wazuh Manager Services: ${services}"
+          echo "OK"
+        else
+          echo "Wazuh indexer nodes: ${nodes}"
+          curl -k -X GET "https://0.0.0.0:55000/manager/status?pretty=true" -H  "Authorization: Bearer ${{env.TOKEN}}" | jq -r .data.affected_items
+          exit 1
+        fi
+      env:
+        TOKEN: $(curl -s -u wazuh-wui:MyS3cr37P450r.*- -k -X GET "https://0.0.0.0:55000/security/user/authenticate?raw=true")
+
+    - name: Check filebeat output
+      run: ./.github/single-node-filebeat-check.sh
+
+    - name: Check Wazuh dashboard service URL
+      run: |
+       status=$(curl -XGET --silent  https://0.0.0.0:443/app/status -k -u admin:SecretPassword -I -s | grep -E "^HTTP" | awk  '{print $2}')
+       if [[ $status -eq 200 ]]; then
+        echo "Wazuh dashboard status: ${status}"
+       else
+        echo "Wazuh dashboard status: ${status}"
+        exit 1
+       fi
+
+    - name: Modify Docker endpoint into Wazuh agent docker-compose.yml file
+      run: sed -i "s/<WAZUH_MANAGER_IP>/$(ip addr show docker0 | grep 'inet ' | awk '{print $2}' | cut -d'/' -f1)/g" wazuh-agent/docker-compose.yml
+
+    - name: Start Wazuh agent
+      run: docker-compose -f wazuh-agent/docker-compose.yml up -d
+
+    - name: Check Wazuh agent enrollment
+      run: |
+        sleep 20
+        curl -k -s -X GET "https://localhost:55000/agents?pretty=true" -H  "Authorization: Bearer ${{env.TOKEN}}"
+      env:
+        TOKEN: $(curl -s -u wazuh-wui:MyS3cr37P450r.*- -k -X GET "https://0.0.0.0:55000/security/user/authenticate?raw=true")
+
+    - name: Check errors in ossec.log for Wazuh manager
+      run: ./.github/single-node-log-check.sh
+
+  check-multi-node:
+    runs-on: ubuntu-22.04
+    needs: build-docker-images
+    steps:
+
+    - name: Check out code
+      uses: actions/checkout@v4
+
+    - name: Create enviroment variables
+      run: cat .env > $GITHUB_ENV
+
+    - name: free disk space
+      uses: ./.github/free-disk-space
+
+    - name: Retrieve saved Wazuh dashboard Docker image
+      uses: actions/download-artifact@v4
+      with:
+        name: docker-artifact-dashboard
+
+    - name: Retrieve saved Wazuh manager Docker image
+      uses: actions/download-artifact@v4
+      with:
+        name: docker-artifact-manager
+
+    - name: Retrieve saved Wazuh indexer Docker image
+      uses: actions/download-artifact@v4
+      with:
+        name: docker-artifact-indexer
+
+    - name: Retrieve saved Wazuh agent Docker image
+      uses: actions/download-artifact@v4
+      with:
+        name: docker-artifact-agent
+    - name: Retrieve saved Wazuh Cert Tool Docker image
+      uses: actions/download-artifact@v3
+      with:
+        name: docker-artifact-cert-tool
+
+    - name: Docker load
+      run: |
+        docker load --input ./wazuh-indexer.tar
+        docker load --input ./wazuh-dashboard.tar
+        docker load --input ./wazuh-agent.tar
+        rm -rf wazuh-manager.tar wazuh-indexer.tar wazuh-dashboard.tar wazuh-agent.tar
+
+    - name: Create multi node certficates
+      run: docker compose -f multi-node/generate-certs.yml run --rm generator
+        docker load --input ./wazuh-manager.tar
+        docker load --input ./wazuh-cert-tool.tar
+        rm -rf wazuh-manager.tar wazuh-indexer.tar wazuh-dashboard.tar wazuh-cert-tool.tar
+
+    - name: Create multi node certficates
+      run: docker-compose -f multi-node/generate-certs.yml run --rm generator
+
+    - name: Start multi node stack
+      run: docker compose -f multi-node/docker-compose.yml up -d
+
+    - name: Check Wazuh indexer start
+      run: |
+       until [[ `curl -XGET "https://0.0.0.0:9200/_cluster/health" -u admin:SecretPassword -k -s | grep green | wc -l`  -eq 1 ]]
+       do
+         echo 'Waiting for Wazuh indexer start'
+         free -m
+         df -h
+         sleep 120
+       done
+       status_green="`curl -XGET "https://0.0.0.0:9200/_cluster/health" -u admin:SecretPassword -k -s | grep green | wc -l`"
+       if [[ $status_green -eq 1 ]]; then
+        curl -XGET "https://0.0.0.0:9200/_cluster/health" -u admin:SecretPassword -k -s
+       else
+        curl -XGET "https://0.0.0.0:9200/_cluster/health" -u admin:SecretPassword -k -s
+        exit 1
+       fi
+       status_index="`curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s | wc -l`"
+       status_index_green="`curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s | grep -E "green" | wc -l`"
+       if [[ $status_index_green -eq $status_index ]]; then
+        curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s
+       else
+        curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s
+        exit 1
+       fi
+
+    - name: Check Wazuh indexer nodes
+      run: |
+       nodes="`curl -XGET "https://0.0.0.0:9200/_cat/nodes" -u admin:SecretPassword -k -s | grep -E "indexer" | wc -l`"
+       if [[ $nodes -eq 3 ]]; then
+        echo "Wazuh indexer nodes: ${nodes}"
+       else
+        echo "Wazuh indexer nodes: ${nodes}"
+        exit 1
+       fi
+
+    - name: Check documents into wazuh-alerts index
+      run: |
+       until [[ $(``curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"``)  -gt 0 ]]
+       do
+         echo 'Waiting for Wazuh indexer events'
+         free -m
+         df -h
+         sleep 10
+       done
+       docs="`curl -XGET "https://0.0.0.0:9200/wazuh-alerts*/_count" -u admin:SecretPassword -k -s | jq -r ".count"`"
+       if [[ $docs -gt 0 ]]; then
+        echo "wazuh-alerts index documents: ${docs}"
+       else
+        echo "wazuh-alerts index documents: ${docs}"
+        exit 1
+       fi
+
+    - name: Check Wazuh templates
+      run: |
+       qty_templates="`curl -XGET "https://0.0.0.0:9200/_cat/templates" -u admin:SecretPassword -k -s | grep "wazuh" | wc -l`"
+       templates="`curl -XGET "https://0.0.0.0:9200/_cat/templates" -u admin:SecretPassword -k -s | grep "wazuh"`"
+       if [[ $qty_templates -gt 3 ]]; then
+        echo "wazuh templates:"
+        echo "${templates}"
+       else
+        echo "wazuh templates:"
+        echo "${templates}"
+        exit 1
+       fi
+
+    - name: Check Wazuh manager start
+      run: |
+        services="`curl -k -s -X GET "https://0.0.0.0:55000/manager/status?pretty=true" -H  "Authorization: Bearer ${{env.TOKEN}}" | jq -r .data.affected_items | grep running | wc -l`"
+        if [[ $services -gt 10 ]]; then
+          echo "Wazuh Manager Services: ${services}"
+          echo "OK"
+        else
+          echo "Wazuh indexer nodes: ${nodes}"
+          curl -k -s -X GET "https://0.0.0.0:55000/manager/status?pretty=true" -H  "Authorization: Bearer ${{env.TOKEN}}" | jq -r .data.affected_items
+          exit 1
+        fi
+        nodes=$(curl -k -s -X GET "https://0.0.0.0:55000/cluster/nodes" -H "Authorization: Bearer ${{env.TOKEN}}" | jq -r ".data.affected_items[].name" | wc -l)
+        if [[ $nodes -eq 2 ]]; then
+         echo "Wazuh manager nodes: ${nodes}"
+        else
+         echo "Wazuh manager nodes: ${nodes}"
+         exit 1
+        fi
+      env:
+        TOKEN: $(curl -s -u wazuh-wui:MyS3cr37P450r.*- -k -X GET "https://0.0.0.0:55000/security/user/authenticate?raw=true")
+
+    - name: Check filebeat output
+      run: ./.github/multi-node-filebeat-check.sh
+
+    - name: Check Wazuh dashboard service URL
+      run: |
+       status=$(curl -XGET --silent  https://0.0.0.0:443/app/status -k -u admin:SecretPassword -I | grep -E "^HTTP" | awk  '{print $2}')
+       if [[ $status -eq 200 ]]; then
+        echo "Wazuh dashboard status: ${status}"
+       else
+        echo "Wazuh dashboard status: ${status}"
+        exit 1
+       fi
+
+    - name: Modify Docker endpoint into Wazuh agent docker-compose.yml file
+      run: sed -i "s/<WAZUH_MANAGER_IP>/$(ip addr show docker0 | grep 'inet ' | awk '{print $2}' | cut -d'/' -f1)/g" wazuh-agent/docker-compose.yml
+
+    - name: Start Wazuh agent
+      run: docker-compose -f wazuh-agent/docker-compose.yml up -d
+
+    - name: Check Wazuh agent enrollment
+      run: |
+        sleep 20
+        curl -k -s -X GET "https://localhost:55000/agents?pretty=true" -H  "Authorization: Bearer ${{env.TOKEN}}"
+      env:
+        TOKEN: $(curl -s -u wazuh-wui:MyS3cr37P450r.*- -k -X GET "https://0.0.0.0:55000/security/user/authenticate?raw=true")
+
+    - name: Check errors in ossec.log for Wazuh manager
+      run: ./.github/multi-node-log-check.sh

.github/workflows/trivy-dashboard.yml

@@ -0,0 +1,76 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Trivy scan Wazuh dashboard
+
+on:
+  release:
+    types:
+    - published
+  pull_request:
+    branches:
+      - main
+  schedule:
+    - cron: '34 2 * * 1'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    permissions:
+      contents: read # for actions/checkout to fetch code
+      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
+
+    name: Build images and upload Trivy results
+    runs-on: "ubuntu-22.04"
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Installing dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y jq
+
+      - name: Checkout latest tag
+        run: |
+          latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name')
+          git fetch origin
+          git checkout $latest
+
+      - name: Build Wazuh images
+        run: build-docker-images/build-images.sh
+
+      - name: Create enviroment variables
+        run: |
+          cat .env > $GITHUB_ENV
+          echo "GITHUB_REF_NAME="${GITHUB_REF_NAME%/*} >> $GITHUB_ENV
+
+      - name: Run Trivy vulnerability scanner for Wazuh dashboard
+        uses: aquasecurity/trivy-action@2a2157eb22c08c9a1fac99263430307b8d1bc7a2
+        with:
+          image-ref: 'wazuh/wazuh-dashboard:${{env.WAZUH_IMAGE_VERSION}}'
+          format: 'template'
+          template: '@/contrib/sarif.tpl'
+          output: 'trivy-results-dashboard.sarif'
+          severity: 'LOW,MEDIUM,CRITICAL,HIGH'
+
+      - name: Upload Trivy scan results to GitHub Security tab
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: 'trivy-results-dashboard.sarif'
+
+      - name: Slack notification
+        uses: rtCamp/action-slack-notify@v2
+        env:
+          SLACK_CHANNEL: cicd-monitoring
+          SLACK_COLOR: ${{ job.status }} # or a specific color like 'good' or '#ff00ff'
+          #SLACK_ICON: https://github.com/rtCamp.png?size=48
+          SLACK_MESSAGE: "Check the results: https://github.com/wazuh/wazuh-docker/security/code-scanning?query=is%3Aopen+branch%3A${{ env.GITHUB_REF_NAME }}"
+          SLACK_TITLE: Wazuh docker Trivy vulnerability scan finished.
+          SLACK_USERNAME: github_actions
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

.github/workflows/trivy-indexer.yml

@@ -0,0 +1,76 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Trivy scan Wazuh indexer
+
+on:
+  release:
+    types:
+    - published
+  pull_request:
+    branches:
+      - main
+  schedule:
+    - cron: '34 2 * * 1'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    permissions:
+      contents: read # for actions/checkout to fetch code
+      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
+
+    name: Build images and upload Trivy results
+    runs-on: "ubuntu-22.04"
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Installing dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y jq
+
+      - name: Checkout latest tag
+        run: |
+          latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name')
+          git fetch origin
+          git checkout $latest
+
+      - name: Build Wazuh images
+        run: build-docker-images/build-images.sh
+
+      - name: Create enviroment variables
+        run: |
+          cat .env > $GITHUB_ENV
+          echo "GITHUB_REF_NAME="${GITHUB_REF_NAME%/*} >> $GITHUB_ENV
+
+      - name: Run Trivy vulnerability scanner for Wazuh indexer
+        uses: aquasecurity/trivy-action@2a2157eb22c08c9a1fac99263430307b8d1bc7a2
+        with:
+          image-ref: 'wazuh/wazuh-indexer:${{env.WAZUH_IMAGE_VERSION}}'
+          format: 'template'
+          template: '@/contrib/sarif.tpl'
+          output: 'trivy-results-indexer.sarif'
+          severity: 'LOW,MEDIUM,CRITICAL,HIGH'
+
+      - name: Upload Trivy scan results to GitHub Security tab
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: 'trivy-results-indexer.sarif'
+
+      - name: Slack notification
+        uses: rtCamp/action-slack-notify@v2
+        env:
+          SLACK_CHANNEL: cicd-monitoring
+          SLACK_COLOR: ${{ job.status }} # or a specific color like 'good' or '#ff00ff'
+          #SLACK_ICON: https://github.com/rtCamp.png?size=48
+          SLACK_MESSAGE: "Check the results: https://github.com/wazuh/wazuh-docker/security/code-scanning?query=is%3Aopen+branch%3A${{ env.GITHUB_REF_NAME }}"
+          SLACK_TITLE: Wazuh docker Trivy vulnerability scan finished.
+          SLACK_USERNAME: github_actions
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

.github/workflows/trivy-manager.yml

@@ -0,0 +1,76 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Trivy scan Wazuh manager
+
+on:
+  release:
+    types:
+    - published
+  pull_request:
+    branches:
+      - main
+  schedule:
+    - cron: '34 2 * * 1'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    permissions:
+      contents: read # for actions/checkout to fetch code
+      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
+
+    name: Build images and upload Trivy results
+    runs-on: "ubuntu-22.04"
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Installing dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y jq
+
+      - name: Checkout latest tag
+        run: |
+          latest=$(curl -s "https://api.github.com/repos/wazuh/wazuh-docker/releases/latest" | jq -r '.tag_name')
+          git fetch origin
+          git checkout $latest
+
+      - name: Build Wazuh images
+        run: build-docker-images/build-images.sh
+
+      - name: Create enviroment variables
+        run: |
+          cat .env > $GITHUB_ENV
+          echo "GITHUB_REF_NAME="${GITHUB_REF_NAME%/*} >> $GITHUB_ENV
+
+      - name: Run Trivy vulnerability scanner for Wazuh manager
+        uses: aquasecurity/trivy-action@2a2157eb22c08c9a1fac99263430307b8d1bc7a2
+        with:
+          image-ref: 'wazuh/wazuh-manager:${{env.WAZUH_IMAGE_VERSION}}'
+          format: 'template'
+          template: '@/contrib/sarif.tpl'
+          output: 'trivy-results-manager.sarif'
+          severity: 'LOW,MEDIUM,CRITICAL,HIGH'
+
+      - name: Upload Trivy scan results to GitHub Security tab
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: 'trivy-results-manager.sarif'
+
+      - name: Slack notification
+        uses: rtCamp/action-slack-notify@v2
+        env:
+          SLACK_CHANNEL: cicd-monitoring
+          SLACK_COLOR: ${{ job.status }} # or a specific color like 'good' or '#ff00ff'
+          #SLACK_ICON: https://github.com/rtCamp.png?size=48
+          SLACK_MESSAGE: "Check the results: https://github.com/wazuh/wazuh-docker/security/code-scanning?query=is%3Aopen+branch%3A${{ env.GITHUB_REF_NAME }}"
+          SLACK_TITLE: Wazuh docker Trivy vulnerability scan finished.
+          SLACK_USERNAME: github_actions
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

.gitignore

@@ -1,18 +1,5 @@
-*.log
-build-docker-images/artifact_urls.yaml
-build-docker-images/artifacts_env.txt
-single-node/wazuh-certificates
-single-node/wazuh-certificates/*
-single-node/wazuh-certificates-tool.log
-single-node/wazuh-certs-tool*.sh
-single-node/config*.yml
-single-node/config
-multi-node/wazuh-certificates
-multi-node/wazuh-certificates/*
-multi-node/wazuh-certificates-tool.log
-multi-node/wazuh-certs-tool*.sh
-multi-node/config*.yml
-multi-node/config/*/certs
-
-# Documentation
-docs/book/
+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
+*.log

CHANGELOG.md

@@ -1,78 +1,29 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [6.0.0]
+
+### Added
+
+- none
+
+### Changed
+
+- None
+
+### Fixed
+
+- None
+
+### Deleted
+
+- None
+
 ## [5.0.0]
 
 ### Added
 
-- Add revert option into bumper workflow ([#2330](https://github.com/wazuh/wazuh-docker/pull/2330))
-- Add checks for artifact_urls.yaml download ([#2315](https://github.com/wazuh/wazuh-docker/pull/2315))
-- Add set_as_main option ([#2293](https://github.com/wazuh/wazuh-docker/pull/2293))
-
-### Changed
-
-- Forbid pr_check workflow execution in draft PRs ([#2399](https://github.com/wazuh/wazuh-docker/pull/2399))
-- Unification of user UID and GID ([#2393](https://github.com/wazuh/wazuh-docker/pull/2393))
-- Add Wazuh indexer engine start on entrypoint ([#2390](https://github.com/wazuh/wazuh-docker/pull/2390))
-- Image build process update ([#2358](https://github.com/wazuh/wazuh-docker/pull/2358))
-- Add new path on artifact_urls file ([#2344](https://github.com/wazuh/wazuh-docker/pull/2344))
-- Presigned URLs generation enhancement ([#2346](https://github.com/wazuh/wazuh-docker/pull/2346))
-- Adapt bumper workflows to change main branch ([#2294](https://github.com/wazuh/wazuh-docker/pull/2294))
-- Delete all API user and password references and Wazuh agent references ([#2289](https://github.com/wazuh/wazuh-docker/pull/2289))
-- Create certificate directory with default user and group ([#2287](https://github.com/wazuh/wazuh-docker/pull/2287))
-- Standarize Artifact URL keys ([#2286](https://github.com/wazuh/wazuh-docker/pull/2286))
-- Certificates configuration script. ([#2285](https://github.com/wazuh/wazuh-docker/pull/2285))
-- Modify artifact URLs file name. ([#2266](https://github.com/wazuh/wazuh-docker/pull/2266))
-- Use URL signing script to generate presigned internal package URLs. ([#2259](https://github.com/wazuh/wazuh-docker/pull/2259))
-- Updated wazuh-docker documentation config and tooling versions to meet new standards. ([#2264](https://github.com/wazuh/wazuh-docker/pull/2264))
-- 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))
-- Fix set_correct_permOwner function ([#2238](https://github.com/wazuh/wazuh-docker/pull/2238))
-- Add workflow dispatch option ([#2231](https://github.com/wazuh/wazuh-docker/pull/2231))
-- Change Wazuh manager certificates names ([#2223](https://github.com/wazuh/wazuh-docker/pull/2223))
-- Move index documents test ([#2221](https://github.com/wazuh/wazuh-docker/pull/2221))
-- Separate Agent/Manager - Docker - Adapt image build process ([#2220](https://github.com/wazuh/wazuh-docker/pull/2220))
-- Remove revision input ([#2217](https://github.com/wazuh/wazuh-docker/pull/2217))
-- Improve build script and workflow component revisions handling ([#2212](https://github.com/wazuh/wazuh-docker/pull/2212))
-- Add missing documentation sections in the repository ([#2215](https://github.com/wazuh/wazuh-docker/pull/2215))
-- Add Wazuh version and revision into wazuh-certs-tool and config file ([#2195](https://github.com/wazuh/wazuh-docker/pull/2195))
-- Improve S3 artifact URLs handling ([#2183](https://github.com/wazuh/wazuh-docker/pull/2183))
-- Allow building separate targets ([#2177](https://github.com/wazuh/wazuh-docker/pull/2177))
-- Add developement option when tag name is only version without stage ([#2179](https://github.com/wazuh/wazuh-docker/pull/2179))
-- Add IMAGE_TAG stage reference ([#2178](https://github.com/wazuh/wazuh-docker/pull/2178))
-- Delete Wazuh agent configuration files ([#2173](https://github.com/wazuh/wazuh-docker/pull/2173))
-- Modify run_as parameter value - main ([#2158](https://github.com/wazuh/wazuh-docker/pull/2158))
-- Change macOS and Windows deployment documentation ([#2150](https://github.com/wazuh/wazuh-docker/issues/2150))
-- Modify docker build image process ([#2131](https://github.com/wazuh/wazuh-docker/issues/2131))
-- Update documentation for Wazuh Docker image builder and workflow usage ([#2136](https://github.com/wazuh/wazuh-docker/issues/2136))
-- Configure deployment with environment variables ([#2081](https://github.com/wazuh/wazuh-docker/pull/2081))
-- Modify Wazuh components install method ([#2058](https://github.com/wazuh/wazuh-docker/pull/2058))
-- Image builder Workflow Rebuild ([#2054](https://github.com/wazuh/wazuh-docker/pull/2054))
-- Wazuh server clean-up ([#2030](https://github.com/wazuh/wazuh-docker/pull/2030))
-- Fix OpenSearch deprecated settings ([#1899](https://github.com/wazuh/wazuh-docker/pull/1899))
-
-### Fixed
-
-- Adapt Wazuh manager healthcheck with local binaries ([#2422](https://github.com/wazuh/wazuh-docker/pull/2422))
-- Delete setcap command on deprecated file ([#2345](https://github.com/wazuh/wazuh-docker/pull/2345))
-- Modify the choice of a correct tag ([#2313](https://github.com/wazuh/wazuh-docker/pull/2313))
-- Artifact URL download fix ([#2306](https://github.com/wazuh/wazuh-docker/pull/2306))
-- Change API query method. ([#2275](https://github.com/wazuh/wazuh-docker/pull/2275))
-- Change Wazuh manager Healthcheck. ([#2272](https://github.com/wazuh/wazuh-docker/pull/2272))
-- Delete WAZUH_AGENT_GROUP variable. ([#2263](https://github.com/wazuh/wazuh-docker/pull/2263))
-- Delete etc/lists references ([#2129](https://github.com/wazuh/wazuh-docker/pull/2129))
-
-### Deleted
-
-- None
-
-## [4.14.7]
-
-### Added
-
-- None
+- none
 
 ### Changed
 
@@ -86,7 +37,7 @@ All notable changes to this project will be documented in this file.
 
 - None
 
-## [4.14.6]
+## [4.10.2]
 
 ### Added
 
@@ -98,106 +49,6 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
-- Changed update_user function from wazuh.security to wazuh.rbac.orm module ([#2406](https://github.com/wazuh/wazuh-docker/pull/2406))
-- GH issue notification fix ([#2312](https://github.com/wazuh/wazuh-docker/pull/2312))
-
-### Deleted
-
-- None
-
-## [4.14.5]
-
-### Added
-
-- None
-
-### Changed
-
-- Updated GitHub actions version for wazuh-docker workflows. ([#2290](https://github.com/wazuh/wazuh-docker/pull/2290))
-
-### Fixed
-
-- Fix WAZUH_AGENT_GROUP variable ([#2262](https://github.com/wazuh/wazuh-docker/pull/2262))
-- Fix bumper script early exit ([#2261](https://github.com/wazuh/wazuh-docker/pull/2261))
-
-### Deleted
-
-- None
-
-## [4.14.4]
-
-### Added
-
-- None
-
-### Changed
-
-- Backport from 5.0.0: Allow building separate targets #2177 ([#2184](https://github.com/wazuh/wazuh-docker/pull/2184))
-
-### Fixed
-
-- INDEXER_URL substitution fix ([#2226](https://github.com/wazuh/wazuh-docker/pull/2226))
-
-### Deleted
-
-- None
-
-## [4.14.3]
-
-### Added
-
-- Update indexer-certs-gen README.md for clarity on procedure ([#2132](https://github.com/wazuh/wazuh-docker/pull/2132))
-- Update certs generator image version to 0.0.4 ([#2130](https://github.com/wazuh/wazuh-docker/pull/2130))
-
-### Changed
-
-- Add IMAGE_TAG stage reference ([#2176](https://github.com/wazuh/wazuh-docker/pull/2176))
-- Modify run_as parameter value - v4.14.3 ([#2157](https://github.com/wazuh/wazuh-docker/pull/2157))
-- Adapt Wazuh Agent Dockerfile for multi-architecture support ([#2149](https://github.com/wazuh/wazuh-docker/pull/2149))
-- Agent group parameter added ([#2127](https://github.com/wazuh/wazuh-docker/pull/2127))
-- Adapt to multi architecture build ([#2120](https://github.com/wazuh/wazuh-docker/pull/2120))
-
-### Fixed
-
-- None
-
-### Deleted
-
-- None
-
-## [4.14.2]
-
-### Added
-
-- Code improvements for 4.14.2 ([#2090](https://github.com/wazuh/wazuh-docker/pull/2090))
-- Artifactory vulnerabilities notification ([#2078](https://github.com/wazuh/wazuh-docker/pull/2078))
-
-### Changed
-
-- Filebeat module version update ([#2115](https://github.com/wazuh/wazuh-docker/pull/2115))
-- The location of the remove command for the wazuh-authd certificates has been changed. ([#2094](https://github.com/wazuh/wazuh-docker/pull/2094))
-- Removed sslmanager key from the docker manager image to 4.14.2. ([#2093](https://github.com/wazuh/wazuh-docker/pull/2093))
-
-### Fixed
-
-- Add missing SSL ciphers and protocols and remove outdated ports parameters from opensearch.yml template ([#2104](https://github.com/wazuh/wazuh-docker/pull/2104))
-
-### Deleted
-
-- None
-
-## [4.14.1]
-
-### Added
-
-- None
-
-### Changed
-
-- Wazuh cert tool generator improvements ([#2027](https://github.com/wazuh/wazuh-docker/pull/2027))
-
-### Fixed
-
 - None
 
 ### Deleted
@@ -212,19 +63,11 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
-- Change filebeat install method ([#2020](https://github.com/wazuh/wazuh-docker/pull/2020))
-- Remove dashboard chat setting ([#2021](https://github.com/wazuh/wazuh-docker/pull/2021))
-- Rollback data source setting ([#1999](https://github.com/wazuh/wazuh-docker/pull/1999))
-- Dashboard settings added ([#1998](https://github.com/wazuh/wazuh-docker/pull/1998))
-- Add filebeat config file in the PERMANENT_DATA_EXCP list ([#1898](https://github.com/wazuh/wazuh-docker/pull/1898))
 - Change validation of existing certs tool in S3 buckets ([#1880](https://github.com/wazuh/wazuh-docker/pull/1880))
 
 ### Fixed
 
-- Change Wazuh indexer directory owner ([#2029](https://github.com/wazuh/wazuh-docker/pull/2029))
-- Double the amount of space consumed in Wazuh Indexer ([#1953](https://github.com/wazuh/wazuh-docker/pull/1953))
-- Fix config directory for opensearch_security plugin work ([#1951](https://github.com/wazuh/wazuh-docker/pull/1951))
-- Update Dockerfile to copy opensearch-security files ([#1928](https://github.com/wazuh/wazuh-docker/pull/1928))
+- None
 
 ### Deleted
 
@@ -252,9 +95,6 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 
-- Add opensearch_dashboard.yml parameters. ([#1985](https://github.com/wazuh/wazuh-docker/pull/1985))
-- Set right ownership for malicious-ioc files on container start ([#1926](https://github.com/wazuh/wazuh-docker/pull/1926))
-- Delete services statement in wazuh agent deployment. ([#1925](https://github.com/wazuh/wazuh-docker/pull/1925))
 - Add permanent_data exceptions. ([#1890](https://github.com/wazuh/wazuh-docker/pull/1890))
 - Integrate bumper script via GitHub action. ([#1863](https://github.com/wazuh/wazuh-docker/pull/1863))
 - Add missing malicious-ioc ruleset lists ([#1870](https://github.com/wazuh/wazuh-docker/pull/1870))
@@ -266,12 +106,11 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
-- Syscollector configuration change ([#1994](https://github.com/wazuh/wazuh-docker/pull/1994))
 - Modify wazuh-keystore use ([#1750](https://github.com/wazuh/wazuh-docker/pull/1750)) \- (wazuh-keystore)
 
 ### Fixed
 
-- Add wazuh-template.json into permanent data exception ([#1968](https://github.com/wazuh/wazuh-docker/pull/1968))
+- None
 
 ### Deleted
 

README.md

@@ -5,7 +5,7 @@
 
 ## Description
 
-The `wazuh/wazuh-docker` repository provides resources to deploy the Wazuh cybersecurity platform using Docker containers. This setup enables easy installation and orchestration of the full Wazuh stack, including the Wazuh manager, dashboard (based on OpenSearch Dashboards), and OpenSearch for indexing and search.
+The `wazuh/wazuh-docker` repository provides resources to deploy the Wazuh cybersecurity platform using Docker containers. This setup enables easy installation and orchestration of the full Wazuh stack, including the Wazuh server, dashboard (based on OpenSearch Dashboards), and OpenSearch for indexing and search.
 
 ## Capabilities
 
@@ -18,7 +18,7 @@ The `wazuh/wazuh-docker` repository provides resources to deploy the Wazuh cyber
 ## Branch Convention
 
 - `main`: Developing and testing of new features.
-- `X.Y.Z`: Version-specific branches (e.g., `5.0.0`, `4.14.0`, etc.).
+- `X.Y.Z`: Version-specific branches (e.g., `6.0.0`, `4.14.0`, etc.).
 
 ## Documentation
 

VERSION.json

@@ -1,4 +1,4 @@
 {
-    "version": "5.0.0",
-    "stage": "beta2"
-}
+    "version": "6.0.0",
+    "stage": "alpha0"
+}

build-docker-images/README.md

@@ -0,0 +1,32 @@
+# Wazuh Docker Image Builder
+
+The creation of the images for the Wazuh stack deployment in Docker is done with the build-images.yml script
+
+To execute the process, the following must be executed in the root of the wazuh-docker repository:
+
+```
+$ build-docker-images/build-images.sh
+```
+
+This script initializes the environment variables needed to build each of the images.
+
+The script allows you to build images from other versions of Wazuh, to do this you must use the -v or --version argument:
+
+```
+$ build-docker-images/build-images.sh -v 6.0.0
+```
+
+To get all the available script options use the -h or --help option:
+
+```
+$ build-docker-images/build-images.sh -h
+
+Usage: build-docker-images/build-images.sh [OPTIONS]
+
+    -d, --dev <ref>              [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default.
+    -f, --filebeat-module <ref>  [Optional] Set Filebeat module version. By default 0.4.
+    -r, --revision <rev>         [Optional] Package revision. By default 1
+    -v, --version <ver>          [Optional] Set the Wazuh version should be builded. By default, 6.0.0.
+    -h, --help                   Show this help.
+
+```

build-docker-images/build-images.sh

@@ -1,4 +1,8 @@
-#!/bin/bash
+WAZUH_IMAGE_VERSION=6.0.0
+WAZUH_VERSION=$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')
+WAZUH_TAG_REVISION=1
+WAZUH_CURRENT_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')
+IMAGE_VERSION=${WAZUH_IMAGE_VERSION}
 
 # Wazuh package generator
 # Copyright (C) 2023, Wazuh Inc.
@@ -8,16 +12,10 @@
 # License (version 2) as published by the FSF - Free Software
 # Foundation.
 
-WAZUH_IMAGE_VERSION=5.0.0
-IMAGE_TAG=5.0.0
-WAZUH_CURRENT_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')
-IMAGE_VERSION=${WAZUH_IMAGE_VERSION}
-WAZUH_REGISTRY=docker.io
-
-WAZUH_IMAGE_VERSION="5.0.0"
+WAZUH_IMAGE_VERSION="6.0.0"
+WAZUH_TAG_REVISION="1"
 WAZUH_DEV_STAGE=""
-WAZUH_COMPONENTS_COMMIT_LIST=''
-IS_DEV_BUILD=""
+FILEBEAT_MODULE_VERSION="0.4"
 
 # -----------------------------------------------------------------------------
 
@@ -38,206 +36,37 @@ ctrl_c() {
 
 build() {
 
-    # WAZUH_MINOR_VERSION: Extracts major and minor version only (e.g., 5.0.0 -> 5.0)
-    WAZUH_MINOR_VERSION="${WAZUH_IMAGE_VERSION%.*}"
-    # WAZUH_MAJOR_VERSION: Extracts major version only (e.g., 5.0.0 -> 5)
-    WAZUH_MAJOR_VERSION="${WAZUH_IMAGE_VERSION%%.*}"
-    # WAZUH_STAGE: Extract the 'stage' (e.g., alpha0, beta1, rc2) from the local JSON metadata file.
-    # Note: This is primarily used for pre-release package naming.
-    WAZUH_STAGE=$(jq -r '.stage' ../VERSION.json)
-    # ARTIFACT_URLS_FILE: The name of the artifact URLs file.
-    ARTIFACT_URLS_FILE="artifact_urls.yaml"
-    # ARTIFACT_URLS_DIR: The name of the artifact URLs directory.
-    ARTIFACT_URLS_DIR="artifact-urls"
+    WAZUH_VERSION="$(echo $WAZUH_IMAGE_VERSION | sed -e 's/\.//g')"
+    FILEBEAT_TEMPLATE_BRANCH="${WAZUH_IMAGE_VERSION}"
+    WAZUH_FILEBEAT_MODULE="wazuh-filebeat-${FILEBEAT_MODULE_VERSION}.tar.gz"
+    WAZUH_UI_REVISION="${WAZUH_TAG_REVISION}"
 
-    # Check if the artifact file already exists to prevent redundant downloads
-    if [[ -f "$ARTIFACT_URLS_FILE" ]]; then
-        echo "$ARTIFACT_URLS_FILE exists. Using existing file."
-    else
-        # GitHub URL for exact Release Tag lookup
-        TAG="v${WAZUH_IMAGE_VERSION}"
-        REPO="wazuh/wazuh-docker"
-        GH_URL="https://api.github.com/repos/${REPO}/releases/tags/${TAG}"
-
-        # Fetch the HTTP status code to determine release environment.
-        # Using -L to follow redirects (GitHub may return 301/302 for some endpoints).
-        HTTP_STATUS=$(curl -sL -o /dev/null -w "%{http_code}" "$GH_URL")
-
-        if [ "$HTTP_STATUS" -eq 200 ]; then
-            # CASE: Production (Tag and Release exist)
-            echo "Release $TAG found. Setting Production environment."
-            ARTIFACT_URLS_DOWNLOAD="artifact_urls_${WAZUH_IMAGE_VERSION}.yaml"
-            PACKAGE_URL="packages.wazuh.com"
-            RELEASE_STAGE="production"
-        elif [ "$HTTP_STATUS" -eq 403 ]; then
-            # CASE: GitHub API rate limit hit — fall back to pre-release to avoid
-            # incorrectly skipping staging artifacts.
-            echo "Warning: GitHub API rate limit reached (403). Assuming pre-release environment." >&2
-            PACKAGE_URL="packages-staging.xdrsiem.wazuh.info"
-            RELEASE_STAGE="pre-release"
-            if [ -n "$WAZUH_STAGE" ] && [ "$WAZUH_STAGE" != "null" ]; then
-                ARTIFACT_URLS_DOWNLOAD="artifact_urls_${WAZUH_IMAGE_VERSION}-${WAZUH_STAGE}.yaml"
-            else
-                ARTIFACT_URLS_DOWNLOAD="artifact_urls_${WAZUH_IMAGE_VERSION}.yaml"
-            fi
-        else
-            # CASE: Pre-release/Staging (404 Not Found or any other non-200 status)
-            echo "Release $TAG not found (HTTP status: $HTTP_STATUS). Setting Pre-release environment."
-            PACKAGE_URL="packages-staging.xdrsiem.wazuh.info"
-            RELEASE_STAGE="pre-release"
-            if [ -n "$WAZUH_STAGE" ] && [ "$WAZUH_STAGE" != "null" ]; then
-                ARTIFACT_URLS_DOWNLOAD="artifact_urls_${WAZUH_IMAGE_VERSION}-${WAZUH_STAGE}.yaml"
-            else
-                ARTIFACT_URLS_DOWNLOAD="artifact_urls_${WAZUH_IMAGE_VERSION}.yaml"
-            fi
-        fi
-
-        # Final download using dynamic variables based on the release type.
-        # Pattern: server / stage / major_version.x / filename
-        FULL_URL="https://${PACKAGE_URL}/${RELEASE_STAGE}/${WAZUH_MAJOR_VERSION}.x/${ARTIFACT_URLS_DIR}/${ARTIFACT_URLS_DOWNLOAD}"
-        echo "Attempting to download: $FULL_URL"
-        curl -fsSL -o "$ARTIFACT_URLS_FILE" "$FULL_URL" || {
-            echo "Error: Failed to download artifact URLs from $FULL_URL" >&2
+    if  [ "${WAZUH_DEV_STAGE}" ];then
+        FILEBEAT_TEMPLATE_BRANCH="v${FILEBEAT_TEMPLATE_BRANCH}-${WAZUH_DEV_STAGE,,}"
+        if ! curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/${FILEBEAT_TEMPLATE_BRANCH}"; then
+            echo "The indicated branch does not exist in the wazuh/wazuh repository: ${FILEBEAT_TEMPLATE_BRANCH}"
             clean 1
-        }
-    fi
-
-    awk -F':' '!/^#/ && NF>1 {name=$1; val=substr($0,length(name)+3); gsub(/[-.]/,"_",name); print name "=\"" val "\""}' $ARTIFACT_URLS_FILE > artifacts_env.txt
-
-    # Set component commit references for development builds.
-    # Commits are only resolved (and later appended to the image tag) when --dev is
-    # explicitly passed. Production and stage builds (dev=false) never include a
-    # commit suffix even if -refs is provided. Manual local builds also omit it.
-    if [ -n "${IS_DEV_BUILD}" ]; then
-        if [ -z "${WAZUH_COMPONENTS_COMMIT_LIST}" ]; then
-            # Default to 'latest' for all components if no specific references are provided
-            INDEXER_COMMIT="latest"
-            MANAGER_COMMIT="latest"
-            DASHBOARD_COMMIT="latest"
-            AGENT_COMMIT="latest"
+        fi
+    else
+        if curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/v${FILEBEAT_TEMPLATE_BRANCH}"; then
+            FILEBEAT_TEMPLATE_BRANCH="v${FILEBEAT_TEMPLATE_BRANCH}"
+        elif curl --output /dev/null --silent --head --fail "https://github.com/wazuh/wazuh/tree/${FILEBEAT_TEMPLATE_BRANCH}"; then
+            FILEBEAT_TEMPLATE_BRANCH="${FILEBEAT_TEMPLATE_BRANCH}"
         else
-            if ! printf '%s' "${WAZUH_COMPONENTS_COMMIT_LIST}" \
-                | jq -e 'type=="array" and (all(.[]; type=="string"))' >/dev/null 2>&1; then
-                echo 'Error: --references must be a JSON array of strings, e.g. ["ref1","ref2","ref3","ref4"]' >&2
-                clean 1
-            fi
-
-            refs_count="$(printf '%s' "${WAZUH_COMPONENTS_COMMIT_LIST}" | jq -r 'length')"
-            if [ -z "${WAZUH_COMPONENT}" ]; then
-                # No specific component to be build: require exactly 4 items
-                if [ "${refs_count}" -ne 4 ]; then
-                    echo "Error: --references must contain exactly 4 items when no --component is specified." >&2
-                    clean 1
-                fi
-
-                # Set all component commits
-                INDEXER_COMMIT="$(printf '%s' "${WAZUH_COMPONENTS_COMMIT_LIST}" | jq -r '.[0]')"
-                MANAGER_COMMIT="$(printf '%s' "${WAZUH_COMPONENTS_COMMIT_LIST}" | jq -r '.[1]')"
-                DASHBOARD_COMMIT="$(printf '%s' "${WAZUH_COMPONENTS_COMMIT_LIST}" | jq -r '.[2]')"
-                AGENT_COMMIT="$(printf '%s' "${WAZUH_COMPONENTS_COMMIT_LIST}" | jq -r '.[3]')"
-            else
-                # Specific component to be build: allow 1 (component-only)
-                if [ "${refs_count}" -ne 1 ]; then
-                    echo "Error: --references must contain exactly 1 item when --component is specified." >&2
-                    clean 1
-                fi
-
-                # Set specific component commit
-                case "${WAZUH_COMPONENT}" in
-                    wazuh-indexer)
-                        INDEXER_COMMIT="$(printf '%s' "${WAZUH_COMPONENTS_COMMIT_LIST}" | jq -r '.[0]')"
-                        ;;
-                    wazuh-manager)
-                        MANAGER_COMMIT="$(printf '%s' "${WAZUH_COMPONENTS_COMMIT_LIST}" | jq -r '.[0]')"
-                        ;;
-                    wazuh-dashboard)
-                        DASHBOARD_COMMIT="$(printf '%s' "${WAZUH_COMPONENTS_COMMIT_LIST}" | jq -r '.[0]')"
-                        ;;
-                    wazuh-agent)
-                        AGENT_COMMIT="$(printf '%s' "${WAZUH_COMPONENTS_COMMIT_LIST}" | jq -r '.[0]')"
-                        ;;
-                    *)
-                        echo "Error: Unknown component '${WAZUH_COMPONENT}'" >&2
-                        clean 1
-                        ;;
-                esac
-            fi
+            echo "The indicated branch does not exist in the wazuh/wazuh repository: ${FILEBEAT_TEMPLATE_BRANCH}"
+            clean 1
         fi
     fi
 
+    echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > .env
+    echo WAZUH_IMAGE_VERSION=$WAZUH_IMAGE_VERSION >> .env
+    echo WAZUH_TAG_REVISION=$WAZUH_TAG_REVISION >> .env
+    echo FILEBEAT_TEMPLATE_BRANCH=$FILEBEAT_TEMPLATE_BRANCH >> .env
+    echo WAZUH_FILEBEAT_MODULE=$WAZUH_FILEBEAT_MODULE >> .env
+    echo WAZUH_UI_REVISION=$WAZUH_UI_REVISION >> .env
 
-    # Write the global .env file used by deployment compose files.
-    # IMAGE_TAG here reflects a non-dev, non-per-component tag for reference.
-    local base_tag="${WAZUH_IMAGE_VERSION}${WAZUH_DEV_STAGE:+-${WAZUH_DEV_STAGE,,}}"
-    echo WAZUH_VERSION=$WAZUH_IMAGE_VERSION > ../.env
-    echo WAZUH_IMAGE_VERSION=$WAZUH_IMAGE_VERSION >> ../.env
-    echo WAZUH_REGISTRY=$WAZUH_REGISTRY >> ../.env
-    echo IMAGE_TAG=${base_tag} >> ../.env
-
-    set -a
-    source ../.env
-    source ./artifacts_env.txt
-    set +a
-
-    # Validate component if a specific one was requested.
-    if [ -n "${WAZUH_COMPONENT}" ]; then
-        case "${WAZUH_COMPONENT}" in
-            wazuh-indexer|wazuh-manager|wazuh-dashboard|wazuh-agent) ;;
-            *)
-                echo "Error: Unknown component '${WAZUH_COMPONENT}'" >&2
-                clean 1
-                ;;
-        esac
-    fi
-
-    # Generate per-component image tags.
-    # The commit suffix is only appended when --dev is passed. This ensures:
-    #   dev=false, tag=5.0.0       → 5.0.0
-    #   dev=false, tag=5.0.0-beta1 → 5.0.0-beta1
-    #   dev=true,  tag=5.0.0       → 5.0.0-latest
-    #   dev=true,  tag=5.0.0-beta1 → 5.0.0-beta1-latest
-    make_tag() {
-        local commit=$1
-        if [ -n "${IS_DEV_BUILD}" ]; then
-            echo "${WAZUH_IMAGE_VERSION}${WAZUH_DEV_STAGE:+-${WAZUH_DEV_STAGE,,}}-${commit}"
-        else
-            echo "${base_tag}"
-        fi
-    }
-
-    export WAZUH_VERSION="$WAZUH_IMAGE_VERSION"
-    export MULTIARCH="${MULTIARCH}"
-    export INDEXER_TAG=$(make_tag   "${INDEXER_COMMIT:-latest}")
-    export MANAGER_TAG=$(make_tag   "${MANAGER_COMMIT:-latest}")
-    export DASHBOARD_TAG=$(make_tag "${DASHBOARD_COMMIT:-latest}")
-    export AGENT_TAG=$(make_tag     "${AGENT_COMMIT:-latest}")
-
-    echo "Image tags:"
-    echo "  wazuh-indexer:   ${WAZUH_REGISTRY}/wazuh/wazuh-indexer:${INDEXER_TAG}"
-    echo "  wazuh-manager:   ${WAZUH_REGISTRY}/wazuh/wazuh-manager:${MANAGER_TAG}"
-    echo "  wazuh-dashboard: ${WAZUH_REGISTRY}/wazuh/wazuh-dashboard:${DASHBOARD_TAG}"
-    echo "  wazuh-agent:     ${WAZUH_REGISTRY}/wazuh/wazuh-agent:${AGENT_TAG}"
-
-    # Bake options: --push for multi-arch (can't load multi-platform locally),
-    # --load for single-arch (stores image in local Docker daemon).
-    local bake_opts="--no-cache"
-    if [ "${MULTIARCH}" ]; then
-        bake_opts="${bake_opts} --push"
-    else
-        bake_opts="${bake_opts} --load"
-    fi
-
-    # Build a specific component or the full default group (all 4 in parallel).
-    if [ -z "${WAZUH_COMPONENT}" ]; then
-        echo "Building all components in parallel..."
-        docker buildx bake ${bake_opts} -f docker-bake.hcl || clean 1
-    else
-        echo "Building ${WAZUH_COMPONENT}..."
-        docker buildx bake ${bake_opts} -f docker-bake.hcl "${WAZUH_COMPONENT}" || clean 1
-    fi
-
-    echo ""
-    echo "Image build process completed!"
+    docker-compose -f build-docker-images/build-images.yml --env-file .env build --no-cache
+    docker build -t wazuh/wazuh-cert-tool:$WAZUH_IMAGE_VERSION build-docker-images/cert-tool-image/
 
     return 0
 }
@@ -248,13 +77,10 @@ help() {
     echo
     echo "Usage: $0 [OPTIONS]"
     echo
-    echo "    -d, --dev-stage <ref>        [Optional] Set the pre-release stage suffix (e.g. beta1, rc2). Not used by default."
-    echo "    --dev                        [Optional] Mark as a development build: appends the commit ref to the image tag. Controlled by inputs.dev in the workflow."
-    echo "    -refs, --references <refs>   [Optional] [Only with --dev] JSON array of commit refs for components (indexer, manager, dashboard, agent) in order. Defaults to 'latest'."
-    echo "    -rg, --registry <reg>        [Optional] Set the Docker registry to push the images."
-    echo "    -c, --component <comp>       [Required] Set the Wazuh component to build. Accepted values: 'wazuh-indexer', 'wazuh-manager', 'wazuh-dashboard', 'wazuh-agent'."
+    echo "    -d, --dev <ref>              [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default."
+    echo "    -f, --filebeat-module <ref>  [Optional] Set Filebeat module version. By default ${FILEBEAT_MODULE_VERSION}."
+    echo "    -r, --revision <rev>         [Optional] Package revision. By default ${WAZUH_TAG_REVISION}"
     echo "    -v, --version <ver>          [Optional] Set the Wazuh version should be builded. By default, ${WAZUH_IMAGE_VERSION}."
-    echo "    -m, --multiarch              [Optional] Enable multi-architecture builds."
     echo "    -h, --help                   Show this help."
     echo
     exit $1
@@ -269,7 +95,7 @@ main() {
         "-h"|"--help")
             help 0
             ;;
-        "-d"|"--dev-stage")
+        "-d"|"--dev")
             if [ -n "${2}" ]; then
                 WAZUH_DEV_STAGE="${2}"
                 shift 2
@@ -277,26 +103,17 @@ main() {
                 help 1
             fi
             ;;
-        "--dev")
-            IS_DEV_BUILD="true"
-            shift
-            ;;
-        "-m"|"--multiarch")
-            MULTIARCH="true"
-                shift
-            ;;
-        "-refs"|"--references")
+        "-f"|"--filebeat-module")
             if [ -n "${2}" ]; then
-                # Replace single quotes with double quotes to ensure it's valid JSON for jq processing
-                WAZUH_COMPONENTS_COMMIT_LIST="$(printf '%s' "${2}" | sed "s/'/\"/g")"
+                FILEBEAT_MODULE_VERSION="${2}"
                 shift 2
             else
                 help 1
             fi
             ;;
-        "-rg"|"--registry")
+        "-r"|"--revision")
             if [ -n "${2}" ]; then
-                WAZUH_REGISTRY="${2}"
+                WAZUH_TAG_REVISION="${2}"
                 shift 2
             else
                 help 1
@@ -310,14 +127,6 @@ main() {
                 help 1
             fi
             ;;
-        "-c"|"--component")
-            if [ -n "${2}" ]; then
-                WAZUH_COMPONENT="${2}"
-                shift 2
-            else
-                help 1
-            fi
-            ;;
         *)
             help 1
         esac

build-docker-images/build-images.yml

@@ -0,0 +1,102 @@
+# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
+services:
+  wazuh.manager:
+    build:
+      context: wazuh-manager/
+      args:
+        WAZUH_VERSION: ${WAZUH_VERSION}
+        WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
+        FILEBEAT_TEMPLATE_BRANCH: ${FILEBEAT_TEMPLATE_BRANCH}
+        WAZUH_FILEBEAT_MODULE: ${WAZUH_FILEBEAT_MODULE}
+    image: wazuh/wazuh-manager:${WAZUH_IMAGE_VERSION}
+    hostname: wazuh.manager
+    restart: always
+    ports:
+      - "1514:1514"
+      - "1515:1515"
+      - "514:514/udp"
+      - "55000:55000"
+    environment:
+      - INDEXER_URL=https://wazuh.indexer:9200
+      - INDEXER_USERNAME=admin
+      - INDEXER_PASSWORD=admin
+      - FILEBEAT_SSL_VERIFICATION_MODE=none
+    volumes:
+      - wazuh_api_configuration:/var/ossec/api/configuration
+      - wazuh_etc:/var/ossec/etc
+      - wazuh_logs:/var/ossec/logs
+      - wazuh_queue:/var/ossec/queue
+      - wazuh_var_multigroups:/var/ossec/var/multigroups
+      - wazuh_integrations:/var/ossec/integrations
+      - wazuh_active_response:/var/ossec/active-response/bin
+      - wazuh_agentless:/var/ossec/agentless
+      - wazuh_wodles:/var/ossec/wodles
+      - filebeat_etc:/etc/filebeat
+      - filebeat_var:/var/lib/filebeat
+
+  wazuh.agent:
+    build:
+      context: wazuh-agent/
+      args:
+        WAZUH_VERSION: ${WAZUH_VERSION}
+        WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
+    image: wazuh/wazuh-agent:${WAZUH_IMAGE_VERSION}
+    hostname: wazuh.agent
+    restart: always
+
+  wazuh.indexer:
+    build:
+      context: wazuh-indexer/
+      args:
+        WAZUH_VERSION: ${WAZUH_VERSION}
+        WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
+    image: wazuh/wazuh-indexer:${WAZUH_IMAGE_VERSION}
+    hostname: wazuh.indexer
+    restart: always
+    ports:
+      - "9200:9200"
+    environment:
+      - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m"
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+      nofile:
+        soft: 65536
+        hard: 65536
+
+  wazuh.dashboard:
+    build:
+      context: wazuh-dashboard/
+      args:
+        WAZUH_VERSION: ${WAZUH_VERSION}
+        WAZUH_TAG_REVISION: ${WAZUH_TAG_REVISION}
+        WAZUH_UI_REVISION: ${WAZUH_UI_REVISION}
+    image: wazuh/wazuh-dashboard:${WAZUH_IMAGE_VERSION}
+    hostname: wazuh.dashboard
+    restart: always
+    ports:
+      - 443:443
+    environment:
+      - INDEXER_USERNAME=admin
+      - INDEXER_PASSWORD=admin
+      - SERVER_SSL_ENABLED=false
+      - WAZUH_API_URL=https://wazuh.manager
+    depends_on:
+      - wazuh.indexer
+    links:
+      - wazuh.indexer:wazuh.indexer
+      - wazuh.manager:wazuh.manager
+
+volumes:
+  wazuh_api_configuration:
+  wazuh_etc:
+  wazuh_logs:
+  wazuh_queue:
+  wazuh_var_multigroups:
+  wazuh_integrations:
+  wazuh_active_response:
+  wazuh_agentless:
+  wazuh_wodles:
+  filebeat_etc:
+  filebeat_var:

build-docker-images/docker-bake.hcl

@@ -1,110 +0,0 @@
-# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
-#
-# Docker Buildx Bake file.
-# Builds all Wazuh component images in parallel.
-#
-# Usage:
-#   docker buildx bake                          # build all (local, single-arch)
-#   docker buildx bake wazuh-manager            # build one component
-#   docker buildx bake --push                   # push to registry after build
-#
-# Variables are read automatically from the environment (see build-images.sh).
-
-# ── Global variables ──────────────────────────────────────────────────────────
-
-variable "WAZUH_VERSION"  { default = "5.0.0" }
-variable "WAZUH_REGISTRY" { default = "docker.io" }
-
-# Set IMAGE_TAG externally to override; defaults to WAZUH_VERSION.
-variable "IMAGE_TAG" { default = WAZUH_VERSION }
-
-# MULTIARCH: set to a non-empty value to build linux/amd64 + linux/arm64.
-variable "MULTIARCH" { default = "" }
-
-# Per-component tags — all default to IMAGE_TAG.
-# In dev builds the shell script sets each one independently to append the
-# per-component commit ref (e.g. MANAGER_TAG=5.0.0-beta1-abc1234).
-variable "INDEXER_TAG"   { default = IMAGE_TAG }
-variable "MANAGER_TAG"   { default = IMAGE_TAG }
-variable "DASHBOARD_TAG" { default = IMAGE_TAG }
-variable "AGENT_TAG"     { default = IMAGE_TAG }
-
-# ── Artifact URL variables ────────────────────────────────────────────────────
-# Populated by build-images.sh from artifacts_env.txt (sourced into env).
-
-variable "wazuh_indexer_x86_64_rpm"    { default = "" }
-variable "wazuh_indexer_aarch64_rpm"   { default = "" }
-variable "wazuh_manager_x86_64_rpm"    { default = "" }
-variable "wazuh_manager_aarch64_rpm"   { default = "" }
-variable "wazuh_dashboard_x86_64_rpm"  { default = "" }
-variable "wazuh_dashboard_aarch64_rpm" { default = "" }
-variable "wazuh_agent_x86_64_rpm"      { default = "" }
-variable "wazuh_agent_aarch64_rpm"     { default = "" }
-variable "wazuh_certs_tool"            { default = "" }
-variable "wazuh_config_yml"            { default = "" }
-
-# ── Default group: builds all components ─────────────────────────────────────
-
-group "default" {
-  targets = ["wazuh-indexer", "wazuh-manager", "wazuh-dashboard", "wazuh-agent"]
-}
-
-# ── Shared base target ────────────────────────────────────────────────────────
-# All component targets inherit from here. Not built directly.
-
-target "_common" {
-  # MULTIARCH=true  → build linux/amd64 + linux/arm64 (requires --push, no --load for multi-platform)
-  # MULTIARCH unset → null means "native platform of the build host" (amd64 on x86, arm64 on ARM)
-  platforms = MULTIARCH != "" ? ["linux/amd64", "linux/arm64"] : null
-  args = {
-    WAZUH_VERSION = WAZUH_VERSION
-  }
-}
-
-# ── Component targets ─────────────────────────────────────────────────────────
-
-target "wazuh-indexer" {
-  inherits = ["_common"]
-  context  = "wazuh-indexer/"
-  tags     = ["${WAZUH_REGISTRY}/wazuh/wazuh-indexer:${INDEXER_TAG}"]
-  args = {
-    wazuh_indexer_x86_64_rpm  = wazuh_indexer_x86_64_rpm
-    wazuh_indexer_aarch64_rpm = wazuh_indexer_aarch64_rpm
-    wazuh_certs_tool          = wazuh_certs_tool
-    wazuh_config_yml          = wazuh_config_yml
-  }
-}
-
-target "wazuh-manager" {
-  inherits = ["_common"]
-  context  = "wazuh-manager/"
-  tags     = ["${WAZUH_REGISTRY}/wazuh/wazuh-manager:${MANAGER_TAG}"]
-  args = {
-    wazuh_manager_x86_64_rpm  = wazuh_manager_x86_64_rpm
-    wazuh_manager_aarch64_rpm = wazuh_manager_aarch64_rpm
-    wazuh_certs_tool          = wazuh_certs_tool
-    wazuh_config_yml          = wazuh_config_yml
-  }
-}
-
-target "wazuh-dashboard" {
-  inherits = ["_common"]
-  context  = "wazuh-dashboard/"
-  tags     = ["${WAZUH_REGISTRY}/wazuh/wazuh-dashboard:${DASHBOARD_TAG}"]
-  args = {
-    wazuh_dashboard_x86_64_rpm  = wazuh_dashboard_x86_64_rpm
-    wazuh_dashboard_aarch64_rpm = wazuh_dashboard_aarch64_rpm
-    wazuh_certs_tool            = wazuh_certs_tool
-    wazuh_config_yml            = wazuh_config_yml
-  }
-}
-
-target "wazuh-agent" {
-  inherits = ["_common"]
-  context  = "wazuh-agent/"
-  tags     = ["${WAZUH_REGISTRY}/wazuh/wazuh-agent:${AGENT_TAG}"]
-  args = {
-    wazuh_agent_x86_64_rpm  = wazuh_agent_x86_64_rpm
-    wazuh_agent_aarch64_rpm = wazuh_agent_aarch64_rpm
-  }
-}

build-docker-images/wazuh-agent/Dockerfile

@@ -1,83 +1,36 @@
 # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
-
-################################################################################
-# Build stage 0 (builder):
-# Install Wazuh Agent RPM and download tini (static PID-1 init shim).
-################################################################################
-FROM amazonlinux:2023 AS builder
-
-ARG WAZUH_VERSION
-ARG TINI_VERSION="v0.19.0"
-ARG WAZUH_MANAGER='CHANGE_MANAGER_IP'
-ARG WAZUH_REGISTRATION_SERVER='CHANGE_ENROLL_IP'
-ARG WAZUH_AGENT_NAME='CHANGE_AGENT_NAME'
-ARG TARGETARCH
-ARG wazuh_agent_x86_64_rpm
-ARG wazuh_agent_aarch64_rpm
-ARG WAZUH_UID=101
-ARG WAZUH_GID=101
-
-# Install only runtime dependencies
-RUN dnf install procps shadow-utils -y && \
-    dnf clean all && \
-    getent group wazuh || groupadd -r -g ${WAZUH_GID} wazuh && \
-    getent passwd wazuh || useradd --system \
-        --no-create-home \
-        --home-dir /var/ossec \
-        --uid ${WAZUH_UID} \
-        --gid ${WAZUH_GID} \
-        --shell /sbin/nologin \
-        wazuh && \
-    RPM_ARCH="x86_64" && \
-    if [ "${TARGETARCH}" = "arm64" ]; then RPM_ARCH="aarch64"; fi && \
-    URL_VAR="wazuh_agent_${RPM_ARCH}_rpm" && \
-    agent_url="${!URL_VAR}" && \
-    dnf install curl-minimal tar gzip procps shadow-utils -y && \
-    curl -o /wazuh-agent.rpm "${agent_url}" && \
-    dnf install /wazuh-agent.rpm -y && \
-    rm -rf /wazuh-agent.rpm && \
-    dnf clean all && \
-    sed -i '/<authorization_pass_path>/d' /var/ossec/etc/ossec.conf
-
-# Download tini static binary (no external library dependencies)
-RUN curl --fail --silent -L \
-    https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static-${TARGETARCH} \
-    -o /usr/local/bin/tini && \
-    chmod +x /usr/local/bin/tini
-
-################################################################################
-# Build stage 1 (the actual Wazuh Agent image):
-# Copy Wazuh Agent and tini from builder. Install only runtime dependencies.
-################################################################################
 FROM amazonlinux:2023
 
-ARG WAZUH_UID=101
-ARG WAZUH_GID=101
-
 RUN rm /bin/sh && ln -s /bin/bash /bin/sh
 
-# Install only runtime dependencies
-RUN dnf install procps shadow-utils -y && \
-    dnf clean all && \
-    getent group wazuh || groupadd -r -g ${WAZUH_GID} wazuh && \
-    getent passwd wazuh || useradd --system \
-        --no-create-home \
-        --home-dir /var/ossec \
-        --uid ${WAZUH_UID} \
-        --gid ${WAZUH_GID} \
-        --shell /sbin/nologin \
-        wazuh
+ARG WAZUH_VERSION
+ARG WAZUH_TAG_REVISION
+ARG S6_VERSION="v2.2.0.3"
+ARG WAZUH_MANAGER='CHANGE_MANAGER_IP'
+ARG WAZUH_MANAGER_PORT='CHANGE_MANAGER_PORT'
+ARG WAZUH_REGISTRATION_SERVER='CHANGE_ENROLL_IP'
+ARG WAZUH_REGISTRATION_PORT='CHANGE_ENROLL_PORT'
+ARG WAZUH_AGENT_NAME='CHANGEE_AGENT_NAME'
 
-# Copy Wazuh Agent installation from builder
-COPY --from=builder /var/ossec /var/ossec
+COPY config/check_repository.sh /
 
-# Copy tini static binary
-COPY --from=builder /usr/local/bin/tini /usr/local/bin/tini
+RUN yum install curl-minimal tar gzip procps -y &&\
+    yum clean all
+
+RUN chmod 775 /check_repository.sh
+RUN source /check_repository.sh
+
+RUN yum install wazuh-agent-${WAZUH_VERSION}-${WAZUH_TAG_REVISION} -y && \
+    yum clean all && \
+    sed -i '/<authorization_pass_path>/d' /var/ossec/etc/ossec.conf && \
+    curl --fail --silent -L https://github.com/just-containers/s6-overlay/releases/download/${S6_VERSION}/s6-overlay-amd64.tar.gz \
+    -o /tmp/s6-overlay-amd64.tar.gz && \
+    tar xzf /tmp/s6-overlay-amd64.tar.gz -C / --exclude="./bin" && \
+    tar xzf /tmp/s6-overlay-amd64.tar.gz -C /usr ./bin && \
+    rm  /tmp/s6-overlay-amd64.tar.gz
 
-# Copy entrypoint and init scripts
-COPY config/entrypoint.sh /entrypoint.sh
 COPY config/etc/ /etc/
 
-RUN chmod 755 /entrypoint.sh
+RUN rm /etc/yum.repos.d/wazuh.repo
 
-ENTRYPOINT ["/usr/local/bin/tini", "--", "/entrypoint.sh"]
+ENTRYPOINT [ "/init" ]

build-docker-images/wazuh-agent/config/check_repository.sh

@@ -0,0 +1,15 @@
+## variables
+APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH
+GPG_SIGN="gpgcheck=1\ngpgkey=${APT_KEY}]"
+REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1"
+WAZUH_TAG=$(curl --silent https://api.github.com/repos/wazuh/wazuh/git/refs/tags | grep '["]ref["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/'  | cut -c 11- | grep ^v${WAZUH_VERSION}$)
+
+## check tag to use the correct repository
+if [[ -n "${WAZUH_TAG}" ]]; then
+  APT_KEY=https://packages.wazuh.com/key/GPG-KEY-WAZUH
+  GPG_SIGN="gpgcheck=1\ngpgkey=${APT_KEY}]"
+  REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages.wazuh.com/4.x/yum/\nprotect=1"
+fi
+
+rpm --import "${APT_KEY}"
+echo -e "${REPOSITORY}" | tee /etc/yum.repos.d/wazuh.repo

build-docker-images/wazuh-agent/config/entrypoint.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
-
-# Run initialization and configuration
-bash /etc/cont-init.d/0-wazuh-init
-
-# Start Wazuh Agent (may log warnings if manager address is not configured)
-bash /etc/cont-init.d/1-agent
-
-# Tail the main log to stdout so Docker captures it
-tail -F /var/ossec/logs/ossec.log &
-TAIL_PID=$!
-
-# Graceful shutdown: stop Wazuh and exit cleanly on SIGTERM/SIGINT
-_stop() {
-    echo "Stopping Wazuh Agent..."
-    /var/ossec/bin/wazuh-control stop 2>/dev/null || true
-    kill "${TAIL_PID}" 2>/dev/null || true
-}
-trap _stop SIGTERM SIGINT SIGQUIT
-
-wait "${TAIL_PID}"

build-docker-images/wazuh-agent/config/etc/cont-init.d/0-wazuh-init

@@ -1,10 +1,13 @@
-#!/bin/bash
+#!/usr/bin/with-contenv bash
 # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 
 WAZUH_INSTALL_PATH=/var/ossec
 WAZUH_CONFIG_MOUNT=/wazuh-config-mount
 WAZUH_MANAGER_SERVER=$WAZUH_MANAGER_SERVER
+WAZUH_MANAGER_PORT=${WAZUH_MANAGER_PORT:-"1514"}
 WAZUH_REGISTRATION_SERVER=${WAZUH_REGISTRATION_SERVER:-$WAZUH_MANAGER_SERVER}
+WAZUH_REGISTRATION_PORT=${WAZUH_REGISTRATION_PORT:-"1515"}
+WAZUH_REGISTRATION_PASSWORD=$WAZUH_REGISTRATION_PASSWORD
 WAZUH_AGENT_NAME=${WAZUH_AGENT_NAME:-"wazuh-agent-$HOSTNAME"}
 
 ##############################################################################
@@ -60,8 +63,14 @@ mount_files() {
 set_manager_conn() {
   echo "ossec.conf configuration"
   sed -i "s#<address>CHANGE_MANAGER_IP</address>#<address>$WAZUH_MANAGER_SERVER</address>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
+  sed -i "s#<port>CHANGE_MANAGER_PORT</port>#<port>$WAZUH_MANAGER_PORT</port>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
   sed -i "s#<manager_address>CHANGE_ENROLL_IP</manager_address>#<manager_address>$WAZUH_REGISTRATION_SERVER</manager_address>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
-  sed -i "s#<agent_name>CHANGE_AGENT_NAME</agent_name>#<agent_name>$WAZUH_AGENT_NAME</agent_name>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
+  sed -i "s#<port>CHANGE_ENROLL_PORT</port>#<port>$WAZUH_REGISTRATION_PORT</port>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
+  sed -i "s#<agent_name>CHANGEE_AGENT_NAME</agent_name>#<agent_name>$WAZUH_AGENT_NAME</agent_name>#g" ${WAZUH_INSTALL_PATH}/etc/ossec.conf
+  [ -n "$WAZUH_REGISTRATION_PASSWORD" ] && \
+  echo "$WAZUH_REGISTRATION_PASSWORD" > ${WAZUH_INSTALL_PATH}/etc/authd.pass && \
+  chown root:wazuh ${WAZUH_INSTALL_PATH}/etc/authd.pass && \
+  chmod 640 ${WAZUH_INSTALL_PATH}/etc/authd.pass
 }
 
 ##############################################################################

build-docker-images/wazuh-agent/config/etc/cont-init.d/1-agent

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/with-contenv bash
 
 ##############################################################################
 # Migration sequence

build-docker-images/wazuh-agent/config/etc/services.d/ossec-logs/run

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/with-contenv sh
 
 # dumping ossec.log to standard output
 exec tail -F /var/ossec/logs/ossec.log

build-docker-images/wazuh-cert-tool/Dockerfile

@@ -0,0 +1,13 @@
+# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
+FROM amazonlinux:2023
+
+RUN yum install curl-minimal openssl -y &&\
+yum clean all
+
+WORKDIR /
+
+COPY config/entrypoint.sh /
+
+RUN chmod 700 /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]

build-docker-images/wazuh-cert-tool/config/entrypoint.sh

@@ -0,0 +1,62 @@
+#!/bin/bash
+# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
+
+##############################################################################
+# Downloading Cert Gen Tool
+##############################################################################
+
+## Variables
+CERT_TOOL=wazuh-certs-tool.sh
+PASSWORD_TOOL=wazuh-passwords-tool.sh
+PACKAGES_URL=https://packages.wazuh.com/6.0/
+PACKAGES_DEV_URL=https://packages-dev.wazuh.com/6.0/
+
+## Check if the cert tool exists in S3 buckets
+CERT_TOOL_PACKAGES=$(curl --silent --head --location --output /dev/null --write-out "%{http_code}" "$PACKAGES_URL$CERT_TOOL")
+CERT_TOOL_PACKAGES_DEV=$(curl --silent --head --location --output /dev/null --write-out "%{http_code}" "$PACKAGES_DEV_URL$CERT_TOOL")
+
+## If cert tool exists in some bucket, download it, if not exit 1
+if [ "$CERT_TOOL_PACKAGES" = "200" ]; then
+  curl -o $CERT_TOOL $PACKAGES_URL$CERT_TOOL -s
+  echo "The tool to create the certificates exists in the in Packages bucket"
+elif [ "$CERT_TOOL_PACKAGES_DEV" = "200" ]; then
+  curl -o $CERT_TOOL $PACKAGES_DEV_URL$CERT_TOOL -s
+  echo "The tool to create the certificates exists in Packages-dev bucket"
+else
+  echo "The tool to create the certificates does not exist in any bucket"
+  echo "ERROR: certificates were not created"
+  exit 1
+fi
+
+cp /config/certs.yml /config.yml
+
+chmod 700 /$CERT_TOOL
+
+##############################################################################
+# Creating Cluster certificates
+##############################################################################
+
+## Execute cert tool and parsin cert.yml to set UID permissions
+source /$CERT_TOOL -A
+nodes_server=$( cert_parseYaml /config.yml | grep -E "nodes[_]+server[_]+[0-9]+=" | sed -e 's/nodes__server__[0-9]=//' | sed 's/"//g' )
+node_names=($nodes_server)
+
+echo "Moving created certificates to the destination directory"
+cp /wazuh-certificates/* /certificates/
+echo "Changing certificate permissions"
+chmod -R 500 /certificates
+chmod -R 400 /certificates/*
+echo "Setting UID indexer and dashboard"
+chown 1000:1000 /certificates/*
+echo "Setting UID for wazuh manager and worker"
+cp /certificates/root-ca.pem /certificates/root-ca-manager.pem
+cp /certificates/root-ca.key /certificates/root-ca-manager.key
+chown 999:999 /certificates/root-ca-manager.pem
+chown 999:999 /certificates/root-ca-manager.key
+
+for i in ${node_names[@]};
+do
+  chown 999:999 "/certificates/${i}.pem"
+  chown 999:999 "/certificates/${i}-key.pem"
+done
+

build-docker-images/wazuh-dashboard/Dockerfile

@@ -2,66 +2,50 @@
 FROM amazonlinux:2023 AS builder
 
 ARG WAZUH_VERSION
+ARG WAZUH_TAG_REVISION
+ARG WAZUH_UI_REVISION
 ARG INSTALL_DIR=/usr/share/wazuh-dashboard
-ARG TARGETARCH
-ARG wazuh_dashboard_x86_64_rpm
-ARG wazuh_dashboard_aarch64_rpm
-ARG wazuh_config_yml
-ARG WAZUH_UID=101
-ARG WAZUH_GID=101
-
-# Set environment variables
-ENV USER="wazuh-dashboard" \
-    GROUP="wazuh-dashboard" \
-    NAME="wazuh-dashboard" \
-    INSTALL_DIR="/usr/share/wazuh-dashboard" 
 
 # Update and install dependencies
-RUN yum install shadow-utils -y && \
-    yum clean all && \
-    getent group $GROUP || groupadd -r -g ${WAZUH_GID} $GROUP && \
-    useradd --system \
-    --uid ${WAZUH_UID} \
-    --no-create-home \
-    --home-dir $INSTALL_DIR \
-    --gid $GROUP \
-    --shell /sbin/nologin \
-    --comment "$USER user" \
-    $USER && \
-    RPM_ARCH="x86_64" && \
-    if [ "${TARGETARCH}" = "arm64" ]; then RPM_ARCH="aarch64"; fi && \
-    URL_VAR="wazuh_dashboard_${RPM_ARCH}_rpm" && \
-    dashboard_url="${!URL_VAR}" && \
-    dnf install curl-minimal libcap openssl -y && \
-    curl -o /wazuh-dashboard.rpm "${dashboard_url}" && \
-    dnf install /wazuh-dashboard.rpm -y && \
-    rm -rf /wazuh-dashboard.rpm && \
-    dnf clean all
+RUN yum install curl-minimal libcap openssl -y
+
+COPY config/check_repository.sh /
+RUN chmod 775 /check_repository.sh && \
+    source /check_repository.sh
+
+RUN yum install wazuh-dashboard-${WAZUH_VERSION}-${WAZUH_TAG_REVISION} -y && \
+    yum clean all
 
 # Create and set permissions to data directories
 RUN mkdir -p $INSTALL_DIR/data/wazuh && chmod -R 775 $INSTALL_DIR/data/wazuh
 RUN mkdir -p $INSTALL_DIR/data/wazuh/config && chmod -R 775 $INSTALL_DIR/data/wazuh/config
 RUN mkdir -p $INSTALL_DIR/data/wazuh/logs && chmod -R 775 $INSTALL_DIR/data/wazuh/logs
+COPY config/wazuh.yml $INSTALL_DIR/data/wazuh/config/
 RUN setcap 'cap_net_bind_service=-ep' /usr/share/wazuh-dashboard/node/bin/node
+RUN setcap 'cap_net_bind_service=-ep' /usr/share/wazuh-dashboard/node/fallback/bin/node
+
+# Generate certificates
+COPY config/config.sh .
+COPY config/config.yml /
+RUN bash config.sh
 
 ################################################################################
 # Build stage 1 (the current Wazuh dashboard image):
 #
 # Copy wazuh-dashboard from stage 0
 # Add entrypoint
-# Add wazuh_dashboard_config
+# Add wazuh_app_config
 ################################################################################
 FROM amazonlinux:2023
 
-ARG WAZUH_UID=101
-ARG WAZUH_GID=101
-
 # Set environment variables
 ENV USER="wazuh-dashboard" \
     GROUP="wazuh-dashboard" \
     NAME="wazuh-dashboard" \
-    INSTALL_DIR="/usr/share/wazuh-dashboard" \
-    PATTERN="" \
+    INSTALL_DIR="/usr/share/wazuh-dashboard"
+
+# Set Wazuh app variables
+ENV PATTERN="" \
     CHECKS_PATTERN="" \
     CHECKS_TEMPLATE="" \
     CHECKS_API="" \
@@ -75,32 +59,42 @@ ENV USER="wazuh-dashboard" \
     WAZUH_MONITORING_SHARDS="" \
     WAZUH_MONITORING_REPLICAS=""
 
+# Update and install dependencies
+RUN yum install shadow-utils -y
+
+# Create wazuh-dashboard user and group
+RUN getent group $GROUP || groupadd -r -g 1000 $GROUP
+RUN useradd --system \
+            --uid 1000 \
+            --no-create-home \
+            --home-dir $INSTALL_DIR \
+            --gid $GROUP \
+            --shell /sbin/nologin \
+            --comment "$USER user" \
+            $USER
+
 # Copy and set permissions to scripts
 COPY config/entrypoint.sh /
-COPY config/wazuh_dashboard_config.sh /
-
-# Update and install dependencies
-RUN yum install shadow-utils -y && \
-    yum clean all && \
-    getent group $GROUP || groupadd -r -g ${WAZUH_GID} $GROUP && \
-    useradd --system \
-    --uid ${WAZUH_UID} \
-    --no-create-home \
-    --home-dir $INSTALL_DIR \
-    --gid $GROUP \
-    --shell /sbin/nologin \
-    --comment "$USER user" \
-    $USER && \
-    chmod 700 /entrypoint.sh && \
-    chmod 700 /wazuh_dashboard_config.sh && \
-    mkdir -p $INSTALL_DIR && \
-    chown ${WAZUH_UID}:${WAZUH_GID} $INSTALL_DIR && \
-    chown ${WAZUH_UID}:${WAZUH_GID} /*.sh && \
-    mkdir -p /usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom
+COPY config/wazuh_app_config.sh /
+RUN chmod 700 /entrypoint.sh
+RUN chmod 700 /wazuh_app_config.sh
+RUN chown 1000:1000 /*.sh
 
 # Copy Install dir from builder to current image
-COPY --from=builder $INSTALL_DIR $INSTALL_DIR
-COPY --from=builder /etc/wazuh-dashboard $INSTALL_DIR/config/
+COPY --from=builder --chown=1000:1000 $INSTALL_DIR $INSTALL_DIR
+
+# Create custom directory
+RUN mkdir -p /usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom
+RUN chown 1000:1000 /usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom
+
+# Set $JAVA_HOME
+RUN echo "export JAVA_HOME=$INSTALL_DIR/jdk" >> /etc/profile.d/java_home.sh && \
+    echo "export PATH=\$PATH:\$JAVA_HOME/bin" >> /etc/profile.d/java_home.sh
+ENV JAVA_HOME=$INSTALL_DIR/jdk
+ENV PATH=$PATH:$JAVA_HOME/bin:$INSTALL_DIR/bin
+
+# Add k-NN lib directory to library loading path variable
+ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL_DIR/plugins/opensearch-knn/lib"
 
 # Set workdir and user
 WORKDIR $INSTALL_DIR
@@ -110,3 +104,5 @@ USER wazuh-dashboard
 EXPOSE 443
 
 ENTRYPOINT [ "/entrypoint.sh" ]
+
+CMD ["opensearch-dashboards"]

build-docker-images/wazuh-dashboard/config/check_repository.sh

@@ -0,0 +1,15 @@
+## variables
+APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH
+GPG_SIGN="gpgcheck=1\ngpgkey=${APT_KEY}]"
+REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1"
+WAZUH_TAG=$(curl --silent https://api.github.com/repos/wazuh/wazuh/git/refs/tags | grep '["]ref["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/'  | cut -c 11- | grep ^v${WAZUH_VERSION}$)
+
+## check tag to use the correct repository
+if [[ -n "${WAZUH_TAG}" ]]; then
+  APT_KEY=https://packages.wazuh.com/key/GPG-KEY-WAZUH
+  GPG_SIGN="gpgcheck=1\ngpgkey=${APT_KEY}]"
+  REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages.wazuh.com/5.x/yum/\nprotect=1"
+fi
+
+rpm --import "${APT_KEY}"
+echo -e "${REPOSITORY}" | tee /etc/yum.repos.d/wazuh.repo

build-docker-images/wazuh-dashboard/config/config.sh

@@ -0,0 +1,42 @@
+# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+export NAME=wazuh-dashboard
+export TARGET_DIR=${CURDIR}/debian/${NAME}
+export INSTALLATION_DIR=/usr/share/${NAME}
+export CONFIG_DIR=${INSTALLATION_DIR}/config
+
+## Variables
+CERT_TOOL=wazuh-certs-tool.sh
+PACKAGES_URL=https://packages.wazuh.com/6.0/
+PACKAGES_DEV_URL=https://packages-dev.wazuh.com/6.0/
+
+## Check if the cert tool exists in S3 buckets
+CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk  '{print $2}')
+CERT_TOOL_PACKAGES_DEV=$(curl --silent -I $PACKAGES_DEV_URL$CERT_TOOL | grep -E "^HTTP" | awk  '{print $2}')
+
+## If cert tool exists in some bucket, download it, if not exit 1
+if [ "$CERT_TOOL_PACKAGES" = "200" ]; then
+  curl -o $CERT_TOOL $PACKAGES_URL$CERT_TOOL
+  echo "Cert tool exists in Packages bucket"
+elif [ "$CERT_TOOL_PACKAGES_DEV" = "200" ]; then
+  curl -o $CERT_TOOL $PACKAGES_DEV_URL$CERT_TOOL
+  echo "Cert tool exists in Packages-dev bucket"
+else
+  echo "Cert tool does not exist in any bucket"
+  exit 1
+fi
+
+chmod 755 $CERT_TOOL && bash /$CERT_TOOL -A
+
+# Create certs directory
+mkdir -p ${CONFIG_DIR}/certs
+
+# Copy Wazuh dashboard certs to install config dir
+cp /wazuh-certificates/dashboard.pem ${CONFIG_DIR}/certs/dashboard.pem
+cp /wazuh-certificates/dashboard-key.pem ${CONFIG_DIR}/certs/dashboard-key.pem
+cp /wazuh-certificates/root-ca.pem ${CONFIG_DIR}/certs/root-ca.pem
+
+chmod -R 500 ${CONFIG_DIR}/certs
+chmod -R 400 ${CONFIG_DIR}/certs/*

build-docker-images/wazuh-dashboard/config/config.yml

@@ -0,0 +1,5 @@
+nodes:
+  # Wazuh dashboard server nodes
+  dashboard:
+    - name: dashboard
+      ip: wazuh.dashboard

build-docker-images/wazuh-dashboard/config/entrypoint.sh

@@ -1,81 +1,233 @@
 #!/bin/bash
 # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 
-# Run Wazuh dashboard, using environment variables to
-# set longopts defining Wazuh dashboard's configuration.
-#
-# eg. Setting the environment variable:
-#
-#       OPENSEARCH_STARTUPTIMEOUT=60
-#
-# will cause OpenSearch-Dashboards to be invoked with:
-#
-#       --opensearch.startupTimeout=60
+INSTALL_DIR=/usr/share/wazuh-dashboard
+export OPENSEARCH_DASHBOARDS_HOME=$INSTALL_DIR
+WAZUH_CONFIG_MOUNT=/wazuh-config-mount
+
+opensearch_dashboards_vars=(
+    console.enabled
+    console.proxyConfig
+    console.proxyFilter
+    ops.cGroupOverrides.cpuPath
+    ops.cGroupOverrides.cpuAcctPath
+    cpu.cgroup.path.override
+    cpuacct.cgroup.path.override
+    server.basePath
+    server.customResponseHeaders
+    server.compression.enabled
+    server.compression.referrerWhitelist
+    server.cors
+    server.cors.origin
+    server.defaultRoute
+    server.host
+    server.keepAliveTimeout
+    server.maxPayloadBytes
+    server.name
+    server.port
+    csp.rules
+    csp.strict
+    csp.warnLegacyBrowsers
+    data.search.usageTelemetry.enabled
+    opensearch.customHeaders
+    opensearch.hosts
+    opensearch.logQueries
+    opensearch.memoryCircuitBreaker.enabled
+    opensearch.memoryCircuitBreaker.maxPercentage
+    opensearch.password
+    opensearch.pingTimeout
+    opensearch.requestHeadersWhitelist
+    opensearch.requestHeadersAllowlist
+    opensearch_security.multitenancy.enabled
+    opensearch_security.readonly_mode.roles
+    opensearch.requestTimeout
+    opensearch.shardTimeout
+    opensearch.sniffInterval
+    opensearch.sniffOnConnectionFault
+    opensearch.sniffOnStart
+    opensearch.ssl.alwaysPresentCertificate
+    opensearch.ssl.certificate
+    opensearch.ssl.key
+    opensearch.ssl.keyPassphrase
+    opensearch.ssl.keystore.path
+    opensearch.ssl.keystore.password
+    opensearch.ssl.truststore.path
+    opensearch.ssl.truststore.password
+    opensearch.ssl.verificationMode
+    opensearch.username
+    i18n.locale
+    interpreter.enableInVisualize
+    opensearchDashboards.autocompleteTerminateAfter
+    opensearchDashboards.autocompleteTimeout
+    opensearchDashboards.defaultAppId
+    opensearchDashboards.index
+    logging.dest
+    logging.json
+    logging.quiet
+    logging.rotate.enabled
+    logging.rotate.everyBytes
+    logging.rotate.keepFiles
+    logging.rotate.pollingInterval
+    logging.rotate.usePolling
+    logging.silent
+    logging.useUTC
+    logging.verbose
+    map.includeOpenSearchMapsService
+    map.proxyOpenSearchMapsServiceInMaps
+    map.regionmap
+    map.tilemap.options.attribution
+    map.tilemap.options.maxZoom
+    map.tilemap.options.minZoom
+    map.tilemap.options.subdomains
+    map.tilemap.url
+    monitoring.cluster_alerts.email_notifications.email_address
+    monitoring.enabled
+    monitoring.opensearchDashboards.collection.enabled
+    monitoring.opensearchDashboards.collection.interval
+    monitoring.ui.container.opensearch.enabled
+    monitoring.ui.container.logstash.enabled
+    monitoring.ui.opensearch.password
+    monitoring.ui.opensearch.pingTimeout
+    monitoring.ui.opensearch.hosts
+    monitoring.ui.opensearch.username
+    monitoring.ui.opensearch.logFetchCount
+    monitoring.ui.opensearch.ssl.certificateAuthorities
+    monitoring.ui.opensearch.ssl.verificationMode
+    monitoring.ui.enabled
+    monitoring.ui.max_bucket_size
+    monitoring.ui.min_interval_seconds
+    newsfeed.enabled
+    ops.interval
+    path.data
+    pid.file
+    regionmap
+    security.showInsecureClusterWarning
+    server.rewriteBasePath
+    server.socketTimeout
+    server.customResponseHeaders
+    server.ssl.enabled
+    server.ssl.key
+    server.ssl.keyPassphrase
+    server.ssl.keystore.path
+    server.ssl.keystore.password
+    server.ssl.truststore.path
+    server.ssl.truststore.password
+    server.ssl.cert
+    server.ssl.certificate
+    server.ssl.certificateAuthorities
+    server.ssl.cipherSuites
+    server.ssl.clientAuthentication
+    opensearch.ssl.certificateAuthorities
+    server.ssl.redirectHttpFromPort
+    server.ssl.supportedProtocols
+    server.xsrf.disableProtection
+    server.xsrf.whitelist
+    status.allowAnonymous
+    status.v6ApiFormat
+    tilemap.options.attribution
+    tilemap.options.maxZoom
+    tilemap.options.minZoom
+    tilemap.options.subdomains
+    tilemap.url
+    timeline.enabled
+    vega.enableExternalUrls
+    apm_oss.apmAgentConfigurationIndex
+    apm_oss.indexPattern
+    apm_oss.errorIndices
+    apm_oss.onboardingIndices
+    apm_oss.spanIndices
+    apm_oss.sourcemapIndices
+    apm_oss.transactionIndices
+    apm_oss.metricsIndices
+    telemetry.allowChangingOptInStatus
+    telemetry.enabled
+    telemetry.optIn
+    telemetry.optInStatusUrl
+    telemetry.sendUsageFrom
+    vis_builder.enabled
+    data_source.enabled
+    data_source.encryption.wrappingKeyName
+    data_source.encryption.wrappingKeyNamespace
+    data_source.encryption.wrappingKey
+    data_source.audit.enabled
+    data_source.audit.appender.kind
+    data_source.audit.appender.path
+    data_source.audit.appender.layout.kind
+    data_source.audit.appender.layout.highlight
+    data_source.audit.appender.layout.pattern
+    ml_commons_dashboards.enabled
+    assistant.chat.enabled
+    observability.query_assist.enabled
+    uiSettings.overrides.defaultRoute
+)
+
+print() {
+  echo -e $1
+}
+
+error_and_exit() {
+  echo "Error executing command: '$1'."
+  echo 'Exiting.'
+  exit 1
+}
+
+exec_cmd() {
+  eval $1 > /dev/null 2>&1 || error_and_exit "$1"
+}
+
+exec_cmd_stdout() {
+  eval $1 2>&1 || error_and_exit "$1"
+}
+
+function runOpensearchDashboards {
+    touch $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml
+      for opensearch_dashboards_var in ${opensearch_dashboards_vars[*]}; do
+        env_var=$(echo ${opensearch_dashboards_var^^} | tr . _)
+        value=${!env_var}
+        if [[ -n $value ]]; then
+          longoptfile="${opensearch_dashboards_var}: ${value}"
+          if grep -q $opensearch_dashboards_var $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml; then
+            sed -i "/${opensearch_dashboards_var}/ s|^.*$|${longoptfile}|" $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml
+          else
+            echo $longoptfile >> $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml
+          fi
+        fi
+      done
+
+    umask 0002
+
+    /usr/share/wazuh-dashboard/bin/opensearch-dashboards -c $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml \
+        --cpu.cgroup.path.override=/ \
+        --cpuacct.cgroup.path.override=/
+}
+
+mount_files() {
+  if [ -e $WAZUH_CONFIG_MOUNT/* ]
+  then
+    print "Identified Wazuh cdashboard onfiguration files to mount..."
+    exec_cmd_stdout "cp --verbose -r $WAZUH_CONFIG_MOUNT/* $INSTALL_DIR"
+  else
+    print "No Wazuh dashboard configuration files to mount..."
+  fi
+}
 
-# Setup Home Directory
-export OPENSEARCH_DASHBOARDS_HOME=/usr/share/wazuh-dashboard
-export PATH=$OPENSEARCH_DASHBOARDS_HOME/bin:$PATH
 DASHBOARD_USERNAME="${DASHBOARD_USERNAME:-kibanaserver}"
 DASHBOARD_PASSWORD="${DASHBOARD_PASSWORD:-kibanaserver}"
 
 # Create and configure Wazuh dashboard keystore
 
-yes | $OPENSEARCH_DASHBOARDS_HOME/bin/opensearch-dashboards-keystore create --allow-root && \
-echo $DASHBOARD_USERNAME | $OPENSEARCH_DASHBOARDS_HOME/bin/opensearch-dashboards-keystore add opensearch.username --stdin --allow-root && \
-echo $DASHBOARD_PASSWORD | $OPENSEARCH_DASHBOARDS_HOME/bin/opensearch-dashboards-keystore add opensearch.password --stdin --allow-root
+yes | $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
 
-/wazuh_dashboard_config.sh
+##############################################################################
+# Start Wazuh dashboard
+##############################################################################
 
-opensearch_dashboards_vars=(
-    opensearch.hosts
-    server.port
-    server.host
-    opensearch.username
-    opensearch.password
-)
+/wazuh_app_config.sh $WAZUH_UI_REVISION
 
-function runOpensearchDashboards {
-    longopts=()
-    for opensearch_dashboards_var in ${opensearch_dashboards_vars[*]}; do
-        # 'opensearch.hosts' -> 'OPENSEARCH_URL'
-        env_var=$(echo ${opensearch_dashboards_var^^} | tr . _)
+mount_files
 
-        # Indirectly lookup env var values via the name of the var.
-        # REF: http://tldp.org/LDP/abs/html/bashver2.html#EX78
-        value=${!env_var}
-        if [[ -n $value ]]; then
-            longopt="--${opensearch_dashboards_var}=${value}"
-            longopts+=("${longopt}")
-        fi
-    done
-
-    # Files created at run-time should be group-writable, for Openshift's sake.
-    umask 0002
-
-    # TO DO:
-    # Confirm with Mihir if this is necessary
-
-    # The virtual file /proc/self/cgroup should list the current cgroup
-    # membership. For each hierarchy, you can follow the cgroup path from
-    # this file to the cgroup filesystem (usually /sys/fs/cgroup/) and
-    # introspect the statistics for the cgroup for the given
-    # hierarchy. Alas, Docker breaks this by mounting the container
-    # statistics at the root while leaving the cgroup paths as the actual
-    # paths. Therefore, OpenSearch-Dashboards provides a mechanism to override
-    # reading the cgroup path from /proc/self/cgroup and instead uses the
-    # cgroup path defined the configuration properties
-    # cpu.cgroup.path.override and cpuacct.cgroup.path.override.
-    # Therefore, we set this value here so that cgroup statistics are
-    # available for the container this process will run in.
-
-    exec "$@" \
-        --ops.cGroupOverrides.cpuPath=/ \
-        --ops.cGroupOverrides.cpuAcctPath=/ \
-        "${longopts[@]}"
-}
-
-# Prepend "opensearch-dashboards" command if no argument was provided or if the
-# first argument looks like a flag (i.e. starts with a dash).
 if [ $# -eq 0 ] || [ "${1:0:1}" = '-' ]; then
     set -- opensearch-dashboards "$@"
 fi
@@ -84,4 +236,4 @@ if [ "$1" = "opensearch-dashboards" ]; then
     runOpensearchDashboards "$@"
 else
     exec "$@"
-fi
+fi

build-docker-images/wazuh-dashboard/config/wazuh.yml

@@ -0,0 +1,155 @@
+---
+#
+# Wazuh app - App configuration file
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Find more information about this on the LICENSE file.
+#
+# ======================== Wazuh app configuration file ========================
+#
+# Please check the documentation for more information on configuration options:
+# https://documentation.wazuh.com/current/installation-guide/index.html
+#
+# Also, you can check our repository:
+# https://github.com/wazuh/wazuh-dashboard-plugins
+#
+# ------------------------------- Index patterns -------------------------------
+#
+# Default index pattern to use.
+#pattern: wazuh-alerts-*
+#
+# ----------------------------------- Checks -----------------------------------
+#
+# Defines which checks must to be consider by the healthcheck
+# step once the Wazuh app starts. Values must to be true or false.
+#checks.pattern : true
+#checks.template: true
+#checks.api     : true
+#checks.setup   : true
+#checks.metaFields: true
+#
+# --------------------------------- Extensions ---------------------------------
+#
+# Defines which extensions should be activated when you add a new API entry.
+# You can change them after Wazuh app starts.
+# Values must to be true or false.
+#extensions.pci       : true
+#extensions.gdpr      : true
+#extensions.hipaa     : true
+#extensions.nist      : true
+#extensions.tsc       : true
+#extensions.audit     : true
+#extensions.oscap     : false
+#extensions.ciscat    : false
+#extensions.aws       : false
+#extensions.gcp       : false
+#extensions.virustotal: false
+#extensions.osquery   : false
+#extensions.docker    : false
+#
+# ---------------------------------- Time out ----------------------------------
+#
+# Defines maximum timeout to be used on the Wazuh app requests.
+# It will be ignored if it is bellow 1500.
+# It means milliseconds before we consider a request as failed.
+# Default: 20000
+#timeout: 20000
+#
+# -------------------------------- API selector --------------------------------
+#
+# Defines if the user is allowed to change the selected
+# API directly from the Wazuh app top menu.
+# Default: true
+#api.selector: true
+#
+# --------------------------- Index pattern selector ---------------------------
+#
+# Defines if the user is allowed to change the selected
+# index pattern directly from the Wazuh app top menu.
+# Default: true
+#ip.selector: true
+#
+# List of index patterns to be ignored
+#ip.ignore: []
+#
+# ------------------------------ wazuh-monitoring ------------------------------
+#
+# Custom setting to enable/disable wazuh-monitoring indices.
+# Values: true, false, worker
+# If worker is given as value, the app will show the Agents status
+# visualization but won't insert data on wazuh-monitoring indices.
+# Default: true
+#wazuh.monitoring.enabled: true
+#
+# Custom setting to set the frequency for wazuh-monitoring indices cron task.
+# Default: 900 (s)
+#wazuh.monitoring.frequency: 900
+#
+# Configure wazuh-monitoring-* indices shards and replicas.
+#wazuh.monitoring.shards: 2
+#wazuh.monitoring.replicas: 0
+#
+# Configure wazuh-monitoring-* indices custom creation interval.
+# Values: h (hourly), d (daily), w (weekly), m (monthly)
+# Default: d
+#wazuh.monitoring.creation: d
+#
+# Default index pattern to use for Wazuh monitoring
+#wazuh.monitoring.pattern: wazuh-monitoring-*
+#
+# --------------------------------- wazuh-cron ----------------------------------
+#
+# Customize the index prefix of predefined jobs
+# This change is not retroactive, if you change it new indexes will be created
+# cron.prefix: test
+#
+# ------------------------------ wazuh-statistics -------------------------------
+#
+# Custom setting to enable/disable statistics tasks.
+#cron.statistics.status: true
+#
+# Enter the ID of the APIs you want to save data from, leave this empty to run
+# the task on all configured APIs
+#cron.statistics.apis: []
+#
+# Define the frequency of task execution using cron schedule expressions
+#cron.statistics.interval: 0 0 * * * *
+#
+# Define the name of the index in which the documents are to be saved.
+#cron.statistics.index.name: statistics
+#
+# Define the interval in which the index will be created
+#cron.statistics.index.creation: w
+#
+# ------------------------------- App privileges --------------------------------
+#admin: true
+#
+# ---------------------------- Hide manager alerts ------------------------------
+# Hide the alerts of the manager in all dashboards and discover
+#hideManagerAlerts: false
+#
+# ------------------------------- App logging level -----------------------------
+# Set the logging level for the Wazuh App log files.
+# Default value: info
+# Allowed values: info, debug
+#logs.level: info
+#
+# -------------------------------- Enrollment DNS -------------------------------
+# Set the variable WAZUH_REGISTRATION_SERVER in agents deployment.
+# Default value: ''
+#enrollment.dns: ''
+#
+#-------------------------------- API entries -----------------------------------
+#The following configuration is the default structure to define an API entry.
+#
+#hosts:
+#  - <id>:
+#     url: http(s)://<url>
+#     port: <port>
+#     username: <username>
+#     password: <password>

build-docker-images/wazuh-dashboard/config/wazuh_app_config.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
+
+wazuh_url="${WAZUH_API_URL:-https://wazuh}"
+wazuh_port="${API_PORT:-55000}"
+api_username="${API_USERNAME:-wazuh-wui}"
+api_password="${API_PASSWORD:-wazuh-wui}"
+api_run_as="${RUN_AS:-false}"
+
+dashboard_config_file="/usr/share/wazuh-dashboard/data/wazuh/config/wazuh.yml"
+
+declare -A CONFIG_MAP=(
+  [pattern]=$PATTERN
+  [checks.pattern]=$CHECKS_PATTERN
+  [checks.template]=$CHECKS_TEMPLATE
+  [checks.api]=$CHECKS_API
+  [checks.setup]=$CHECKS_SETUP
+  [timeout]=$APP_TIMEOUT
+  [api.selector]=$API_SELECTOR
+  [ip.selector]=$IP_SELECTOR
+  [ip.ignore]=$IP_IGNORE
+  [wazuh.monitoring.enabled]=$WAZUH_MONITORING_ENABLED
+  [wazuh.monitoring.frequency]=$WAZUH_MONITORING_FREQUENCY
+  [wazuh.monitoring.shards]=$WAZUH_MONITORING_SHARDS
+  [wazuh.monitoring.replicas]=$WAZUH_MONITORING_REPLICAS
+)
+
+for i in "${!CONFIG_MAP[@]}"
+do
+    if [ "${CONFIG_MAP[$i]}" != "" ]; then
+        sed -i 's/.*#'"$i"'.*/'"$i"': '"${CONFIG_MAP[$i]}"'/' $dashboard_config_file
+    fi
+done
+
+
+grep -q 1513629884013 $dashboard_config_file
+_config_exists=$?
+
+if [[ $_config_exists -ne 0 ]]; then
+cat << EOF >> $dashboard_config_file
+hosts:
+  - 1513629884013:
+      url: $wazuh_url
+      port: $wazuh_port
+      username: $api_username
+      password: $api_password
+      run_as: $api_run_as
+EOF
+else
+  echo "Wazuh APP already configured"
+fi
+

build-docker-images/wazuh-dashboard/config/wazuh_dashboard_config.sh

@@ -1,110 +0,0 @@
-#!/bin/bash
-# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
-
-# Environment variables with defaults
-SERVER_HOST="${SERVER_HOST:-0.0.0.0}"
-SERVER_PORT="${SERVER_PORT:-443}"
-OPENSEARCH_HOSTS="${OPENSEARCH_HOSTS:-https://wazuh.indexer:9200}"
-OPENSEARCH_SSL_VERIFICATION_MODE="${OPENSEARCH_SSL_VERIFICATION_MODE:-certificate}"
-OPENSEARCH_USERNAME="${OPENSEARCH_USERNAME:-}"
-OPENSEARCH_PASSWORD="${OPENSEARCH_PASSWORD:-}"
-OPENSEARCH_REQUEST_HEADERS_ALLOWLIST="${OPENSEARCH_REQUEST_HEADERS_ALLOWLIST:-[\"securitytenant\",\"Authorization\"]}"
-OPENSEARCH_SECURITY_MULTITENANCY_ENABLED="${OPENSEARCH_SECURITY_MULTITENANCY_ENABLED:-false}"
-OPENSEARCH_SECURITY_READONLY_MODE_ROLES="${OPENSEARCH_SECURITY_READONLY_MODE_ROLES:-[\"kibana_read_only\"]}"
-SERVER_SSL_ENABLED="${SERVER_SSL_ENABLED:-true}"
-SERVER_SSL_KEY="${SERVER_SSL_KEY:-/etc/wazuh-dashboard/certs/dashboard-key.pem}"
-SERVER_SSL_CERTIFICATE="${SERVER_SSL_CERTIFICATE:-/etc/wazuh-dashboard/certs/dashboard.pem}"
-OPENSEARCH_SSL_CERTIFICATE_AUTHORITIES="${OPENSEARCH_SSL_CERTIFICATE_AUTHORITIES:-[/etc/wazuh-dashboard/certs/root-ca.pem]}"
-UI_SETTINGS_OVERRIDES_DEFAULT_ROUTE="${UI_SETTINGS_OVERRIDES_DEFAULT_ROUTE:-/app/wz-home}"
-OPENSEARCH_SECURITY_COOKIE_TTL="${OPENSEARCH_SECURITY_COOKIE_TTL:-900000}"
-OPENSEARCH_SECURITY_SESSION_TTL="${OPENSEARCH_SECURITY_SESSION_TTL:-900000}"
-OPENSEARCH_SECURITY_SESSION_KEEPALIVE="${OPENSEARCH_SECURITY_SESSION_KEEPALIVE:-true}"
-
-# Wazuh API configuration
-WAZUH_API_URL="${WAZUH_API_URL:-https://localhost}"
-API_PORT="${API_PORT:-55000}"
-API_USERNAME="${API_USERNAME:-wazuh-wui}"
-API_PASSWORD="${API_PASSWORD:-wazuh-wui}"
-RUN_AS="${RUN_AS:-true}"
-
-# Optional Wazuh app configurations
-PATTERN="${PATTERN:-}"
-CHECKS_PATTERN="${CHECKS_PATTERN:-}"
-CHECKS_TEMPLATE="${CHECKS_TEMPLATE:-}"
-CHECKS_API="${CHECKS_API:-}"
-CHECKS_SETUP="${CHECKS_SETUP:-}"
-APP_TIMEOUT="${APP_TIMEOUT:-}"
-API_SELECTOR="${API_SELECTOR:-}"
-IP_SELECTOR="${IP_SELECTOR:-}"
-IP_IGNORE="${IP_IGNORE:-}"
-WAZUH_MONITORING_ENABLED="${WAZUH_MONITORING_ENABLED:-}"
-WAZUH_MONITORING_FREQUENCY="${WAZUH_MONITORING_FREQUENCY:-}"
-WAZUH_MONITORING_SHARDS="${WAZUH_MONITORING_SHARDS:-}"
-WAZUH_MONITORING_REPLICAS="${WAZUH_MONITORING_REPLICAS:-}"
-
-# Configuration file path
-DASHBOARD_CONFIG_FILE="${DASHBOARD_CONFIG_FILE:-/usr/share/wazuh-dashboard/config/opensearch_dashboards.yml}"
-
-# Map of configuration keys to their values
-declare -A CONFIG_MAP=(
-    [server.host]="$SERVER_HOST"
-    [server.port]="$SERVER_PORT"
-    [opensearch.hosts]="$OPENSEARCH_HOSTS"
-    [opensearch.ssl.verificationMode]="$OPENSEARCH_SSL_VERIFICATION_MODE"
-    [opensearch.username]="$OPENSEARCH_USERNAME"
-    [opensearch.password]="$OPENSEARCH_PASSWORD"
-    [opensearch.requestHeadersAllowlist]="$OPENSEARCH_REQUEST_HEADERS_ALLOWLIST"
-    [opensearch_security.multitenancy.enabled]="$OPENSEARCH_SECURITY_MULTITENANCY_ENABLED"
-    [opensearch_security.readonly_mode.roles]="$OPENSEARCH_SECURITY_READONLY_MODE_ROLES"
-    [server.ssl.enabled]="$SERVER_SSL_ENABLED"
-    [server.ssl.key]="\"$SERVER_SSL_KEY\""
-    [server.ssl.certificate]="\"$SERVER_SSL_CERTIFICATE\""
-    [opensearch.ssl.certificateAuthorities]="$OPENSEARCH_SSL_CERTIFICATE_AUTHORITIES"
-    [uiSettings.overrides.defaultRoute]="$UI_SETTINGS_OVERRIDES_DEFAULT_ROUTE"
-    [opensearch_security.cookie.ttl]="$OPENSEARCH_SECURITY_COOKIE_TTL"
-    [opensearch_security.session.ttl]="$OPENSEARCH_SECURITY_SESSION_TTL"
-    [opensearch_security.session.keepalive]="$OPENSEARCH_SECURITY_SESSION_KEEPALIVE"
-    [pattern]="$PATTERN"
-    [checks.pattern]="$CHECKS_PATTERN"
-    [checks.template]="$CHECKS_TEMPLATE"
-    [checks.api]="$CHECKS_API"
-    [checks.setup]="$CHECKS_SETUP"
-    [timeout]="$APP_TIMEOUT"
-    [api.selector]="$API_SELECTOR"
-    [ip.selector]="$IP_SELECTOR"
-    [ip.ignore]="$IP_IGNORE"
-    [wazuh.monitoring.enabled]="$WAZUH_MONITORING_ENABLED"
-    [wazuh.monitoring.frequency]="$WAZUH_MONITORING_FREQUENCY"
-    [wazuh.monitoring.shards]="$WAZUH_MONITORING_SHARDS"
-    [wazuh.monitoring.replicas]="$WAZUH_MONITORING_REPLICAS"
-)
-
-# Replace configuration values in the dashboard config file
-for key in "${!CONFIG_MAP[@]}"; do
-    value="${CONFIG_MAP[$key]}"
-
-    # Skip empty values for optional configurations
-    if [ -z "$value" ]; then
-        continue
-    fi
-
-    # Escape special characters for sed
-    escaped_key=$(echo "$key" | sed 's/[.[\*^$()+?{|]/\\&/g')
-
-    # Try to replace existing line (commented or uncommented)
-    if grep -q "^[#[:space:]]*${escaped_key}:" "$DASHBOARD_CONFIG_FILE"; then
-        sed -i "s|^[#[:space:]]*${escaped_key}:.*|${key}: ${value}|" "$DASHBOARD_CONFIG_FILE"
-    fi
-done
-
-# Handle wazuh_core.hosts section separately
-if grep -q "^wazuh_core.hosts:" "$DASHBOARD_CONFIG_FILE"; then
-    # Update existing wazuh_core.hosts section
-    sed -i "/^wazuh_core.hosts:/,/^[^ ]/ {
-        s|url:.*|url: $WAZUH_API_URL|
-        s|port:.*|port: $API_PORT|
-        s|username:.*|username: $API_USERNAME|
-        s|password:.*|password: $API_PASSWORD|
-        s|run_as:.*|run_as: $RUN_AS|
-    }" "$DASHBOARD_CONFIG_FILE"
-fi

build-docker-images/wazuh-indexer/Dockerfile

@@ -2,104 +2,92 @@
 FROM amazonlinux:2023 AS builder
 
 ARG WAZUH_VERSION
-ARG TARGETARCH
-ARG wazuh_indexer_x86_64_rpm
-ARG wazuh_indexer_aarch64_rpm
-ARG wazuh_certs_tool
-ARG wazuh_config_yml
-ARG WAZUH_UID=101
-ARG WAZUH_GID=101
+ARG WAZUH_TAG_REVISION
 
-ENV USER="wazuh-indexer" \
-    GROUP="wazuh-indexer" \
-    NAME="wazuh-indexer" \
-    INSTALL_DIR="/usr/share/wazuh-indexer" 
+RUN yum install curl-minimal openssl xz tar findutils shadow-utils -y
+
+COPY config/check_repository.sh /
+RUN chmod 775 /check_repository.sh && \
+    source /check_repository.sh
+
+RUN yum install wazuh-indexer-${WAZUH_VERSION}-${WAZUH_TAG_REVISION} -y && \
+    yum clean all
+
+COPY config/opensearch.yml /
 
 COPY config/config.sh .
 
-RUN yum install curl-minimal shadow-utils findutils hostname -y && \
-    yum clean all && \
-    getent group $GROUP || groupadd -r -g ${WAZUH_GID} $GROUP && \
-    useradd --system \
-            --uid ${WAZUH_UID} \
-            --no-create-home \
-            --home-dir $INSTALL_DIR \
-            --gid ${WAZUH_GID} \
-            --shell /sbin/nologin \
-            --comment "$USER user" \
-            $USER && \
-    RPM_ARCH="x86_64" && \
-    if [ "${TARGETARCH}" = "arm64" ]; then RPM_ARCH="aarch64"; fi && \
-    URL_VAR="wazuh_indexer_${RPM_ARCH}_rpm" && \
-    indexer_url="${!URL_VAR}" && \
-    dnf install curl-minimal openssl xz tar findutils shadow-utils -y &&\
-    curl -o /wazuh-indexer.rpm "${indexer_url}" && \
-    dnf install /wazuh-indexer.rpm -y && \
-    rm -rf /wazuh-indexer.rpm && \
-    dnf clean all && \
-    bash config.sh
+COPY config/config.yml /
+
+RUN bash config.sh
 
 ################################################################################
 # Build stage 1 (the actual Wazuh indexer image):
 #
 # Copy wazuh-indexer from stage 0
 # Add entrypoint
+
 ################################################################################
 FROM amazonlinux:2023
 
-ARG WAZUH_UID=101
-ARG WAZUH_GID=101
-
 ENV USER="wazuh-indexer" \
     GROUP="wazuh-indexer" \
     NAME="wazuh-indexer" \
-    INSTALL_DIR="/usr/share/wazuh-indexer" 
-ENV ENGINE_DIR="$INSTALL_DIR/engine"
+    INSTALL_DIR="/usr/share/wazuh-indexer"
 
+# Set $JAVA_HOME
+RUN echo "export JAVA_HOME=$INSTALL_DIR/jdk" >> /etc/profile.d/java_home.sh && \
+    echo "export PATH=\$PATH:\$JAVA_HOME/bin" >> /etc/profile.d/java_home.sh
+ENV JAVA_HOME="$INSTALL_DIR/jdk"
+ENV PATH=$PATH:$JAVA_HOME/bin:$INSTALL_DIR/bin
 
-COPY config/entrypoint.sh /
-COPY config/securityadmin.sh /
+# Add k-NN lib directory to library loading path variable
+ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL_DIR/plugins/opensearch-knn/lib"
 
-RUN yum install curl-minimal shadow-utils findutils hostname -y && \
-    yum clean all && \
-    getent group $GROUP || groupadd -r -g ${WAZUH_GID} $GROUP && \
-    useradd --system \
-            --uid ${WAZUH_UID} \
+RUN yum install curl-minimal shadow-utils findutils hostname -y
+
+RUN getent group $GROUP || groupadd -r -g 1000 $GROUP
+
+RUN useradd --system \
+            --uid 1000 \
             --no-create-home \
             --home-dir $INSTALL_DIR \
-            --gid ${WAZUH_GID} \
+            --gid $GROUP \
             --shell /sbin/nologin \
             --comment "$USER user" \
-            $USER && \
-    chmod 700 /entrypoint.sh && chmod 700 /securityadmin.sh && \
-    mkdir -p $INSTALL_DIR && \
-    chown ${WAZUH_UID}:${WAZUH_GID} $INSTALL_DIR && \
-    chown ${WAZUH_UID}:${WAZUH_GID} /*.sh && \
-    mkdir -p /var/lib/wazuh-indexer && chown ${WAZUH_UID}:${WAZUH_GID} /var/lib/wazuh-indexer && \
-    mkdir -p $INSTALL_DIR/logs && chown ${WAZUH_UID}:${WAZUH_GID} $INSTALL_DIR/logs && \
-    mkdir -p /run/wazuh-indexer && chown ${WAZUH_UID}:${WAZUH_GID} /run/wazuh-indexer && \
-    mkdir -p /var/log/wazuh-indexer && chown ${WAZUH_UID}:${WAZUH_GID} /var/log/wazuh-indexer
+            $USER
 
-COPY --from=builder $INSTALL_DIR $INSTALL_DIR
+WORKDIR $INSTALL_DIR
 
-RUN chmod 700 $INSTALL_DIR && \
-    chmod 700 $INSTALL_DIR/config && \
-    chmod 600 $INSTALL_DIR/config/jvm.options && \
-    chmod 600 $INSTALL_DIR/config/opensearch.yml && \
-    if [ -d "$ENGINE_DIR" ]; then \
-    find "$ENGINE_DIR" -type d -exec chmod 750 {} + && \
-    find "$ENGINE_DIR" -type f -exec chmod 640 {} + && \
-    { [ -f "$ENGINE_DIR/run_engine.sh" ] && chmod 750 "$ENGINE_DIR/run_engine.sh" || true; } && \
-    { [ -f "$ENGINE_DIR/bin/wazuh-engine" ] && chmod 750 "$ENGINE_DIR/bin/wazuh-engine" || true; } && \
-    { [ -d "$ENGINE_DIR/sockets" ] && chmod 777 "$ENGINE_DIR/sockets" || true; }; \
-    fi
+COPY config/entrypoint.sh /
+
+COPY config/securityadmin.sh /
+
+RUN chmod 700 /entrypoint.sh && chmod 700 /securityadmin.sh
+
+RUN chown 1000:1000 /*.sh
+
+COPY --from=builder --chown=1000:1000 /usr/share/wazuh-indexer /usr/share/wazuh-indexer
+COPY --from=builder --chown=1000:1000 /etc/wazuh-indexer /usr/share/wazuh-indexer
+COPY --from=builder --chown=0:0 /debian/wazuh-indexer/usr/lib/systemd /usr/lib/systemd
+COPY --from=builder --chown=0:0 /debian/wazuh-indexer/usr/lib/sysctl.d /usr/lib/sysctl.d
+COPY --from=builder --chown=0:0 /debian/wazuh-indexer/usr/lib/tmpfiles.d /usr/lib/tmpfiles.d
+
+RUN chown -R 1000:1000 /usr/share/wazuh-indexer
+
+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 && \
+    chmod 600 /usr/share/wazuh-indexer/jvm.options && \
+    chmod 600 /usr/share/wazuh-indexer/opensearch.yml
 
 USER wazuh-indexer
-WORKDIR $INSTALL_DIR
 
 # Services ports
 EXPOSE 9200
 
 ENTRYPOINT ["/entrypoint.sh"]
 # Dummy overridable parameter parsed by entrypoint
-CMD ["opensearch"]
+CMD ["opensearchwrapper"]

build-docker-images/wazuh-indexer/config/check_repository.sh

@@ -0,0 +1,15 @@
+## variables
+APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH
+GPG_SIGN="gpgcheck=1\ngpgkey=${APT_KEY}]"
+REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1"
+WAZUH_TAG=$(curl --silent https://api.github.com/repos/wazuh/wazuh/git/refs/tags | grep '["]ref["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/'  | cut -c 11- | grep ^v${WAZUH_VERSION}$)
+
+## check tag to use the correct repository
+if [[ -n "${WAZUH_TAG}" ]]; then
+  APT_KEY=https://packages.wazuh.com/key/GPG-KEY-WAZUH
+  GPG_SIGN="gpgcheck=1\ngpgkey=${APT_KEY}]"
+  REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages.wazuh.com/5.x/yum/\nprotect=1"
+fi
+
+rpm --import "${APT_KEY}"
+echo -e "${REPOSITORY}" | tee /etc/yum.repos.d/wazuh.repo

build-docker-images/wazuh-indexer/config/config.sh

@@ -3,23 +3,100 @@
 export DH_OPTIONS
 
 export NAME=wazuh-indexer
+export TARGET_DIR=${CURDIR}/debian/${NAME}
 
 # Package build options
 export USER=${NAME}
 export GROUP=${NAME}
+export VERSION=${WAZUH_VERSION}-${WAZUH_TAG_REVISION}
+export LOG_DIR=/var/log/${NAME}
+export LIB_DIR=/var/lib/${NAME}
+export PID_DIR=/run/${NAME}
 export INSTALLATION_DIR=/usr/share/${NAME}
-export CONFIG_DIR=${INSTALLATION_DIR}/config
+export CONFIG_DIR=${INSTALLATION_DIR}
+export BASE_DIR=${NAME}-*
+export INDEXER_FILE=wazuh-indexer-base.tar.xz
+export BASE_FILE=wazuh-indexer-base-${VERSION}-linux-x64.tar.xz
+export REPO_DIR=/unattended_installer
 
-# Modify opensearch.yml config paths
-if [ -d "/etc/wazuh-indexer" ]; then
-    mkdir -p ${CONFIG_DIR}
-    chown ${USER}:${GROUP} ${CONFIG_DIR}
-    mkdir -p ${CONFIG_DIR}/certs
-    chown ${USER}:${GROUP} ${CONFIG_DIR}/certs
-    mv /etc/wazuh-indexer/* ${CONFIG_DIR}/
-    rmdir /etc/wazuh-indexer
+## Variables
+CERT_TOOL=wazuh-certs-tool.sh
+PASSWORD_TOOL=wazuh-passwords-tool.sh
+PACKAGES_URL=https://packages.wazuh.com/6.0/
+PACKAGES_DEV_URL=https://packages-dev.wazuh.com/6.0/
+
+## Check if the cert tool exists in S3 buckets
+CERT_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$CERT_TOOL | grep -E "^HTTP" | awk  '{print $2}')
+CERT_TOOL_PACKAGES_DEV=$(curl --silent -I $PACKAGES_DEV_URL$CERT_TOOL | grep -E "^HTTP" | awk  '{print $2}')
+
+## If cert tool exists in some bucket, download it, if not exit 1
+if [ "$CERT_TOOL_PACKAGES" = "200" ]; then
+  curl -o $CERT_TOOL $PACKAGES_URL$CERT_TOOL
+  echo "Cert tool exists in Packages bucket"
+elif [ "$CERT_TOOL_PACKAGES_DEV" = "200" ]; then
+  curl -o $CERT_TOOL $PACKAGES_DEV_URL$CERT_TOOL
+  echo "Cert tool exists in Packages-dev bucket"
+else
+  echo "Cert tool does not exist in any bucket"
+  exit 1
 fi
-sed -i "s|/etc/wazuh-indexer|${CONFIG_DIR}|g" ${CONFIG_DIR}/opensearch.yml
 
-sed -i 's/-Djava.security.policy=file:\/\/\/etc\/wazuh-indexer\/opensearch-performance-analyzer\/opensearch_security.policy/-Djava.security.policy=file:\/\/\/usr\/share\/wazuh-indexer\/opensearch-performance-analyzer\/opensearch_security.policy/g' ${CONFIG_DIR}/jvm.options
 
+## Check if the password tool exists in S3 buckets
+PASSWORD_TOOL_PACKAGES=$(curl --silent -I $PACKAGES_URL$PASSWORD_TOOL | grep -E "^HTTP" | awk  '{print $2}')
+PASSWORD_TOOL_PACKAGES_DEV=$(curl --silent -I $PACKAGES_DEV_URL$PASSWORD_TOOL | grep -E "^HTTP" | awk  '{print $2}')
+
+## If password tool exists in some bucket, download it, if not exit 1
+if [ "$PASSWORD_TOOL_PACKAGES" = "200" ]; then
+  curl -o $PASSWORD_TOOL $PACKAGES_URL$PASSWORD_TOOL
+  echo "Password tool exists in Packages bucket"
+elif [ "$PASSWORD_TOOL_PACKAGES_DEV" = "200" ]; then
+  curl -o $PASSWORD_TOOL $PACKAGES_DEV_URL$PASSWORD_TOOL
+  echo "Password tool exists in Packages-dev bucket"
+else
+  echo "Password tool does not exist in any bucket"
+  exit 1
+fi
+
+chmod 755 $CERT_TOOL && bash /$CERT_TOOL -A
+
+# copy to target
+mkdir -p ${TARGET_DIR}${INSTALLATION_DIR}
+mkdir -p ${TARGET_DIR}${INSTALLATION_DIR}/opensearch-security/
+mkdir -p ${TARGET_DIR}${CONFIG_DIR}
+mkdir -p ${TARGET_DIR}${LIB_DIR}
+mkdir -p ${TARGET_DIR}${LOG_DIR}
+mkdir -p ${TARGET_DIR}/etc/init.d
+mkdir -p ${TARGET_DIR}/etc/default
+mkdir -p ${TARGET_DIR}/usr/lib/tmpfiles.d
+mkdir -p ${TARGET_DIR}/usr/lib/sysctl.d
+mkdir -p ${TARGET_DIR}/usr/lib/systemd/system
+mkdir -p ${TARGET_DIR}${CONFIG_DIR}/certs
+# Copy Wazuh's config files for the security plugin
+cp -pr /roles_mapping.yml ${TARGET_DIR}${INSTALLATION_DIR}/opensearch-security/
+cp -pr /roles.yml ${TARGET_DIR}${INSTALLATION_DIR}/opensearch-security/
+cp -pr /action_groups.yml ${TARGET_DIR}${INSTALLATION_DIR}/opensearch-security/
+cp -pr /internal_users.yml ${TARGET_DIR}${INSTALLATION_DIR}/opensearch-security/
+cp -pr /opensearch.yml ${TARGET_DIR}${CONFIG_DIR}
+# Copy Wazuh indexer's certificates
+cp -pr /wazuh-certificates/demo.indexer.pem ${TARGET_DIR}${CONFIG_DIR}/certs/indexer.pem
+cp -pr /wazuh-certificates/demo.indexer-key.pem ${TARGET_DIR}${CONFIG_DIR}/certs/indexer-key.pem
+cp -pr /wazuh-certificates/root-ca.key ${TARGET_DIR}${CONFIG_DIR}/certs/root-ca.key
+cp -pr /wazuh-certificates/root-ca.pem ${TARGET_DIR}${CONFIG_DIR}/certs/root-ca.pem
+cp -pr /wazuh-certificates/admin.pem ${TARGET_DIR}${CONFIG_DIR}/certs/admin.pem
+cp -pr /wazuh-certificates/admin-key.pem ${TARGET_DIR}${CONFIG_DIR}/certs/admin-key.pem
+
+# Delete xms and xmx parameters in jvm.options
+sed '/-Xms/d' -i /etc/wazuh-indexer/jvm.options
+sed '/-Xmx/d' -i /etc/wazuh-indexer/jvm.options
+sed -i 's/-Djava.security.policy=file:\/\/\/etc\/wazuh-indexer\/opensearch-performance-analyzer\/opensearch_security.policy/-Djava.security.policy=file:\/\/\/usr\/share\/wazuh-indexer\/opensearch-performance-analyzer\/opensearch_security.policy/g' /etc/wazuh-indexer/jvm.options
+
+
+chmod -R 500 ${TARGET_DIR}${CONFIG_DIR}/certs
+chmod -R 400 ${TARGET_DIR}${CONFIG_DIR}/certs/*
+
+find ${TARGET_DIR} -type d -exec chmod 750 {} \;
+find ${TARGET_DIR} -type f -perm 644 -exec chmod 640 {} \;
+find ${TARGET_DIR} -type f -perm 664 -exec chmod 660 {} \;
+find ${TARGET_DIR} -type f -perm 755 -exec chmod 750 {} \;
+find ${TARGET_DIR} -type f -perm 744 -exec chmod 740 {} \;

build-docker-images/wazuh-indexer/config/config.yml

@@ -0,0 +1,5 @@
+nodes:
+  # Wazuh indexer server nodes
+  indexer:
+    - name: demo.indexer
+      ip: demo.indexer

build-docker-images/wazuh-indexer/config/entrypoint.sh

@@ -1,115 +1,378 @@
-#!/bin/bash
+#!/usr/bin/env bash
+# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
+set -e
 
-# Copyright OpenSearch Contributors
-# SPDX-License-Identifier: Apache-2.0
+umask 0002
 
-# This script specify the entrypoint startup actions for opensearch
-# It will start both opensearch and performance analyzer plugin cli
-# If either process failed, the entire docker container will be removed
-# in favor of a newly started container
+export USER=wazuh-indexer
+export INSTALLATION_DIR=/usr/share/wazuh-indexer
+export OPENSEARCH_PATH_CONF=${INSTALLATION_DIR}
+export CACERT=$(grep -oP "(?<=plugins.security.ssl.transport.pemtrustedcas_filepath: ).*" ${OPENSEARCH_PATH_CONF}/opensearch.yml)
+export CERT="${OPENSEARCH_PATH_CONF}/certs/admin.pem"
+export KEY="${OPENSEARCH_PATH_CONF}/certs/admin-key.pem"
 
-# Export OpenSearch Home
-export OPENSEARCH_HOME=/usr/share/wazuh-indexer
-export OPENSEARCH_PATH_CONF=$OPENSEARCH_HOME/config
-export CONFIG_FILE=${OPENSEARCH_PATH_CONF}/opensearch.yml
-export PATH=$OPENSEARCH_HOME/bin:$PATH
+opensearch_vars=(
+    cluster.name
+    node.name
+    node.roles
+    path.data
+    path.logs
+    bootstrap.memory_lock
+    network.host
+    http.port
+    transport.port
+    network.bind_host
+    network.publish_host
+    transport.tcp.port
+    compatibility.override_main_response_version
+    http.host
+    http.bind_host
+    http.publish_host
+    http.compression
+    transport.host
+    transport.bind_host
+    transport.publish_host
+    discovery.seed_hosts
+    discovery.seed_providers
+    discovery.type
+    cluster.initial_cluster_manager_nodes
+    cluster.initial_master_nodes
+    node.max_local_storage_nodes
+    gateway.recover_after_nodes
+    gateway.recover_after_data_nodes
+    gateway.expected_data_nodes
+    gateway.recover_after_time
+    plugins.security.nodes_dn
+    plugins.security.nodes_dn_dynamic_config_enabled
+    plugins.security.authcz.admin_dn
+    plugins.security.roles_mapping_resolution
+    plugins.security.dls.mode
+    plugins.security.compliance.salt
+    config.dynamic.http.anonymous_auth_enabled
+    plugins.security.restapi.roles_enabled
+    plugins.security.restapi.password_validation_regex
+    plugins.security.restapi.password_validation_error_message
+    plugins.security.restapi.password_min_length
+    plugins.security.restapi.password_score_based_validation_strength
+    plugins.security.unsupported.restapi.allow_securityconfig_modification
+    plugins.security.authcz.impersonation_dn
+    plugins.security.authcz.rest_impersonation_user
+    plugins.security.allow_default_init_securityindex
+    plugins.security.allow_unsafe_democertificates
+    plugins.security.system_indices.permission.enabled
+    plugins.security.config_index_name
+    plugins.security.cert.oid
+    plugins.security.cert.intercluster_request_evaluator_class
+    plugins.security.enable_snapshot_restore_privilege
+    plugins.security.check_snapshot_restore_write_privileges
+    plugins.security.cache.ttl_minutes
+    plugins.security.protected_indices.enabled
+    plugins.security.protected_indices.roles
+    plugins.security.protected_indices.indices
+    plugins.security.system_indices.enabled
+    plugins.security.system_indices.indices
+    plugins.security.audit.enable_rest
+    plugins.security.audit.enable_transport
+    plugins.security.audit.resolve_bulk_requests
+    plugins.security.audit.config.disabled_categories
+    plugins.security.audit.ignore_requests
+    plugins.security.audit.threadpool.size
+    plugins.security.audit.threadpool.max_queue_len
+    plugins.security.audit.ignore_users
+    plugins.security.audit.type
+    plugins.security.audit.config.http_endpoints
+    plugins.security.audit.config.index
+    plugins.security.audit.config.type
+    plugins.security.audit.config.username
+    plugins.security.audit.config.password
+    plugins.security.audit.config.enable_ssl
+    plugins.security.audit.config.verify_hostnames
+    plugins.security.audit.config.enable_ssl_client_auth
+    plugins.security.audit.config.cert_alias
+    plugins.security.audit.config.pemkey_filepath
+    plugins.security.audit.config.pemkey_content
+    plugins.security.audit.config.pemkey_password
+    plugins.security.audit.config.pemcert_filepath
+    plugins.security.audit.config.pemcert_content
+    plugins.security.audit.config.pemtrustedcas_filepath
+    plugins.security.audit.config.pemtrustedcas_content
+    plugins.security.audit.config.webhook.url
+    plugins.security.audit.config.webhook.format
+    plugins.security.audit.config.webhook.ssl.verify
+    plugins.security.audit.config.webhook.ssl.pemtrustedcas_filepath
+    plugins.security.audit.config.webhook.ssl.pemtrustedcas_content
+    plugins.security.audit.config.log4j.logger_name
+    plugins.security.audit.config.log4j.level
+    opendistro_security.audit.config.disabled_rest_categories
+    opendistro_security.audit.config.disabled_transport_categories
+    plugins.security.ssl.transport.enforce_hostname_verification
+    plugins.security.ssl.transport.resolve_hostname
+    plugins.security.ssl.http.clientauth_mode
+    plugins.security.ssl.http.enabled_ciphers
+    plugins.security.ssl.http.enabled_protocols
+    plugins.security.ssl.transport.enabled_ciphers
+    plugins.security.ssl.transport.enabled_protocols
+    plugins.security.ssl.transport.keystore_type
+    plugins.security.ssl.transport.keystore_filepath
+    plugins.security.ssl.transport.keystore_alias
+    plugins.security.ssl.transport.keystore_password
+    plugins.security.ssl.transport.truststore_type
+    plugins.security.ssl.transport.truststore_filepath
+    plugins.security.ssl.transport.truststore_alias
+    plugins.security.ssl.transport.truststore_password
+    plugins.security.ssl.http.enabled
+    plugins.security.ssl.http.keystore_type
+    plugins.security.ssl.http.keystore_filepath
+    plugins.security.ssl.http.keystore_alias
+    plugins.security.ssl.http.keystore_password
+    plugins.security.ssl.http.truststore_type
+    plugins.security.ssl.http.truststore_filepath
+    plugins.security.ssl.http.truststore_alias
+    plugins.security.ssl.http.truststore_password
+    plugins.security.ssl.transport.enable_openssl_if_available
+    plugins.security.ssl.http.enable_openssl_if_available
+    plugins.security.ssl.transport.pemkey_filepath
+    plugins.security.ssl.transport.pemkey_password
+    plugins.security.ssl.transport.pemcert_filepath
+    plugins.security.ssl.transport.pemtrustedcas_filepath
+    plugins.security.ssl.http.pemkey_filepath
+    plugins.security.ssl.http.pemkey_password
+    plugins.security.ssl.http.pemcert_filepath
+    plugins.security.ssl.http.pemtrustedcas_filepath
+    plugins.security.ssl.transport.enabled
+    plugins.security.ssl.transport.client.pemkey_password
+    plugins.security.ssl.transport.keystore_keypassword
+    plugins.security.ssl.transport.server.keystore_keypassword
+    plugins.sercurity.ssl.transport.server.keystore_alias
+    plugins.sercurity.ssl.transport.client.keystore_alias
+    plugins.sercurity.ssl.transport.server.truststore_alias
+    plugins.sercurity.ssl.transport.client.truststore_alias
+    plugins.security.ssl.client.external_context_id
+    plugins.secuirty.ssl.transport.principal_extractor_class
+    plugins.security.ssl.http.crl.file_path
+    plugins.security.ssl.http.crl.validate
+    plugins.security.ssl.http.crl.prefer_crlfile_over_ocsp
+    plugins.security.ssl.http.crl.check_only_end_entitites
+    plugins.security.ssl.http.crl.disable_ocsp
+    plugins.security.ssl.http.crl.disable_crldp
+    plugins.security.ssl.allow_client_initiated_renegotiation
+    indices.breaker.total.use_real_memory
+    indices.breaker.total.limit
+    indices.breaker.fielddata.limit
+    indices.breaker.fielddata.overhead
+    indices.breaker.request.limit
+    indices.breaker.request.overhead
+    network.breaker.inflight_requests.limit
+    network.breaker.inflight_requests.overhead
+    cluster.routing.allocation.enable
+    cluster.routing.allocation.node_concurrent_incoming_recoveries
+    cluster.routing.allocation.node_concurrent_outgoing_recoveries
+    cluster.routing.allocation.node_concurrent_recoveries
+    cluster.routing.allocation.node_initial_primaries_recoveries
+    cluster.routing.allocation.same_shard.host
+    cluster.routing.rebalance.enable
+    cluster.routing.allocation.allow_rebalance
+    cluster.routing.allocation.cluster_concurrent_rebalance
+    cluster.routing.allocation.balance.shard
+    cluster.routing.allocation.balance.index
+    cluster.routing.allocation.balance.threshold
+    cluster.routing.allocation.balance.prefer_primary
+    cluster.routing.allocation.disk.threshold_enabled
+    cluster.routing.allocation.disk.watermark.low
+    cluster.routing.allocation.disk.watermark.high
+    cluster.routing.allocation.disk.watermark.flood_stage
+    cluster.info.update.interval
+    cluster.routing.allocation.shard_movement_strategy
+    cluster.blocks.read_only
+    cluster.blocks.read_only_allow_delete
+    cluster.max_shards_per_node
+    cluster.persistent_tasks.allocation.enable
+    cluster.persistent_tasks.allocation.recheck_interval
+    cluster.search.request.slowlog.threshold.warn
+    cluster.search.request.slowlog.threshold.info
+    cluster.search.request.slowlog.threshold.debug
+    cluster.search.request.slowlog.threshold.trace
+    cluster.search.request.slowlog.level
+    cluster.fault_detection.leader_check.timeout
+    cluster.fault_detection.follower_check.timeout
+    action.auto_create_index
+    action.destructive_requires_name
+    cluster.default.index.refresh_interval
+    cluster.minimum.index.refresh_interval
+    cluster.indices.close.enable
+    indices.recovery.max_bytes_per_sec
+    indices.recovery.max_concurrent_file_chunks
+    indices.recovery.max_concurrent_operations
+    indices.recovery.max_concurrent_remote_store_streams
+    indices.time_series_index.default_index_merge_policy
+    indices.fielddata.cache.size
+    index.number_of_shards
+    index.number_of_routing_shards
+    index.shard.check_on_startup
+    index.codec
+    index.codec.compression_level
+    index.routing_partition_size
+    index.soft_deletes.retention_lease.period
+    index.load_fixed_bitset_filters_eagerly
+    index.hidden
+    index.merge.policy
+    index.merge_on_flush.enabled
+    index.merge_on_flush.max_full_flush_merge_wait_time
+    index.merge_on_flush.policy
+    index.check_pending_flush.enabled
+    index.number_of_replicas
+    index.auto_expand_replicas
+    index.search.idle.after
+    index.refresh_interval
+    index.max_result_window
+    index.max_inner_result_window
+    index.max_rescore_window
+    index.max_docvalue_fields_search
+    index.max_script_fields
+    index.max_ngram_diff
+    index.max_shingle_diff
+    index.max_refresh_listeners
+    index.analyze.max_token_count
+    index.highlight.max_analyzed_offset
+    index.max_terms_count
+    index.max_regex_length
+    index.query.default_field
+    index.query.max_nested_depth
+    index.routing.allocation.enable
+    index.routing.rebalance.enable
+    index.gc_deletes
+    index.default_pipeline
+    index.final_pipeline
+    index.optimize_doc_id_lookup.fuzzy_set.enabled
+    index.optimize_doc_id_lookup.fuzzy_set.false_positive_probability
+    search.max_buckets
+    search.phase_took_enabled
+    search.allow_expensive_queries
+    search.default_allow_partial_results
+    search.cancel_after_time_interval
+    search.default_search_timeout
+    search.default_keep_alive
+    search.keep_alive_interval
+    search.max_keep_alive
+    search.low_level_cancellation
+    search.max_open_scroll_context
+    search.request_stats_enabled
+    search.highlight.term_vector_multi_value
+    snapshot.max_concurrent_operations
+    cluster.remote_store.translog.buffer_interval
+    remote_store.moving_average_window_size
+    opensearch.notifications.core.allowed_config_types
+    opensearch.notifications.core.email.minimum_header_length
+    opensearch.notifications.core.email.size_limit
+    opensearch.notifications.core.http.connection_timeout
+    opensearch.notifications.core.http.host_deny_list
+    opensearch.notifications.core.http.max_connection_per_route
+    opensearch.notifications.core.http.max_connections
+    opensearch.notifications.core.http.socket_timeout
+    opensearch.notifications.core.tooltip_support
+    opensearch.notifications.general.filter_by_backend_roles
+)
 
+run_as_other_user_if_needed() {
+  if [[ "$(id -u)" == "0" ]]; then
+    # If running as root, drop to specified UID and run command
+    exec chroot --userspec=1000:0 / "${@}"
+  else
+    # Either we are running in Openshift with random uid and are a member of the root group
+    # or with a custom --user
+    exec "${@}"
+  fi
+}
 
-# The virtual file /proc/self/cgroup should list the current cgroup
-# membership. For each hierarchy, you can follow the cgroup path from
-# this file to the cgroup filesystem (usually /sys/fs/cgroup/) and
-# introspect the statistics for the cgroup for the given
-# hierarchy. Alas, Docker breaks this by mounting the container
-# statistics at the root while leaving the cgroup paths as the actual
-# paths. Therefore, OpenSearch provides a mechanism to override
-# reading the cgroup path from /proc/self/cgroup and instead uses the
-# cgroup path defined the JVM system property
-# opensearch.cgroups.hierarchy.override. Therefore, we set this value here so
-# that cgroup statistics are available for the container this process
-# will run in.
-export OPENSEARCH_JAVA_OPTS="-Dopensearch.cgroups.hierarchy.override=/ $OPENSEARCH_JAVA_OPTS"
-
-# Start up the opensearch and performance analyzer agent processes.
-# When either of them halts, this script exits, or we receive a SIGTERM or SIGINT signal then we want to kill both these processes.
-function runOpensearch {
-    # Files created by OpenSearch should always be group writable too
-    umask 0002
-
-    if [[ "$(id -u)" == "0" ]]; then
-        echo "Wazuh indexer cannot run as root. Please start your container as another user."
-        exit 1
-    fi
-
-    # Parse Docker env vars to customize Wazuh indexer / OpenSearch configuration
-    #
-    # e.g. Setting the env var cluster.name=testcluster
-    # will cause Wazuh indexer to be invoked with -Ecluster.name=testcluster
-    opensearch_opts=()
-    while IFS='=' read -r envvar_key envvar_value
-    do
-        # OpenSearch settings need to have at least two dot separated lowercase
-        # words, e.g. `cluster.name`, except for `processors` which we handle
-        # specially
-        if [[ "$envvar_key" =~ ^[a-z0-9_]+\.[a-z0-9_]+ || "$envvar_key" == "processors" ]]; then
-            if [[ ! -z $envvar_value ]]; then
-            opensearch_opt="-E${envvar_key}=${envvar_value}"
-            opensearch_opts+=("${opensearch_opt}")
-            fi
+function buildOpensearchConfig {
+    echo "" >> $OPENSEARCH_PATH_CONF/opensearch.yml
+      for opensearch_var in ${opensearch_vars[*]}; do
+        env_var=$(echo ${opensearch_var^^} | tr . _)
+        value=${!env_var}
+        if [[ -n $value ]]; then
+          if grep -q $opensearch_var $OPENSEARCH_PATH_CONF/opensearch.yml; then
+            lineNum="$(grep -n "$opensearch_var" $OPENSEARCH_PATH_CONF/opensearch.yml | head -n 1 | cut -d: -f1)"
+            sed -i "${lineNum}d" $OPENSEARCH_PATH_CONF/opensearch.yml
+            charline=$(awk "NR == ${lineNum}" $OPENSEARCH_PATH_CONF/opensearch.yml | head -c 1)
+          fi
+          while :
+          do
+            case "$charline" in
+              "-"| "#" |" ") sed -i "${lineNum}d" $OPENSEARCH_PATH_CONF/opensearch.yml;;
+              *) break;;
+            esac
+            charline=$(awk "NR == ${lineNum}" $OPENSEARCH_PATH_CONF/opensearch.yml | head -c 1)
+          done
+          longoptfile="${opensearch_var}: ${value}"
+          if grep -q $opensearch_var $OPENSEARCH_PATH_CONF/opensearch.yml; then
+            sed -i "/${opensearch_var}/ s|^.*$|${longoptfile}|" $OPENSEARCH_PATH_CONF/opensearch.yml
+          else
+            echo $longoptfile >> $OPENSEARCH_PATH_CONF/opensearch.yml
+          fi
         fi
-    done < <(env)
-
-    # Start Wazuh Engine
-    if [ -x "$OPENSEARCH_HOME/engine/run_engine.sh" ]; then
-        nohup "$OPENSEARCH_HOME/engine/run_engine.sh" > /dev/null 2>&1 &
-        echo $! > /run/wazuh-indexer/wazuh-engine.pid
-    fi
-
-    # Start opensearch
-    exec "$@" "${opensearch_opts[@]}"
-
+      done
 }
 
-function configureOpensearch {
-# Update opensearch.yml with NODES_DN if set
-if [ -n "$NODES_DN" ]; then
+buildOpensearchConfig
 
-  CLEAN_NODES_DN=$(echo "$NODES_DN" | sed 's/^["'\'']//; s/["'\'']$//; s/""/"/g')
-  NODES_DN_YAML=$(echo $CLEAN_NODES_DN | tr ';' '\n' | sed 's/^/- "/; s/$/"/')
-
-  awk '
-    /^plugins\.security\.nodes_dn:/ {in_block=1; print; next}
-    in_block && /^[^#[:space:]-]/ {in_block=0}
-    !in_block || /^plugins\.security\.nodes_dn:/ {next}
-    {print}
-  ' "$CONFIG_FILE" > "${CONFIG_FILE}.tmp"
-
-  awk -v repl="$NODES_DN_YAML" '
-    /^plugins\.security\.nodes_dn:/ {
-      print "plugins.security.nodes_dn:";
-      print repl;
-      skip=1; next
-    }
-    skip && /^[^#[:space:]-]/ {skip=0}
-    !skip
-  ' "${CONFIG_FILE}" > "${CONFIG_FILE}.new"
-  mv "${CONFIG_FILE}.new" "$CONFIG_FILE"
-  rm -f "${CONFIG_FILE}.tmp"
-fi
-}
-
-# Prepend "opensearch" command if no argument was provided or if the first
-# argument looks like a flag (i.e. starts with a dash).
-
-configureOpensearch
-
-if [ $# -eq 0 ] || [ "${1:0:1}" = '-' ]; then
-    set -- opensearch "$@"
-fi
-
-if [ "$1" = "opensearch" ]; then
-    # If the first argument is opensearch, then run the setup script.
-    runOpensearch "$@"
-else
-    # Otherwise, just exec the command.
+# Allow user specify custom CMD, maybe bin/opensearch itself
+# for example to directly specify `-E` style parameters for opensearch on k8s
+# or simply to run /bin/bash to check the image
+if [[ "$1" != "opensearchwrapper" ]]; then
+  if [[ "$(id -u)" == "0" && $(basename "$1") == "opensearch" ]]; then
+    # Rewrite CMD args to replace $1 with `opensearch` explicitly,
+    # Without this, user could specify `opensearch -E x.y=z` but
+    # `bin/opensearch -E x.y=z` would not work.
+    set -- "opensearch" "${@:2}"
+    # Use chroot to switch to UID 1000 / GID 0
+    exec chroot --userspec=1000:0 / "$@"
+  else
+    # User probably wants to run something else, like /bin/bash, with another uid forced (Openshift?)
     exec "$@"
-fi
+  fi
+fi
+
+# Allow environment variables to be set by creating a file with the
+# contents, and setting an environment variable with the suffix _FILE to
+# point to it. This can be used to provide secrets to a container, without
+# the values being specified explicitly when running the container.
+#
+# This is also sourced in opensearch-env, and is only needed here
+# as well because we use INDEXER_PASSWORD below. Sourcing this script
+# is idempotent.
+source /usr/share/wazuh-indexer/bin/opensearch-env-from-file
+
+if [[ -f bin/opensearch-users ]]; then
+  # Check for the INDEXER_PASSWORD environment variable to set the
+  # bootstrap password for Security.
+  #
+  # This is only required for the first node in a cluster with Security
+  # enabled, but we have no way of knowing which node we are yet. We'll just
+  # honor the variable if it's present.
+  if [[ -n "$INDEXER_PASSWORD" ]]; then
+    [[ -f /usr/share/wazuh-indexer/opensearch.keystore ]] || (run_as_other_user_if_needed opensearch-keystore create)
+    if ! (run_as_other_user_if_needed opensearch-keystore has-passwd --silent) ; then
+      # keystore is unencrypted
+      if ! (run_as_other_user_if_needed opensearch-keystore list | grep -q '^bootstrap.password$'); then
+        (run_as_other_user_if_needed echo "$INDEXER_PASSWORD" | opensearch-keystore add -x 'bootstrap.password')
+      fi
+    else
+      # keystore requires password
+      if ! (run_as_other_user_if_needed echo "$KEYSTORE_PASSWORD" \
+          | opensearch-keystore list | grep -q '^bootstrap.password$') ; then
+        COMMANDS="$(printf "%s\n%s" "$KEYSTORE_PASSWORD" "$INDEXER_PASSWORD")"
+        (run_as_other_user_if_needed echo "$COMMANDS" | opensearch-keystore add -x 'bootstrap.password')
+      fi
+    fi
+  fi
+fi
+
+if [[ "$(id -u)" == "0" ]]; then
+  # If requested and running as root, mutate the ownership of bind-mounts
+  if [[ -n "$TAKE_FILE_OWNERSHIP" ]]; then
+    chown -R 1000:0 /usr/share/wazuh-indexer/{data,logs}
+  fi
+fi
+
+
+run_as_other_user_if_needed /usr/share/wazuh-indexer/bin/opensearch <<<"$KEYSTORE_PASSWORD"

build-docker-images/wazuh-manager/Dockerfile

@@ -1,101 +1,68 @@
 # Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
-
-################################################################################
-# Build stage 0 (builder):
-# Install Wazuh Manager RPM, configure directories, prepare permanent data,
-# and download tini (static PID-1 init shim).
-################################################################################
-FROM amazonlinux:2023 AS builder
-
-ARG WAZUH_VERSION
-ARG TINI_VERSION="v0.19.0"
-ARG TARGETARCH
-ARG wazuh_manager_x86_64_rpm
-ARG wazuh_manager_aarch64_rpm
-ARG WAZUH_UID=101
-ARG WAZUH_GID=101
-
-# Prepare permanent data config needed by permanent_data.sh at build time
-COPY config/permanent_data.env config/permanent_data.sh /
-
-RUN dnf install openssl findutils procps shadow-utils -y && \
-    dnf clean all && \
-    getent group wazuh-manager || groupadd -r -g ${WAZUH_GID} wazuh-manager && \
-    getent passwd wazuh-manager || useradd --system \
-        --no-create-home \
-        --home-dir /var/wazuh-manager \
-        --uid ${WAZUH_UID} \
-        --gid ${WAZUH_GID} \
-        --shell /sbin/nologin \
-        wazuh-manager && \
-    RPM_ARCH="x86_64" && \
-    if [ "${TARGETARCH}" = "arm64" ]; then RPM_ARCH="aarch64"; fi && \
-    URL_VAR="wazuh_manager_${RPM_ARCH}_rpm" && \
-    manager_url="${!URL_VAR}" && \
-    dnf install curl-minimal xz gnupg tar gzip -y && \
-    dnf clean all && \
-    curl -o /wazuh-manager.rpm "${manager_url}" && \
-    dnf install /wazuh-manager.rpm -y && \
-    rm -rf /wazuh-manager.rpm && \
-    dnf clean all && \
-    # Set up required directories with correct ownership
-    mkdir -p /var/wazuh-manager/var/multigroups && \
-    chown root:wazuh-manager /var/wazuh-manager/var/multigroups && \
-    chmod 770 /var/wazuh-manager/var/multigroups && \
-    mkdir -p /var/wazuh-manager/etc/certs && \
-    chown wazuh-manager:wazuh-manager /var/wazuh-manager/etc/certs && \
-    chmod 500 /var/wazuh-manager/etc/certs && \
-    rm -f /var/wazuh-manager/etc/sslmanager.key && \
-    rm -f /var/wazuh-manager/etc/sslmanager.cert
-
-# Prepare permanent data snapshot (sync calls: https://github.com/docker/docker/issues/9547)
-RUN chmod 755 /permanent_data.sh && \
-    sync && /permanent_data.sh && \
-    sync && rm /permanent_data.sh
-
-# Download tini static binary (no external library dependencies)
-RUN curl --fail --silent -L \
-    https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static-${TARGETARCH} \
-    -o /usr/local/bin/tini && \
-    chmod +x /usr/local/bin/tini
-
-################################################################################
-# Build stage 1 (the actual Wazuh Manager image):
-# Copy Wazuh Manager and tini from builder. Install only runtime dependencies.
-################################################################################
 FROM amazonlinux:2023
 
-ARG WAZUH_UID=101
-ARG WAZUH_GID=101
-
 RUN rm /bin/sh && ln -s /bin/bash /bin/sh
 
-# Install only runtime dependencies (no curl, tar, gzip, xz, or full dnf stack)
-RUN dnf install openssl findutils procps shadow-utils -y && \
-    dnf clean all && \
-    getent group wazuh-manager || groupadd -r -g ${WAZUH_GID} wazuh-manager && \
-    getent passwd wazuh-manager || useradd --system \
-        --no-create-home \
-        --home-dir /var/wazuh-manager \
-        --uid ${WAZUH_UID} \
-        --gid ${WAZUH_GID} \
-        --shell /sbin/nologin \
-        wazuh-manager
+ARG WAZUH_VERSION
+ARG WAZUH_TAG_REVISION
+ARG FILEBEAT_TEMPLATE_BRANCH
+ARG FILEBEAT_CHANNEL=filebeat-oss
+ARG FILEBEAT_VERSION=7.10.2
+ARG WAZUH_FILEBEAT_MODULE
+ARG S6_VERSION="v2.2.0.3"
 
-# Copy Wazuh Manager installation (includes permanent data snapshot)
-COPY --from=builder /var/wazuh-manager /var/wazuh-manager
+RUN yum install curl-minimal xz gnupg tar gzip openssl findutils procps -y &&\
+    yum clean all
 
-# Copy tini static binary
-COPY --from=builder /usr/local/bin/tini /usr/local/bin/tini
+COPY config/check_repository.sh /
+COPY config/filebeat_module.sh /
+COPY config/permanent_data.env config/permanent_data.sh /
+
+RUN chmod 775 /check_repository.sh
+RUN source /check_repository.sh
+
+RUN yum install wazuh-manager-${WAZUH_VERSION}-${WAZUH_TAG_REVISION} -y && \
+    yum clean all && \
+    chmod 775 /filebeat_module.sh && \
+    source /filebeat_module.sh && \
+    rm /filebeat_module.sh && \
+    curl --fail --silent -L https://github.com/just-containers/s6-overlay/releases/download/${S6_VERSION}/s6-overlay-amd64.tar.gz \
+    -o /tmp/s6-overlay-amd64.tar.gz && \
+    tar xzf /tmp/s6-overlay-amd64.tar.gz -C / --exclude="./bin" && \
+    tar xzf /tmp/s6-overlay-amd64.tar.gz -C /usr ./bin && \
+    rm  /tmp/s6-overlay-amd64.tar.gz
 
-# Copy entrypoint, init scripts and runtime config
-COPY config/entrypoint.sh /entrypoint.sh
 COPY config/etc/ /etc/
-COPY config/permanent_data.env /
+COPY --chown=root:wazuh config/create_user.py /var/ossec/framework/scripts/create_user.py
 
-RUN chmod 755 /entrypoint.sh
+COPY config/filebeat.yml /etc/filebeat/
+
+RUN chmod go-w /etc/filebeat/filebeat.yml
+
+ADD https://raw.githubusercontent.com/wazuh/wazuh/$FILEBEAT_TEMPLATE_BRANCH/extensions/elasticsearch/7.x/wazuh-template.json /etc/filebeat
+RUN chmod go-w /etc/filebeat/wazuh-template.json
+
+# Prepare permanent data
+# Sync calls are due to https://github.com/docker/docker/issues/9547
+
+#Make mount directories for keep permissions
+
+RUN mkdir -p /var/ossec/var/multigroups && \
+    chown root:wazuh /var/ossec/var/multigroups && \
+    chmod 770 /var/ossec/var/multigroups && \
+    mkdir -p /var/ossec/agentless && \
+    chown root:wazuh /var/ossec/agentless && \
+    chmod 770 /var/ossec/agentless && \
+    mkdir -p /var/ossec/active-response/bin && \
+    chown root:wazuh /var/ossec/active-response/bin && \
+    chmod 770 /var/ossec/active-response/bin && \
+    chmod 755 /permanent_data.sh && \
+    sync && /permanent_data.sh && \
+    sync && rm /permanent_data.sh
+
+RUN rm /etc/yum.repos.d/wazuh.repo
 
 # Services ports
 EXPOSE 55000/tcp 1514/tcp 1515/tcp 514/udp 1516/tcp
 
-ENTRYPOINT ["/usr/local/bin/tini", "--", "/entrypoint.sh"]
+ENTRYPOINT [ "/init" ]

build-docker-images/wazuh-manager/config/check_repository.sh

@@ -0,0 +1,15 @@
+## variables
+APT_KEY=https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH
+GPG_SIGN="gpgcheck=1\ngpgkey=${APT_KEY}]"
+REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages-dev.wazuh.com/pre-release/yum/\nprotect=1"
+WAZUH_TAG=$(curl --silent https://api.github.com/repos/wazuh/wazuh/git/refs/tags | grep '["]ref["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/'  | cut -c 11- | grep ^v${WAZUH_VERSION}$)
+
+## check tag to use the correct repository
+if [[ -n "${WAZUH_TAG}" ]]; then
+  APT_KEY=https://packages.wazuh.com/key/GPG-KEY-WAZUH
+  GPG_SIGN="gpgcheck=1\ngpgkey=${APT_KEY}]"
+  REPOSITORY="[wazuh]\n${GPG_SIGN}\nenabled=1\nname=EL-\$releasever - Wazuh\nbaseurl=https://packages.wazuh.com/5.x/yum/\nprotect=1"
+fi
+
+rpm --import "${APT_KEY}"
+echo -e "${REPOSITORY}" | tee /etc/yum.repos.d/wazuh.repo

build-docker-images/wazuh-manager/config/create_user.py

@@ -0,0 +1,102 @@
+import logging
+import sys
+import json
+import random
+import string
+import os
+
+# Set framework path
+sys.path.append(os.path.dirname(sys.argv[0]) + "/../framework")
+
+USER_FILE_PATH = "/var/ossec/api/configuration/admin.json"
+SPECIAL_CHARS = "@$!%*?&-_"
+
+
+try:
+    from wazuh.rbac.orm import check_database_integrity
+    from wazuh.security import (
+        create_user,
+        get_users,
+        get_roles,
+        set_user_role,
+        update_user,
+    )
+except ModuleNotFoundError as e:
+    logging.error("No module 'wazuh' found.")
+    sys.exit(1)
+
+
+def read_user_file(path=USER_FILE_PATH):
+    with open(path) as user_file:
+        data = json.load(user_file)
+        return data["username"], data["password"]
+
+
+def db_users():
+    users_result = get_users()
+    return {user["username"]: user["id"] for user in users_result.affected_items}
+
+
+def db_roles():
+    roles_result = get_roles()
+    return {role["name"]: role["id"] for role in roles_result.affected_items}
+
+def disable_user(uid):
+    random_pass = "".join(
+                random.choices(
+                    string.ascii_uppercase
+                    + string.ascii_lowercase
+                    + string.digits
+                    + SPECIAL_CHARS,
+                    k=8,
+                )
+            )
+    # assure there must be at least one character from each group
+    random_pass = random_pass + ''.join([random.choice(chars) for chars in [string.ascii_lowercase, string.digits, string.ascii_uppercase, SPECIAL_CHARS]])
+    random_pass = ''.join(random.sample(random_pass,len(random_pass)))
+    update_user(
+        user_id=[
+            str(uid),
+        ],
+        password=random_pass,
+    )
+
+
+if __name__ == "__main__":
+    if not os.path.exists(USER_FILE_PATH):
+        # abort if no user file detected
+        sys.exit(0)
+    username, password = read_user_file()
+
+    # create RBAC database
+    check_database_integrity()
+
+    initial_users = db_users()
+    if username not in initial_users:
+        # create a new user
+        create_user(username=username, password=password)
+        users = db_users()
+        uid = users[username]
+        roles = db_roles()
+        rid = roles["administrator"]
+        set_user_role(
+            user_id=[
+                str(uid),
+            ],
+            role_ids=[
+                str(rid),
+            ],
+        )
+    else:
+        # modify an existing user ("wazuh" or "wazuh-wui")
+        uid = initial_users[username]
+        update_user(
+            user_id=[
+                str(uid),
+            ],
+            password=password,
+        )
+    # disable unused default users
+    for def_user in ['wazuh', 'wazuh-wui']:
+        if def_user != username:
+            disable_user(initial_users[def_user])

build-docker-images/wazuh-manager/config/entrypoint.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-# Wazuh Docker Copyright (C) 2017, Wazuh Inc. (License GPLv2)
-
-# Run initialization and configuration
-bash /etc/cont-init.d/0-wazuh-init
-
-# Start Wazuh Manager (may log warnings in environments without certs)
-bash /etc/cont-init.d/1-manager
-
-# Tail the main log to stdout so Docker captures it
-tail -F /var/wazuh-manager/logs/wazuh-manager.log &
-TAIL_PID=$!
-
-# Graceful shutdown: stop Wazuh and exit cleanly on SIGTERM/SIGINT
-_stop() {
-    echo "Stopping Wazuh Manager..."
-    /var/wazuh-manager/bin/wazuh-manager-control stop 2>/dev/null || true
-    kill "${TAIL_PID}" 2>/dev/null || true
-}
-trap _stop SIGTERM SIGINT SIGQUIT
-
-wait "${TAIL_PID}"

build-docker-images/wazuh-manager/config/etc/cont-init.d/0-wazuh-init

@@ -1,11 +1,13 @@
-#!/bin/bash
+#!/usr/bin/with-contenv bash
 # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 
 # Variables
 source /permanent_data.env
 
-WAZUH_INSTALL_PATH=/var/wazuh-manager
+WAZUH_INSTALL_PATH=/var/ossec
 WAZUH_CONFIG_MOUNT=/wazuh-config-mount
+AUTO_ENROLLMENT_ENABLED=${AUTO_ENROLLMENT_ENABLED:-true}
+
 
 ##############################################################################
 # Aux functions
@@ -68,17 +70,8 @@ apply_exclusion_data() {
         mkdir -p ${DIR}
       fi
 
-      safe_cp() {
-          if cp -p "$1" "$2" 2>/dev/null; then
-              return 0
-          else
-              echo "Warning: Could not copy $1 (may be read-only)"
-              return 0
-          fi
-      }
-
       print "Updating ${exclusion_file}"
-      exec_cmd "safe_cp ${WAZUH_INSTALL_PATH}/data_tmp/exclusion/${exclusion_file} ${exclusion_file}"
+      exec_cmd "cp -p ${WAZUH_INSTALL_PATH}/data_tmp/exclusion/${exclusion_file} ${exclusion_file}"
     fi
   done
 }
@@ -119,7 +112,7 @@ remove_data_files() {
 # Create certificates: Manager
 ##############################################################################
 
-create_wazuh_key_cert() {
+create_ossec_key_cert() {
   print "Creating wazuh-authd key and cert"
   exec_cmd "openssl genrsa -out ${WAZUH_INSTALL_PATH}/etc/sslmanager.key 4096"
   exec_cmd "openssl req -new -x509 -key ${WAZUH_INSTALL_PATH}/etc/sslmanager.key -out ${WAZUH_INSTALL_PATH}/etc/sslmanager.cert -days 3650 -subj /CN=${HOSTNAME}/"
@@ -129,9 +122,9 @@ create_wazuh_key_cert() {
 # Copy all files from $WAZUH_CONFIG_MOUNT to $WAZUH_INSTALL_PATH and respect
 # destination files permissions
 #
-# For example, to mount the file /var/wazuh-manager/data/etc/wazuh-manager.conf, mount it at
-# $WAZUH_CONFIG_MOUNT/etc/wazuh-manager.conf in your container and this code will
-# replace the wazuh-manager.conf file in /var/wazuh-manager/data/etc with yours.
+# For example, to mount the file /var/ossec/data/etc/ossec.conf, mount it at
+# $WAZUH_CONFIG_MOUNT/etc/ossec.conf in your container and this code will
+# replace the ossec.conf file in /var/ossec/data/etc with yours.
 ##############################################################################
 
 mount_files() {
@@ -150,111 +143,46 @@ mount_files() {
 # container start.
 #
 # To use this:
-# 1. Create your own wazuh-manager.conf file
-# 2. In your wazuh-manager.conf file, set to_be_replaced_by_hostname as your node_name
-# 3. Mount your custom wazuh-manager.conf file at $WAZUH_CONFIG_MOUNT/etc/wazuh-manager.conf
+# 1. Create your own ossec.conf file
+# 2. In your ossec.conf file, set to_be_replaced_by_hostname as your node_name
+# 3. Mount your custom ossec.conf file at $WAZUH_CONFIG_MOUNT/etc/ossec.conf
 ##############################################################################
 
 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/wazuh-manager.conf
-}
-
-function_configure_wazuh_manager_conf() {
-WAZUH_MANAGER_CONF="${WAZUH_INSTALL_PATH}/etc/wazuh-manager.conf"
-
-# --------------------------
-# Defaults based on WAZUH_MANAGER_CONF
-# --------------------------
-if [[ -z "$WAZUH_CLUSTER_KEY" ]]; then
-    WAZUH_CLUSTER_KEY=$(sed -n '/<cluster>/,/<\/cluster>/s/.*<key>\(.*\)<\/key>.*/\1/p' "$WAZUH_MANAGER_CONF" | head -n1)
-fi
-
-# Node type logic
-if [[ "$WAZUH_NODE_TYPE" != "worker" ]]; then
-    WAZUH_NODE_TYPE="master"
-fi
-
-# Default node name → HOSTNAME if not defined
-WAZUH_NODE_NAME="${WAZUH_NODE_NAME:-$HOSTNAME}"
-
-# --------------------------
-# Replace Indexer Hosts
-# --------------------------
-if [[ -n "$WAZUH_INDEXER_HOSTS" ]]; then
-    TMP_HOSTS=$(mktemp)
-    {
-        echo "    <hosts>"
-        IFS=',' read -ra NODES <<< "$WAZUH_INDEXER_HOSTS"
-        for NODE in "${NODES[@]}"; do
-            IP="${NODE%:*}"
-            PORT="${NODE#*:}"
-            echo "      <host>https://$IP:$PORT</host>"
-        done
-        echo "    </hosts>"
-    } > "$TMP_HOSTS";
-    sed -i -e '/<indexer>/,/<\/indexer>/{ /<hosts>/,/<\/hosts>/{ /<hosts>/r '"$TMP_HOSTS" \
-            -e 'd }}' "$WAZUH_MANAGER_CONF";
-    rm -f "$TMP_HOSTS";
-
-fi
-
-# --------------------------
-# Cluster: node_name
-# --------------------------
-sed -i "/<cluster>/,/<\/cluster>/ s|<node_name>.*</node_name>|<node_name>$WAZUH_NODE_NAME</node_name>|" "$WAZUH_MANAGER_CONF"
-
-# --------------------------
-# Cluster: node_type
-# --------------------------
-sed -i "/<cluster>/,/<\/cluster>/ s|<node_type>.*</node_type>|<node_type>$WAZUH_NODE_TYPE</node_type>|" "$WAZUH_MANAGER_CONF"
-
-# --------------------------
-# Cluster: key
-# --------------------------
-sed -i "/<cluster>/,/<\/cluster>/ s|<key>.*</key>|<key>$WAZUH_CLUSTER_KEY</key>|" "$WAZUH_MANAGER_CONF"
-
-# --------------------------
-# Cluster: bind_addr
-# --------------------------
-sed -i "/<cluster>/,/<\/cluster>/ s|<bind_addr>.*</bind_addr>|<bind_addr>$WAZUH_CLUSTER_BIND_ADDR</bind_addr>|" "$WAZUH_MANAGER_CONF"
-
-# --------------------------
-# Cluster: nodes list
-# --------------------------
-if [[ -n "$WAZUH_CLUSTER_NODES" ]]; then
-    TMP_NODES=$(mktemp)
-    {
-        echo "    <nodes>"
-        for N in $WAZUH_CLUSTER_NODES; do
-            echo "        <node>$N</node>"
-        done
-        echo "    </nodes>"
-    } > "$TMP_NODES";
-    sed -i -e '/<cluster>/,/<\/cluster>/{ /<nodes>/,/<\/nodes>/{ /<nodes>/r '"$TMP_NODES" \
-            -e 'd }}' "$WAZUH_MANAGER_CONF";
-    rm -f "$TMP_NODES";
-fi
-
-echo "Wazuh manager config modified successfully."
+  sed -i 's/<node_name>to_be_replaced_by_hostname<\/node_name>/<node_name>'"${HOSTNAME}"'<\/node_name>/g' ${WAZUH_INSTALL_PATH}/etc/ossec.conf
 }
 
 ##############################################################################
-# Set correct ownership for Wazuh related directories
-# on container start.
+# 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
 ##############################################################################
 
-configure_permissions() {
-  chown -R wazuh-manager:wazuh-manager /var/wazuh-manager/queue/rids
+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
 }
 
 ##############################################################################
-# Change any legacy user/group to wazuh-manager user/group
+# Modify /var/ossec/queue/rids directory owner on
+# container start.
+##############################################################################
+
+set_rids_owner() {
+  chown -R wazuh:wazuh /var/ossec/queue/rids
+}
+
+##############################################################################
+# Change any ossec user/group to wazuh user/group 
 ##############################################################################
 
 set_correct_permOwner() {
-  find /var/wazuh-manager/ -group 997 -exec chown :101 {} +;
-  find /var/wazuh-manager/ -group 999 -exec chown :101 {} +;
-  find /var/wazuh-manager/ -user 999 -exec chown 101:{} +;
+  find / -group 997 -exec chown :999 {} +;
+  find / -group 101 -exec chown :999 {} +;
+  find / -user 101 -exec chown 999 {} +;
 }
 
 ##############################################################################
@@ -262,7 +190,7 @@ set_correct_permOwner() {
 ##############################################################################
 
 main() {
-  # Mount permanent data  (i.e. wazuh-manager.conf)
+  # Mount permanent data  (i.e. ossec.conf)
   mount_permanent_data
 
   # Restore files stored in permanent data that are not permanent  (i.e. internal_options.conf)
@@ -271,16 +199,19 @@ main() {
   # Apply correct permission and ownership
   set_correct_permOwner
 
-  # Rename files stored in permanent data (i.e. queue/wazuh-manager)
+  # Rename files stored in permanent data (i.e. queue/ossec)
   move_data_files
 
   # Remove some files in permanent_data (i.e. .template.db)
   remove_data_files
 
-  # Create wazuh-authd key and cert if not present
-  if [ ! -e ${WAZUH_INSTALL_PATH}/etc/sslmanager.key ]
+  # Generate wazuh-authd certs if AUTO_ENROLLMENT_ENABLED is true and does not exist
+  if [ $AUTO_ENROLLMENT_ENABLED == true ]
   then
-    create_wazuh_key_cert
+    if [ ! -e ${WAZUH_INSTALL_PATH}/etc/sslmanager.key ]
+    then
+      create_ossec_key_cert
+    fi
   fi
 
   # Mount selected files (WAZUH_CONFIG_MOUNT) to container
@@ -289,13 +220,14 @@ main() {
   # Allow setting custom hostname
   set_custom_hostname
 
-  # Configure wazuh-manager.conf based on environment variables
-  function_configure_wazuh_manager_conf
+  # Allow setting custom cluster key
+  set_custom_cluster_key
+
   # Delete temporary data folder
   rm -rf ${WAZUH_INSTALL_PATH}/data_tmp
 
-  # Set correct ownership for Wazuh related directories
-  configure_permissions
+  # Set rids directory owner
+  set_rids_owner
 }
 
 main

build-docker-images/wazuh-manager/config/etc/cont-init.d/1-config-filebeat

@@ -0,0 +1,51 @@
+#!/usr/bin/with-contenv bash
+# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
+
+set -e
+
+if [ "$INDEXER_URL" != "" ]; then
+  >&2 echo "Customize Elasticsearch output IP"
+  sed -i "s|hosts:.*|hosts: ['$INDEXER_URL']|g" /etc/filebeat/filebeat.yml
+fi
+
+# Configure filebeat.yml security settings
+
+if [ "$INDEXER_USERNAME" != "" ]; then
+  >&2 echo "Configuring username."
+  sed -i "s|#username:.*|username:|g" /etc/filebeat/filebeat.yml
+  sed -i "s|username:.*|username: '$INDEXER_USERNAME'|g" /etc/filebeat/filebeat.yml
+fi
+
+if [ "$INDEXER_PASSWORD" != "" ]; then
+  >&2 echo "Configuring password."
+  sed -i "s|#password:.*|password:|g" /etc/filebeat/filebeat.yml
+  sed -i "s|password:.*|password: '$INDEXER_PASSWORD'|g" /etc/filebeat/filebeat.yml
+fi
+
+if [ "$FILEBEAT_SSL_VERIFICATION_MODE" != "" ]; then
+  >&2 echo "Configuring SSL verification mode."
+  sed -i "s|#ssl.verification_mode:.*|ssl.verification_mode:|g" /etc/filebeat/filebeat.yml
+  sed -i "s|ssl.verification_mode:.*|ssl.verification_mode: '$FILEBEAT_SSL_VERIFICATION_MODE'|g" /etc/filebeat/filebeat.yml
+fi
+
+if [ "$SSL_CERTIFICATE_AUTHORITIES" != "" ]; then
+  >&2 echo "Configuring Certificate Authorities."
+  sed -i "s|#ssl.certificate_authorities:.*|ssl.certificate_authorities:|g" /etc/filebeat/filebeat.yml
+  sed -i "s|ssl.certificate_authorities:.*|ssl.certificate_authorities: ['$SSL_CERTIFICATE_AUTHORITIES']|g" /etc/filebeat/filebeat.yml
+fi
+
+if [ "$SSL_CERTIFICATE" != "" ]; then
+  >&2 echo "Configuring SSL Certificate."
+  sed -i "s|#ssl.certificate:.*|ssl.certificate:|g" /etc/filebeat/filebeat.yml
+  sed -i "s|ssl.certificate:.*|ssl.certificate: '$SSL_CERTIFICATE'|g" /etc/filebeat/filebeat.yml
+fi
+
+if [ "$SSL_KEY" != "" ]; then
+  >&2 echo "Configuring SSL Key."
+  sed -i "s|#ssl.key:.*|ssl.key:|g" /etc/filebeat/filebeat.yml
+  sed -i "s|ssl.key:.*|ssl.key: '$SSL_KEY'|g" /etc/filebeat/filebeat.yml
+fi
+
+
+chmod go-w /etc/filebeat/filebeat.yml || true
+chown root: /etc/filebeat/filebeat.yml || true

build-docker-images/wazuh-manager/config/etc/cont-init.d/1-manager

@@ -1,104 +0,0 @@
-#!/bin/bash
-
-##############################################################################
-# Migration sequence
-# Detect if there is a mounted volume on /wazuh-migration and copy the data
-# to /var/wazuh-manager, finally it will create a flag ".migration-completed" inside
-# the mounted volume
-##############################################################################
-
-function __colortext()
-{
-  echo -e " \e[1;$2m$1\e[0m"
-}
-
-function echogreen()
-{
-  echo $(__colortext "$1" "32")
-}
-
-function echoyellow()
-{
-  echo $(__colortext "$1" "33")
-}
-
-function echored()
-{
-  echo $(__colortext "$1" "31")
-}
-
-function_wazuh_migration(){
-  if [ -d "/wazuh-migration" ]; then
-    if [ ! -e /wazuh-migration/.migration-completed ]; then
-      if [ ! -e /wazuh-migration/global.db ]; then
-        echoyellow "The volume mounted on /wazuh-migration does not contain all the correct files."
-        return
-      fi
-
-      \cp -f /wazuh-migration/data/etc/wazuh-manager.conf /var/wazuh-manager/etc/wazuh-manager.conf
-      chown root:wazuh-manager /var/wazuh-manager/etc/wazuh-manager.conf
-      chmod 640 /var/wazuh-manager/etc/wazuh-manager.conf
-
-      \cp -f /wazuh-migration/data/etc/client.keys /var/wazuh-manager/etc/client.keys
-      chown wazuh-manager:wazuh-manager /var/wazuh-manager/etc/client.keys
-      chmod 640 /var/wazuh-manager/etc/client.keys
-
-      \cp -f /wazuh-migration/data/etc/sslmanager.cert /var/wazuh-manager/etc/sslmanager.cert
-      \cp -f /wazuh-migration/data/etc/sslmanager.key /var/wazuh-manager/etc/sslmanager.key
-      chown root:root /var/wazuh-manager/etc/sslmanager.cert /var/wazuh-manager/etc/sslmanager.key
-      chmod 640 /var/wazuh-manager/etc/sslmanager.cert /var/wazuh-manager/etc/sslmanager.key
-
-      \cp -f /wazuh-migration/data/etc/shared/default/agent.conf /var/wazuh-manager/etc/shared/default/agent.conf
-      chown wazuh-manager:wazuh-manager /var/wazuh-manager/etc/shared/default/agent.conf
-      chmod 660 /var/wazuh-manager/etc/shared/default/agent.conf
-
-      \cp -f /wazuh-migration/data/etc/decoders/* /var/wazuh-manager/etc/decoders/
-      chown wazuh-manager:wazuh-manager /var/wazuh-manager/etc/decoders/*
-      chmod 660 /var/wazuh-manager/etc/decoders/*
-      \cp -f /wazuh-migration/data/etc/rules/* /var/wazuh-manager/etc/rules/
-      chown wazuh-manager:wazuh-manager /var/wazuh-manager/etc/rules/*
-      chmod 660 /var/wazuh-manager/etc/rules/*
-
-      \cp -f /wazuh-migration/global.db /var/wazuh-manager/queue/db/global.db
-      chown wazuh-manager:wazuh-manager /var/wazuh-manager/queue/db/global.db
-      chmod 640 /var/wazuh-manager/queue/db/global.db
-
-      # mark volume as migrated
-      touch /wazuh-migration/.migration-completed
-
-      echogreen "Migration completed succesfully"
-    else
-      echoyellow "This volume has already been migrated. You may proceed and remove it from the mount point (/wazuh-migration)"
-    fi
-  fi
-}
-
-function_entrypoint_scripts() {
-  # It will run every .sh script located in entrypoint-scripts folder in lexicographical order
-  if [ -d "/entrypoint-scripts/" ]
-  then
-    for script in `ls /entrypoint-scripts/*.sh | sort -n`; do
-      bash "$script"
-    done
-  fi
-}
-
-function_configure_vulnerability_detection() {
-if [ "$INDEXER_PASSWORD" != "" ]; then
-  >&2 echo "Configuring password."
-    echo "$INDEXER_USERNAME" | /var/wazuh-manager/bin/wazuh-manager-keystore -f indexer -k username
-    echo "$INDEXER_PASSWORD" | /var/wazuh-manager/bin/wazuh-manager-keystore -f indexer -k password
-fi
-}
-
-# Migrate data from /wazuh-migration volume
-function_wazuh_migration
-
-# configure Vulnerabilty detection
-function_configure_vulnerability_detection
-
-# run entrypoint scripts
-function_entrypoint_scripts
-
-# Start Wazuh
-/var/wazuh-manager/bin/wazuh-manager-control start

build-docker-images/wazuh-manager/config/etc/cont-init.d/2-manager

@@ -0,0 +1,136 @@
+#!/usr/bin/with-contenv bash
+
+##############################################################################
+# Migration sequence
+# Detect if there is a mounted volume on /wazuh-migration and copy the data
+# to /var/ossec, finally it will create a flag ".migration-completed" inside
+# the mounted volume
+##############################################################################
+
+function __colortext()
+{
+  echo -e " \e[1;$2m$1\e[0m"
+}
+
+function echogreen()
+{
+  echo $(__colortext "$1" "32")
+}
+
+function echoyellow()
+{
+  echo $(__colortext "$1" "33")
+}
+
+function echored()
+{
+  echo $(__colortext "$1" "31")
+}
+
+function_wazuh_migration(){
+  if [ -d "/wazuh-migration" ]; then
+    if [ ! -e /wazuh-migration/.migration-completed ]; then
+      if [ ! -e /wazuh-migration/global.db ]; then
+        echoyellow "The volume mounted on /wazuh-migration does not contain all the correct files."
+        return
+      fi
+
+      \cp -f /wazuh-migration/data/etc/ossec.conf /var/ossec/etc/ossec.conf
+      chown root:wazuh /var/ossec/etc/ossec.conf
+      chmod 640 /var/ossec/etc/ossec.conf
+
+      \cp -f /wazuh-migration/data/etc/client.keys /var/ossec/etc/client.keys
+      chown wazuh:wazuh /var/ossec/etc/client.keys
+      chmod 640 /var/ossec/etc/client.keys
+
+      \cp -f /wazuh-migration/data/etc/sslmanager.cert /var/ossec/etc/sslmanager.cert
+      \cp -f /wazuh-migration/data/etc/sslmanager.key /var/ossec/etc/sslmanager.key
+      chown root:root /var/ossec/etc/sslmanager.cert /var/ossec/etc/sslmanager.key
+      chmod 640 /var/ossec/etc/sslmanager.cert /var/ossec/etc/sslmanager.key
+
+      \cp -f /wazuh-migration/data/etc/shared/default/agent.conf /var/ossec/etc/shared/default/agent.conf
+      chown wazuh:wazuh /var/ossec/etc/shared/default/agent.conf
+      chmod 660 /var/ossec/etc/shared/default/agent.conf
+
+      \cp -f /wazuh-migration/data/etc/decoders/* /var/ossec/etc/decoders/
+      chown wazuh:wazuh /var/ossec/etc/decoders/*
+      chmod 660 /var/ossec/etc/decoders/*
+
+      \cp -f /wazuh-migration/data/etc/rules/* /var/ossec/etc/rules/
+      chown wazuh:wazuh /var/ossec/etc/rules/*
+      chmod 660 /var/ossec/etc/rules/*
+
+      if [ -e /wazuh-migration/data/agentless/.passlist ]; then
+        \cp -f /wazuh-migration/data/agentless/.passlist /var/ossec/agentless/.passlist
+        chown root:wazuh /var/ossec/agentless/.passlist
+        chmod 640 /var/ossec/agentless/.passlist
+      fi
+
+      \cp -f /wazuh-migration/global.db /var/ossec/queue/db/global.db
+      chown wazuh:wazuh /var/ossec/queue/db/global.db
+      chmod 640 /var/ossec/queue/db/global.db
+
+      # mark volume as migrated
+      touch /wazuh-migration/.migration-completed
+
+      echogreen "Migration completed succesfully"
+    else
+      echoyellow "This volume has already been migrated. You may proceed and remove it from the mount point (/wazuh-migration)"
+    fi
+  fi
+}
+
+function_create_custom_user() {
+  if [[ ! -z $API_USERNAME ]] && [[ ! -z $API_PASSWORD ]]; then
+  cat << EOF > /var/ossec/api/configuration/admin.json
+{
+  "username": "$API_USERNAME",
+  "password": "$API_PASSWORD"
+}
+EOF
+
+    # create or customize API user
+    if /var/ossec/framework/python/bin/python3  /var/ossec/framework/scripts/create_user.py; then
+      # remove json if exit code is 0
+      rm /var/ossec/api/configuration/admin.json
+    else
+      echored "There was an error configuring the API user"
+      # terminate container to avoid unpredictable behavior
+      exec s6-svscanctl -t /var/run/s6/services
+      exit 1
+    fi
+  fi
+}
+
+function_entrypoint_scripts() {
+  # It will run every .sh script located in entrypoint-scripts folder in lexicographical order
+  if [ -d "/entrypoint-scripts/" ]
+  then
+    for script in `ls /entrypoint-scripts/*.sh | sort -n`; do
+      bash "$script"
+    done
+  fi
+}
+
+function_configure_vulnerability_detection() {
+if [ "$INDEXER_PASSWORD" != "" ]; then
+  >&2 echo "Configuring password."
+    echo "$INDEXER_USERNAME" | /var/ossec/bin/wazuh-keystore -f indexer -k username
+    echo "$INDEXER_PASSWORD" | /var/ossec/bin/wazuh-keystore -f indexer -k password
+fi
+}
+
+# Migrate data from /wazuh-migration volume
+function_wazuh_migration
+
+# create API custom user
+function_create_custom_user
+
+# configure Vulnerabilty detection
+function_configure_vulnerability_detection
+
+# run entrypoint scripts
+function_entrypoint_scripts
+
+# Start Wazuh
+/var/ossec/bin/wazuh-control start

build-docker-images/wazuh-manager/config/etc/services.d/filebeat/finish

@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+echo >&2 "Filebeat exited. code=${1}"
+
+# terminate other services to exit from the container
+exec s6-svscanctl -t /var/run/s6/services
+

build-docker-images/wazuh-manager/config/etc/services.d/filebeat/run

@@ -0,0 +1,4 @@
+#!/usr/bin/with-contenv sh
+echo >&2 "starting Filebeat"
+
+exec /usr/share/filebeat/bin/filebeat -e -c /etc/filebeat/filebeat.yml -path.home /usr/share/filebeat -path.config /etc/filebeat -path.data /var/lib/filebeat -path.logs /var/log/filebeat

build-docker-images/wazuh-manager/config/etc/services.d/ossec-logs/run

@@ -0,0 +1,4 @@
+#!/usr/bin/with-contenv sh
+
+# dumping ossec.log to standard output
+exec tail -F /var/ossec/logs/ossec.log

build-docker-images/wazuh-manager/config/etc/services.d/wazuh-manager-logs/run

@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# dumping wazuh-manager.log to standard output
-exec tail -F /var/wazuh-manager/logs/wazuh-manager.log

build-docker-images/wazuh-manager/config/filebeat.yml

@@ -0,0 +1,31 @@
+
+# Wazuh - Filebeat configuration file
+filebeat.modules:
+  - module: wazuh
+    alerts:
+      enabled: true
+    archives:
+      enabled: false
+
+setup.template.json.enabled: true
+setup.template.overwrite: true
+setup.template.json.path: '/etc/filebeat/wazuh-template.json'
+setup.template.json.name: 'wazuh'
+setup.ilm.enabled: false
+output.elasticsearch:
+  hosts: ['https://wazuh.indexer:9200']
+  #username:
+  #password:
+  #ssl.verification_mode:
+  #ssl.certificate_authorities:
+  #ssl.certificate:
+  #ssl.key:
+
+logging.metrics.enabled: false
+
+seccomp:
+  default_action: allow
+  syscalls:
+  - action: allow
+    names:
+    - rseq

build-docker-images/wazuh-manager/config/filebeat_module.sh

@@ -0,0 +1,12 @@
+## variables
+REPOSITORY="packages-dev.wazuh.com/pre-release"
+WAZUH_TAG=$(curl --silent https://api.github.com/repos/wazuh/wazuh/git/refs/tags | grep '["]ref["]:' | sed -E 's/.*\"([^\"]+)\".*/\1/'  | cut -c 11- | grep ^v${WAZUH_VERSION}$)
+
+## check tag to use the correct repository
+if [[ -n "${WAZUH_TAG}" ]]; then
+  REPOSITORY="packages.wazuh.com/5.x"
+fi
+
+curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-x86_64.rpm &&\
+yum install -y ${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-x86_64.rpm && rm -f ${FILEBEAT_CHANNEL}-${FILEBEAT_VERSION}-x86_64.rpm && \
+curl -s https://${REPOSITORY}/filebeat/${WAZUH_FILEBEAT_MODULE} | tar -xvz -C /usr/share/filebeat/module

build-docker-images/wazuh-manager/config/permanent_data.env

@@ -1,25 +1,113 @@
 # Permanent data mounted in volumes
 i=0
-PERMANENT_DATA[((i++))]="/var/wazuh-manager/api/configuration"
-PERMANENT_DATA[((i++))]="/var/wazuh-manager/etc"
-PERMANENT_DATA[((i++))]="/var/wazuh-manager/logs"
-PERMANENT_DATA[((i++))]="/var/wazuh-manager/queue"
-PERMANENT_DATA[((i++))]="/var/wazuh-manager/var/multigroups"
+PERMANENT_DATA[((i++))]="/var/ossec/api/configuration"
+PERMANENT_DATA[((i++))]="/var/ossec/etc"
+PERMANENT_DATA[((i++))]="/var/ossec/logs"
+PERMANENT_DATA[((i++))]="/var/ossec/queue"
+PERMANENT_DATA[((i++))]="/var/ossec/agentless"
+PERMANENT_DATA[((i++))]="/var/ossec/var/multigroups"
+PERMANENT_DATA[((i++))]="/var/ossec/integrations"
+PERMANENT_DATA[((i++))]="/var/ossec/active-response/bin"
+PERMANENT_DATA[((i++))]="/var/ossec/wodles"
+PERMANENT_DATA[((i++))]="/etc/filebeat"
 
 export PERMANENT_DATA
 
 # Files mounted in a volume that should not be permanent
 i=0
-PERMANENT_DATA_EXCP[((i++))]="/var/wazuh-manager/etc/internal_options.conf"
-
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/etc/internal_options.conf"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/slack"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/slack.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/virustotal"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/virustotal.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/shuffle"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/shuffle.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/pagerduty"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/pagerduty.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/maltiverse"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/integrations/maltiverse.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/default-firewall-drop"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/disable-account"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/firewalld-drop"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/firewall-drop"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/host-deny"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/ip-customblock"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/ipfw"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/kaspersky.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/kaspersky"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/npf"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/wazuh-slack"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/pf"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/restart-wazuh"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/restart.sh"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/active-response/bin/route-null"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/sshlogin.exp"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/ssh_pixconfig_diff"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/ssh_asa-fwsmconfig_diff"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/ssh_integrity_check_bsd"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/main.exp"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/su.exp"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/ssh_integrity_check_linux"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/register_host.sh"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/ssh_generic_diff"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/ssh_foundry_diff"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/ssh_nopass.exp"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/agentless/ssh.exp"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/utils.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/aws-s3"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/aws-s3.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/__init__.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/aws_tools.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/wazuh_integration.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/buckets_s3/__init__.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/buckets_s3/aws_bucket.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/buckets_s3/cloudtrail.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/buckets_s3/config.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/buckets_s3/guardduty.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/buckets_s3/load_balancers.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/buckets_s3/server_access.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/buckets_s3/umbrella.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/buckets_s3/vpcflow.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/buckets_s3/waf.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/services/__init__.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/services/aws_service.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/services/cloudwatchlogs.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/services/inspector.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/subscribers/__init__.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/subscribers/s3_log_handler.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/subscribers/sqs_message_processor.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/aws/subscribers/sqs_queue.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure-logs"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure-logs.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/db/orm.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/db/utils.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/db/__init__.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_utils.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_services/__init__.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_services/analytics.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_services/graph.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/azure/azure_services/storage.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/docker/DockerListener"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/docker/DockerListener.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/gcloud"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/gcloud.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/integration.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/tools.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/exceptions.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/buckets/bucket.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/buckets/access_logs.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/wodles/gcloud/pubsub/subscriber.py"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/etc/lists/malicious-ioc/malicious-ip"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/etc/lists/malicious-ioc/malicious-domains"
+PERMANENT_DATA_EXCP[((i++))]="/var/ossec/etc/lists/malicious-ioc/malware-hashes"
 export PERMANENT_DATA_EXCP
 
 # Files mounted in a volume that should be deleted
 i=0
-PERMANENT_DATA_DEL[((i++))]="/var/wazuh-manager/queue/db/.template.db"
+PERMANENT_DATA_DEL[((i++))]="/var/ossec/queue/db/.template.db"
 export PERMANENT_DATA_DEL
 
 i=0
-PERMANENT_DATA_MOVE[((i++))]="/var/wazuh-manager/logs/ossec /var/wazuh-manager/logs/wazuh"
-PERMANENT_DATA_MOVE[((i++))]="/var/wazuh-manager/queue/ossec /var/wazuh-manager/queue/sockets"
+PERMANENT_DATA_MOVE[((i++))]="/var/ossec/logs/ossec /var/ossec/logs/wazuh"
+PERMANENT_DATA_MOVE[((i++))]="/var/ossec/queue/ossec /var/ossec/queue/sockets"
 export PERMANENT_DATA_MOVE

build-docker-images/wazuh-manager/config/permanent_data.sh

@@ -4,7 +4,7 @@
 # Variables
 source /permanent_data.env
 
-WAZUH_INSTALL_PATH=/var/wazuh-manager
+WAZUH_INSTALL_PATH=/var/ossec
 DATA_TMP_PATH=${WAZUH_INSTALL_PATH}/data_tmp
 mkdir ${DATA_TMP_PATH}
 

docs/INSTALLATION.md

@@ -1,115 +0,0 @@
-# Documentation installation and setup
-
-This guide covers how to set up the documentation build environment for the Wazuh Docker documentation.
-
-## Prerequisites
-
-The documentation is built using [mdBook](https://rust-lang.github.io/mdBook/), a command-line tool for creating books
-with Markdown, along with [mdBook Mermaid](https://github.com/badboy/mdbook-mermaid) for diagram support.
-
-## Required versions
-
-- **mdbook**: 0.5.2
-- **mdbook-mermaid**: 0.17.0
-
-## Installation
-
-Install tools:
-
-```bash
-cargo install mdbook --version 0.5.2
-cargo install mdbook-mermaid --version 0.17.0
-```
-
-Verify installation:
-
-```bash
-mdbook --version
-mdbook-mermaid --version
-```
-
-## Building the documentation
-
-Once you have installed mdBook and mdBook Mermaid:
-
-```bash
-# Navigate to the docs directory
-cd docs
-
-# Build the documentation (generates html in docs/book/)
-mdbook build
-
-# Serve locally with live reload (recommended for development)
-mdbook serve --open
-```
-
-The documentation will be available at `http://localhost:3000` when using `mdbook serve`.
-
-## Development workflow
-
-When editing documentation:
-
-1. Run `mdbook serve --open` from the `docs/` directory
-2. Edit markdown files in `docs/ref/`
-3. Changes are automatically reflected in the browser
-4. Navigation structure is defined in `docs/SUMMARY.md`
-
-## Troubleshooting
-
-### Version mismatch errors
-
-If you encounter build errors, verify you have the correct versions installed:
-
-```bash
-mdbook --version
-mdbook-mermaid --version
-```
-
-If you have different versions, uninstall the current ones and reinstall by following the [Installation section](#installation):
-
-```bash
-cargo uninstall mdbook
-cargo uninstall mdbook-mermaid
-```
-
-### Cargo install fails with feature 'edition2024' is required
-
-You may see an error like:
-
-```sh
-failed to download `globset v0.4.18`
-failed to parse manifest ... feature `edition2024` is required
-The package requires the Cargo feature called `edition2024`, but that feature is not stabilized in this version of Cargo.
-```
-
-This can happen when installing `mdbook` version 0.5.2 because one of its transitive dependencies has been updated to
-use Rust edition 2024, which is only supported on nightly Rust toolchains.
-
-To fix it, install the required `mdbook` version (0.5.2) using nightly Rust:
-
-```sh
-rustup install nightly
-rustup run nightly cargo install mdbook --version 0.5.2
-```
-
-### Mermaid diagrams not rendering
-
-If Mermaid diagrams are not rendering in the browser:
-
-1. Clear your browser cache
-2. Run `mdbook clean` to remove the build directory
-3. Run `mdbook serve --open` again
-
-### Port already in use
-
-If port 3000 is already in use, specify a different port:
-
-```bash
-mdbook serve --port 3001 --open
-```
-
-## Additional resources
-
-- [mdBook documentation](https://rust-lang.github.io/mdBook/)
-- [mdBook Mermaid documentation](https://github.com/badboy/mdbook-mermaid)
-- [Mermaid diagram syntax](https://mermaid.js.org/)

docs/README.md

@@ -7,7 +7,7 @@
 
 In this repository you will find the containers to run:
 
-* Wazuh manager: it runs the Wazuh manager, and Wazuh API
+* Wazuh manager: it runs the Wazuh manager, Wazuh API and Filebeat OSS
 * Wazuh dashboard: provides a web user interface to browse through alert data and allows you to visualize the agents configuration and status.
 * Wazuh indexer: Wazuh indexer container (working as a single-node cluster or as a multi-node cluster). **Be aware to increase the `vm.max_map_count` setting, as it's detailed in the [Wazuh documentation](https://documentation.wazuh.com/current/docker/wazuh-container.html#increase-max-map-count-on-your-host-linux).**
 * Wazuh agent: This container contains the Wazuh agent services. Current functionality is limited.
@@ -28,7 +28,7 @@ The folder `wazuh-agent` contains a README explaining how to run a container wit
 
 	├── build-docker-images
 	│   ├── build-images.sh
-	│   ├── docker-bake.hcl
+	│   ├── build-images.yml
 	│   ├── README.md
 	│   ├── wazuh-agent
 	│   │   ├── config
@@ -43,25 +43,43 @@ The folder `wazuh-agent` contains a README explaining how to run a container wit
 	│   │   └── Dockerfile
 	│   ├── wazuh-dashboard
 	│   │   ├── config
+	│   │   │   ├── check_repository.sh
+	│   │   │   ├── config.sh
+	│   │   │   ├── config.yml
 	│   │   │   ├── entrypoint.sh
-	│   │   │   ├── wazuh_dashboard_config.sh
+	│   │   │   ├── wazuh_app_config.sh
+	│   │   │   └── wazuh.yml
 	│   │   └── Dockerfile
 	│   ├── wazuh-indexer
 	│   │   ├── config
+	│   │   │   ├── action_groups.yml
+	│   │   │   ├── check_repository.sh
 	│   │   │   ├── config.sh
+	│   │   │   ├── config.yml
 	│   │   │   ├── entrypoint.sh
+	│   │   │   ├── internal_users.yml
+	│   │   │   ├── opensearch.yml
+	│   │   │   ├── roles_mapping.yml
+	│   │   │   ├── roles.yml
 	│   │   │   └── securityadmin.sh
 	│   │   └── Dockerfile
 	│   └── wazuh-manager
 	│       ├── config
+	│       │   ├── check_repository.sh
 	│       │   ├── create_user.py
 	│       │   ├── etc
 	│       │   │   ├── cont-init.d
 	│       │   │   │   ├── 0-wazuh-init
+	│       │   │   │   ├── 1-config-filebeat
 	│       │   │   │   └── 2-manager
 	│       │   │   └── services.d
-	│       │   │       └── wazuh-manager-logs
+	│       │   │       ├── filebeat
+	│       │   │       │   ├── finish
+	│       │   │       │   └── run
+	│       │   │       └── ossec-logs
 	│       │   │           └── run
+	│       │   ├── filebeat_module.sh
+	│       │   ├── filebeat.yml
 	│       │   ├── permanent_data.env
 	│       │   └── permanent_data.sh
 	│       └── Dockerfile
@@ -89,7 +107,7 @@ The folder `wazuh-agent` contains a README explaining how to run a container wit
 	│   │   │   ├── README.md
 	│   │   │   └── requirements.md
 	│   │   ├── glossary.md
-	│   │   ├── introduction
+	│   │   ├── Introduction
 	│   │   │   ├── compatibility.md
 	│   │   │   ├── description.md
 	│   │   │   └── README.md
@@ -120,7 +138,7 @@ The folder `wazuh-agent` contains a README explaining how to run a container wit
 	│   │       ├── wazuh2.indexer.yml
 	│   │       └── wazuh3.indexer.yml
 	│   ├── docker-compose.yml
-	│   ├── generate-indexer-certs.yml
+	│   ├── generate-certs.yml
 	│   ├── Migration-to-Wazuh-4.4.md
 	│   ├── README.md
 	│   └── volume-migrator.sh
@@ -139,7 +157,7 @@ The folder `wazuh-agent` contains a README explaining how to run a container wit
 	│   │   │   └── wazuh.indexer.yml
 	│   │   └── wazuh_indexer_ssl_certs  [error opening dir]
 	│   ├── docker-compose.yml
-	│   ├── generate-indexer-certs.yml
+	│   ├── generate-certs.yml
 	│   └── README.md
 	├── VERSION.json
 	└── wazuh-agent

docs/SUMMARY.md

@@ -8,13 +8,11 @@
 - [Setup Environment](dev/setup.md)
 - [Build Image](dev/build-image.md)
 - [Run Tests](dev/run-tests.md)
-- [Workflow Usage](dev/workflow-usage.md)
 
 # Reference Manual
 
-- [Introduction](ref/introduction/introduction.md)
-  - [Description](ref/introduction/description.md)
-  - [Compatibility](ref/introduction/compatibility.md)
+- [Introduction](ref/Introduction/introduction.md)
+  - [Description](ref/Introduction/description.md)
 - [Getting Started](ref/getting-started/getting-started.md)
   - [Requirements](ref/getting-started/requirements.md)
   - [Deployment](ref/getting-started/deployment/deployment.md)
@@ -25,8 +23,4 @@
   - [Environment Variabless](ref/configuration/environment-variables.md)
   - [Configuration files](ref/configuration/configuration-files.md)
 - [Upgrade](ref/upgrade.md)
-- [Uninstall](ref/uninstall.md)
-- [Backup and restore](ref/backup-and-restore.md)
-- [Security](ref/security.md)
-- [Performance](ref/performance.md)
-- [Glossary](ref/glossary.md)
+- [Glossary](ref/glossary.md)

docs/book.toml

@@ -1,31 +1,7 @@
 [book]
-title = "Wazuh Docker documentation"
-authors = ["Wazuh XDRSIEM DevOps Team"]
-description = "The technical documentation for the Wazuh Docker deployment."
-language = "en"
+title = "Wazuh Docker Documentation"
+description = "Technical documentation for Wazuh Docker deployment."
+authors = ["Victor Erenu"]
+multilingual = false
 src = "."
-
-[build]
-build-dir = "book"
-create-missing = false
-
-[preprocessor.mermaid]
-command = "mdbook-mermaid"
-
-[output.html]
-default-theme = "light"
-preferred-dark-theme = "navy"
-git-repository-url = "https://github.com/wazuh/wazuh-docker"
-additional-js = ["mermaid.min.js", "mermaid-init.js"]
-
-[output.html.fold]
-enable = true
-level = 0
-
-[output.html.search]
-enable = true
-
-[output.html.playground]
-editable = false
-copyable = true
-
+language = "en"

docs/dev/build-image.md

@@ -1,39 +1,32 @@
 # Wazuh Docker Image Builder
 
-The creation of the images for the Wazuh stack deployment in Docker is done with the `build-docker-images/build-images.sh` script
+The creation of the images for the Wazuh stack deployment in Docker is done with the build-images.yml script
+
+To execute the process, the following must be executed in the root of the wazuh-docker repository:
+
+```
+$ build-docker-images/build-images.sh
+```
 
 This script initializes the environment variables needed to build each of the images.
 
-To execute it, make sure to be in the `build-docker-images` directory:
+The script allows you to build images from other versions of Wazuh, to do this you must use the -v or --version argument:
 
-```bash
-cd build-docker-images
+```
+$ build-docker-images/build-images.sh -v 6.0.0
 ```
 
-Then execute:
+To get all the available script options use the -h or --help option:
 
-```bash
-./build-images.sh
 ```
+$ build-docker-images/build-images.sh -h
 
-The script also allows to build images from other versions of Wazuh by using the `-v` or `--version` argument:
+Usage: build-docker-images/build-images.sh [OPTIONS]
 
-```bash
-./build-images.sh -v 5.0.0
-```
-
-To get all the available script options use the `-h` or `--help` option:
-
-```bash
-./build-images.sh -h
-
-Usage: build-images.sh [OPTIONS]
-
-    -d, --dev <ref>              [Optional] Set the development stage you want to build, example rc2 or beta1, not used by default.
-    -refs, --references <ref>    [Optional] Set each Wazuh component reference to be build (indexer, manager, dasboard and agent). By default, using the latest release: ['latest', 'latest', 'latest', 'latest']
-    -rg, --registry <reg>        [Optional] Set the Docker registry to push the images.
-    -v, --version <ver>          [Optional] Set the Wazuh version should be builded. By default, 5.0.0.
-    -m, --multiarch              [Optional] Enable multi-architecture builds.
+    -d, --dev <ref>              [Optional] Set the development stage you want to build, example rc1 or beta1, not used by default.
+    -f, --filebeat-module <ref>  [Optional] Set Filebeat module version. By default 0.4.
+    -r, --revision <rev>         [Optional] Package revision. By default 1
+    -v, --version <ver>          [Optional] Set the Wazuh version should be builded. By default, 6.0.0.
     -h, --help                   Show this help.
 
-```
+```

docs/dev/introduction.md

@@ -1,6 +1,6 @@
 # Development Guide - Introduction
 
-Welcome to the Development Guide for Wazuh-docker version 5.0.0 This guide is intended for developers, contributors, and advanced users who wish to understand the development aspects of the Wazuh-Docker project, build custom Docker images, or contribute to its development.
+Welcome to the Development Guide for Wazuh-docker version 6.0.0 This guide is intended for developers, contributors, and advanced users who wish to understand the development aspects of the Wazuh-Docker project, build custom Docker images, or contribute to its development.
 
 ## Purpose of This Guide
 

docs/dev/run-tests.md

@@ -2,8 +2,6 @@
 
 This repository includes automated tests designed to validate the correct deployment of Wazuh using Docker. These tests are executed on every pull request (PR) to ensure the integrity and stability of the system when changes are introduced.
 
-Check more information on the [Workflow usage](workflow-usage.md) page.
-
 ## Purpose
 
 The main objective of the tests is to verify that the Wazuh Docker environment can be successfully deployed and that all its core components (Wazuh Manager, Indexer, Dashboard, and Agents) operate as expected after any modification in the codebase.

docs/dev/setup.md

@@ -1,6 +1,6 @@
 # Development Guide - Setup Environment
 
-This section outlines the steps required to set up your local development environment for working with the Wazuh-Docker project (version 5.0.0). A proper setup is crucial for building images, running tests, and contributing effectively.
+This section outlines the steps required to set up your local development environment for working with the Wazuh-Docker project (version 6.0.0). A proper setup is crucial for building images, running tests, and contributing effectively.
 
 ## Prerequisites
 
@@ -26,12 +26,12 @@ Before you begin, ensure your system meets the following requirements:
 Follow these steps to prepare your development environment:
 
 1.  **Clone the Repository**:
-    Clone the `wazuh-docker` repository from GitHub. It's important to check out the specific branch you intend to work with, in this case, `5.0.0`.
+    Clone the `wazuh-docker` repository from GitHub. It's important to check out the specific branch you intend to work with, in this case, `6.0.0`.
 
     ```bash
     git clone [https://github.com/wazuh/wazuh-docker.git](https://github.com/wazuh/wazuh-docker.git)
     cd wazuh-docker
-    git checkout v5.0.0
+    git checkout v6.0.0
     ```
 
 2.  **Verify Docker Installation**:

docs/dev/workflow-usage.md

@@ -1,60 +0,0 @@
-# Workflow usage
-
-The Procedure_push_docker_images.yml workflow builds and pushes multi-architecture Docker images (amd64/arm64) of Wazuh core components (Indexer, Manager, Dashboard, and Agent) to container registries.
-
-## Input Parameters
-
-| Parameter | Description | Default | Required |
-|-----------|-------------|---------|----------|
-| `image_tag` | Docker image version tag | `5.0.0` | Yes |
-| `docker_reference` | Branch/tag to build from | - | Yes |
-| `reference` | Dev reference (for pre-release builds) | `latest` | No |
-| `id` | Workflow run identifier | - | No |
-| `dev` | Enable development mode (adds `-dev` suffix) | `false`/`true` | No |
-
-## Development vs Production Mode
-
-**Development Mode** (`dev: true`):
-
-- Pushes to AWS ECR (Elastic Container Registry)
-- Uses pre-signed S3 URLs for packages
-- Generates dynamic `artifact_urls.yaml` from S3 bucket
-- Adds development reference to image tags
-- Authenticates via AWS IAM role
-
-**Production Mode** (`dev: false`):
-
-- Pushes to Docker Hub
-- Uses public package repositories
-- Authenticates with Docker Hub credentials
-- Supports version stages (rc, beta, etc.)
-
-## Build Process
-
-1. **Artifact Resolution**:
-   - Dev mode: Creates pre-signed URLs for all Wazuh packages from S3
-   - Prod mode: Uses packages from public repositories
-
-2. **Multi-architecture Build**:
-   - Uses Docker Buildx with QEMU for cross-platform builds
-   - Builds for `linux/amd64` and `linux/arm64`
-   - Leverages `docker-bake.hcl` for parallel multi-arch build configuration
-
-3. **Image Publishing**:
-   - Tags images appropriately based on mode
-   - Pushes to the configured registry
-   - Generates .env file with build metadata
-
-## Log Collection Feature
-
-When tests fail, the workflows automatically collect and display relevant logs to help diagnose issues quickly.
-
-This is implemented via two scripts, executed depending on the test setup:
-Single-node: `single-node-log-check.sh`
-Multi-node: `multi-node-log-check.sh`
-
-Capabilities include:
-
-- Collects ERROR, WARNING, and CRITICAL messages from all nodes.
-- Automatically gathers logs on test failures for faster debugging.
-

docs/mermaid-init.js

@@ -1,35 +0,0 @@
-(() => {
-    const darkThemes = ['ayu', 'navy', 'coal'];
-    const lightThemes = ['light', 'rust'];
-
-    const classList = document.getElementsByTagName('html')[0].classList;
-
-    let lastThemeWasLight = true;
-    for (const cssClass of classList) {
-        if (darkThemes.includes(cssClass)) {
-            lastThemeWasLight = false;
-            break;
-        }
-    }
-
-    const theme = lastThemeWasLight ? 'default' : 'dark';
-    mermaid.initialize({ startOnLoad: true, theme });
-
-    // Simplest way to make mermaid re-render the diagrams in the new theme is via refreshing the page
-
-    for (const darkTheme of darkThemes) {
-        document.getElementById(darkTheme).addEventListener('click', () => {
-            if (lastThemeWasLight) {
-                window.location.reload();
-            }
-        });
-    }
-
-    for (const lightTheme of lightThemes) {
-        document.getElementById(lightTheme).addEventListener('click', () => {
-            if (!lastThemeWasLight) {
-                window.location.reload();
-            }
-        });
-    }
-})();

docs/ref/Introduction/description.md

@@ -1,6 +1,6 @@
 # Reference Manual - Description
 
-This section provides a detailed description of Wazuh-docker (version 5.0.0), its components, and its architecture when deployed using Docker containers. Understanding these aspects is key to effectively deploying and managing your Wazuh environment.
+This section provides a detailed description of Wazuh-docker (version 6.0.0), its components, and its architecture when deployed using Docker containers. Understanding these aspects is key to effectively deploying and managing your Wazuh environment.
 
 ## What is Wazuh?
 
@@ -18,7 +18,7 @@ Wazuh-docker is a project that provides Docker images and `docker compose` confi
 
 ## Core Components in Wazuh-Docker
 
-The Wazuh-Docker project typically provides images for the following core Wazuh components, adapted for version 5.0.0:
+The Wazuh-Docker project typically provides images for the following core Wazuh components, adapted for version 6.0.0:
 
 1.  **Wazuh Manager**:
     -   The central component that collects and analyzes data from deployed Wazuh agents.
@@ -28,7 +28,7 @@ The Wazuh-Docker project typically provides images for the following core Wazuh
 2.  **Wazuh Indexer**:
     -   A highly scalable, full-text search and analytics engine.
     -   Based on OpenSearch (or historically Elasticsearch), it stores and indexes alerts and monitoring data generated by the Wazuh manager.
-    -   The Wazuh indexer container provides the data persistence layer for Wazuh alerts and events. For version 5.0.0, this is typically an OpenSearch-based component.
+    -   The Wazuh indexer container provides the data persistence layer for Wazuh alerts and events. For version 6.0.0, this is typically an OpenSearch-based component.
 
 3.  **Wazuh Dashboard**:
     -   A flexible visualization tool based on OpenSearch Dashboards (or historically Kibana).

docs/ref/Introduction/introduction.md

@@ -1,6 +1,6 @@
 # Reference Manual - Introduction
 
-Welcome to the Reference Manual for Wazuh-Docker, version 5.0.0. This manual provides comprehensive information about deploying, configuring, and managing your Wazuh environment using Docker.
+Welcome to the Reference Manual for Wazuh-Docker, version 6.0.0. This manual provides comprehensive information about deploying, configuring, and managing your Wazuh environment using Docker.
 
 ## Purpose of This Manual
 
@@ -44,4 +44,4 @@ This manual is structured to help you find information efficiently:
 -   If you need to customize your deployment, refer to the [Configuration](configuration/configuration.md) section.
 -   For specific terms or concepts, consult the [Glossary](glossary.md).
 
-This manual refers to version 5.0.0 of Wazuh-Docker. Ensure you are using the documentation that corresponds to your deployed version.
+This manual refers to version 6.0.0 of Wazuh-Docker. Ensure you are using the documentation that corresponds to your deployed version.

docs/ref/backup-and-restore.md

@@ -1,6 +0,0 @@
-# Backup and restore
-
-For backup and restore, refer to the documentation for each component:
-
-- [Wazuh manager](https://github.com/wazuh/wazuh/blob/v5.0.0/docs/ref/backup-restore.md)
-- [Wazuh agent](https://github.com/wazuh/wazuh-agent/blob/v5.0.0/docs/ref/backup-restore.md)

docs/ref/configuration/configuration-files.md

@@ -2,8 +2,8 @@
 
 ### 1. Wazuh Manager Configuration
 
-* **`wazuh-manager.conf`**: The main configuration file for the Wazuh manager. It controls rules, decoders, agent enrollment, active responses, clustering, and more.
-    * **Customization**: Mount a custom `wazuh-manager.conf` or specific configuration snippets (e.g., local rules in `local_rules.xml`) into the manager container at `/wazuh-mount-point/`, which will be copied to the path `/var/wazuh-manager` (e.g., the file `/var/wazuh-manager/etc/wazuh-manager.conf` must be mounted at `/wazuh-mount-point/etc/wazuh-manager.conf`) .
+* **`ossec.conf`**: The main configuration file for the Wazuh manager. It controls rules, decoders, agent enrollment, active responses, integrations, clustering, and more.
+    * **Customization**: Mount a custom `ossec.conf` or specific configuration snippets (e.g., local rules in `local_rules.xml`) into the manager container at `/wazuh-mount-point/`, which will be copied to the path `/var/ossec` (e.g., the file `/var/ossec/etc/ossec.conf` must be mounted at `/wazuh-mount-point/etc/ossec.conf`) .
 
 ### 2. Wazuh Indexer Configuration
 
@@ -28,20 +28,5 @@
         docker compose up -d
         ```
 
-Consult the official Wazuh documentation for version 5.0.0 for detailed information on all possible configuration parameters for each component.
 
-## Persistence configuration
-
-When customizing your Wazuh Docker deployment, certain files and directories must be persisted to retain your changes across container restarts and recreations. This is critical for maintaining custom configurations, user credentials, and security settings.
-
-### Volumes and Bind Mounts
-
-Docker volumes allow you to persist data outside of container lifecycles. When a container is removed or recreated, data stored in volumes remains intact. This is essential for maintaining configuration files, user data, and other persistent state. While, bind mounts allow you to mount a file or directory from the host into the container.
-
-To persist files or directories in your Wazuh deployment, you can mount them as volumes or bind mounts in your `docker-compose.yml` file.
-
-> **Important**: Ensure that files exist on the host before starting the containers. If the file doesn't exist, Docker will create a directory instead, which may cause startup failures.
-
-For more information on Docker volumes and bind mounts, refer to the official Docker documentation:
-- [Use volumes](https://docs.docker.com/storage/volumes/)
-- [Bind mounts](https://docs.docker.com/storage/bind-mounts/)
+Consult the official Wazuh documentation for version 6.0.0 for detailed information on all possible configuration parameters for each component.

docs/ref/configuration/configuration.md

@@ -1,6 +1,6 @@
 # Reference Manual - Configuration
 
-This section details how to configure your Wazuh-Docker deployment (version 5.0.0). Proper configuration is key to tailoring the Wazuh stack to your specific needs, managing data persistence, and integrating with your environment.
+This section details how to configure your Wazuh-Docker deployment (version 6.0.0). Proper configuration is key to tailoring the Wazuh stack to your specific needs, managing data persistence, and integrating with your environment.
 
 ## Overview of Configuration Methods
 
@@ -11,7 +11,7 @@ Configuring Wazuh components within a Docker environment typically involves seve
     * These are often used for setting up initial passwords, component versions, cluster names, or basic operational parameters.
 
 2.  **[Configuration Files](configuration-files.md)**:
-    * Core Wazuh components (manager, indexer, dashboard) rely on their traditional configuration files (e.g., `wazuh-manager.conf`, `opensearch.yml`, `opensearch_dashboards.yml`).
+    * Core Wazuh components (manager, indexer, dashboard) rely on their traditional configuration files (e.g., `ossec.conf`, `opensearch.yml`, `opensearch_dashboards.yml`).
     * To customize these, you typically mount your custom configuration files into the containers, replacing or supplementing the defaults. This is managed using Docker volumes in your `docker-compose.yml`.
 
 3.  **Docker Compose File (`docker-compose.yml`)**:

docs/ref/configuration/environment-variables.md

@@ -4,14 +4,11 @@ This document outlines the environment variables applicable to the Wazuh Docker
 
 ## Table of Contents
 
-- [Environment Variables in Wazuh Docker Deployment](#environment-variables-in-wazuh-docker-deployment)
-  - [Table of Contents](#table-of-contents)
-  - [Wazuh Manager](#wazuh-manager)
-  - [Wazuh Indexer](#wazuh-indexer)
-  - [Wazuh Dashboard](#wazuh-dashboard)
-  - [Wazuh Agent](#wazuh-agent)
-  - [Overriding Configuration Files with Environment Variables](#overriding-configuration-files-with-environment-variables)
-    - [Examples:](#examples)
+- [Wazuh Manager](#wazuh-manager)
+- [Wazuh Indexer](#wazuh-indexer)
+- [Wazuh Dashboard](#wazuh-dashboard)
+- [Wazuh Agent](#wazuh-agent)
+- [Overriding Configuration Files with Environment Variables](#overriding-configuration-files-with-environment-variables)
 
 ---
 
@@ -26,6 +23,8 @@ environment:
   - WAZUH_API_URL=https://wazuh.manager
   - DASHBOARD_USERNAME=kibanaserver
   - DASHBOARD_PASSWORD=kibanaserver
+  - API_USERNAME=wazuh-wui
+  - API_PASSWORD=MyS3cr37P450r.*-
 ```
 
 **Variable Descriptions:**
@@ -33,6 +32,7 @@ environment:
 - `INDEXER_USERNAME` / `INDEXER_PASSWORD`: Credentials for accessing the Wazuh Indexer with `admin` user or a user with the same permissions.
 - `WAZUH_API_URL`: URL of the Wazuh API, used by other services for communication.
 - `DASHBOARD_USERNAME` / `DASHBOARD_PASSWORD`: Credentials for the Wazuh Dashboard to authenticate with the Indexer.
+- `API_USERNAME` / `API_PASSWORD`: Credentials for the Wazuh API user, utilized by the Dashboard for API interactions.
 
 ---
 
@@ -62,6 +62,8 @@ environment:
   - WAZUH_API_URL=https://wazuh.manager
   - DASHBOARD_USERNAME=kibanaserver
   - DASHBOARD_PASSWORD=kibanaserver
+  - API_USERNAME=wazuh-wui
+  - API_PASSWORD=MyS3cr37P450r.*-
 ```
 
 **Variable Descriptions:**
@@ -82,11 +84,14 @@ The Wazuh Agent container uses the following environment variables to dynamicall
 ```yaml
 environment:
   - WAZUH_MANAGER_SERVER=wazuh.manager
+  - WAZUH_MANAGER_PORT=1514
   - WAZUH_REGISTRATION_SERVER=wazuh.manager
+  - WAZUH_REGISTRATION_PORT=1515
   - WAZUH_AGENT_NAME=my-agent
+  - WAZUH_REGISTRATION_PASSWORD=StrongPassword
 ```
 
-These variables are used by the `set_manager_conn()` function in the entrypoint script to replace placeholder values in `ossec.conf`.
+These variables are used by the `set_manager_conn()` function in the entrypoint script to replace placeholder values in `ossec.conf` and set the enrollment password.
 
 ---
 

docs/ref/getting-started/deployment/deployment.md

@@ -1,6 +1,6 @@
 # Reference Manual - Deployment
 
-This section provides detailed instructions for deploying Wazuh-Docker (version 5.0.0) in various configurations. Choose the deployment model that best suits your needs, from simple single-node setups for testing to more robust multi-node configurations for production environments.
+This section provides detailed instructions for deploying Wazuh-Docker (version 6.0.0) in various configurations. Choose the deployment model that best suits your needs, from simple single-node setups for testing to more robust multi-node configurations for production environments.
 
 ## Overview of Deployment Options
 
@@ -22,13 +22,13 @@ Wazuh-Docker offers flexibility in how you can deploy the Wazuh stack. The prima
 
 Ensure you have:
 
--   Met all the [System Requirements](../requirements.md).
+-   Met all the [System Requirements](ref/getting-started/requirements.md).
 -   Installed Docker and Docker Compose on your host(s).
--   Cloned the `wazuh-docker` repository (version `5.0.0`) or downloaded the necessary deployment files.
+-   Cloned the `wazuh-docker` repository (version `6.0.0`) or downloaded the necessary deployment files.
     ```bash
-    git clone https://github.com/wazuh/wazuh-docker.git
+    git clone [https://github.com/wazuh/wazuh-docker.git](https://github.com/wazuh/wazuh-docker.git)
     cd wazuh-docker
-    git checkout v5.0.0
+    git checkout v6.0.0
     ```
 -   Made a backup of any existing Wazuh data if you are migrating or upgrading.
 

docs/ref/getting-started/deployment/multi-node.md

@@ -2,76 +2,33 @@
 
 ## Deploying Wazuh Docker in a Multi-Node Configuration
 
-This deployment utilizes the `multi-node/docker-compose.yml` file, which defines a cluster setup with two Wazuh Manager, three Wazuh Indexer, and one Wazuh Dashboard containers. Follow these steps to deploy this configuration:
-
-1.  Increase `vm.max_map_count` on each Docker host that will run a Wazuh Indexer container (Linux). This setting is crucial for Wazuh Indexer to operate correctly. This command requires root permissions:
-
-    ```bash
-    sudo sysctl -w vm.max_map_count=262144
-    ```
-
-    **Note:** This change is temporary and will revert upon reboot. To make it permanent on each relevant host, you'll need to edit the `/etc/sysctl.conf` file, add `vm.max_map_count=262144`, and then apply the change with `sudo sysctl -p`.
-
-2.  Navigate to the `multi-node` directory within your repository:
+This deployment utilizes the `multi-node/docker-compose.yml` file, which defines a cluster setup with two Wazuh manager containers, three Wazuh indexer containers, and one Wazuh dashboard container. Follow these steps to deploy this configuration:
 
+1.  Navigate to the `multi-node` directory within your repository:
     ```bash
     cd multi-node
     ```
 
-3.  Download the certificate creation script and config.yml file:
-
+2.  Increase `vm.max_map_count` on each Docker host that will run a Wazuh Indexer container (Linux). This setting is crucial for Wazuh Indexer to operate correctly. This command requires root permissions:
     ```bash
-    curl -o wazuh-certs-tool.sh https://packages.wazuh.com/5.0/wazuh-certs-tool-5.0.0-1.sh
-    curl -o config.yml https://packages.wazuh.com/5.0/config-5.0.0-1.yml
+    sudo sysctl -w vm.max_map_count=262144
     ```
+    **Note:** This change is temporary and will revert upon reboot. To make it permanent on each relevant host, you'll need to edit the `/etc/sysctl.conf` file, add `vm.max_map_count=262144`, and then apply the change with `sudo sysctl -p`.
 
-4.  Edit the `config.yml` file with the configuration of the Wazuh components to be deployed
-
-    ```yaml
-    nodes:
-      # Wazuh indexer server nodes
-      indexer:
-        - name: wazuh1.indexer
-          dns: "wazuh1.indexer"
-        - name: wazuh2.indexer
-          dns: "wazuh2.indexer"
-        - name: wazuh3.indexer
-          dns: "wazuh3.indexer"
-
-      # Wazuh manager nodes
-      # Use node_type only with more than one Wazuh manager
-      manager:
-        - name: wazuh.master
-          dns: "wazuh.master"
-          node_type: master
-        - name: wazuh.worker
-          dns: "wazuh.worker"
-          node_type: worker
-
-      # Wazuh dashboard node
-      dashboard:
-        - name: wazuh.dashboard
-          dns: "wazuh.dashboard"
-    ```
-
-5.  Run the certificate creation script:
-
+3.  Run the script to generate the necessary certificates for the Wazuh Stack. This ensures secure communication between the nodes:
     ```bash
-    sudo bash ../tools/utils/deployment/certificates-conf.sh --cert --copy --priv
+    docker-compose -f generate-certs.yml run --rm generator
     ```
 
-6.  Start the Wazuh environment using `docker compose`:
+4.  Start the Wazuh environment using `docker-compose`:
 
     * To run in the foreground (logs will be displayed in your current terminal; press `Ctrl+C` to stop):
-
         ```bash
-        docker compose up
+        docker-compose up
         ```
-
     * To run in the background (detached mode, allowing the containers to run independently of your terminal):
-
         ```bash
-        docker compose up -d
+        docker-compose up -d
         ```
 
 Please allow some time for the environment to initialize, especially on the first run. A multi-node setup can take a few minutes (depending on your host resources and network) as the Wazuh Indexer cluster forms, and the necessary indexes and index patterns are generated.

docs/ref/getting-started/deployment/single-node.md

@@ -2,68 +2,34 @@
 
 ## Deploying Wazuh Docker in a Single-Node Configuration
 
-This deployment uses the `single-node/docker-compose.yml` file, which defines a setup with one Wazuh Manager, one Wazuh Indexer, and one Wazuh Dashboard container. Follow these steps to deploy it:
-
-1.  Increase `vm.max_map_count` on each Docker host that will run a Wazuh Indexer container (Linux). This setting is crucial for Wazuh Indexer to operate correctly. This command requires root permissions:
-
-    ```bash
-    sudo sysctl -w vm.max_map_count=262144
-    ```
-
-    **Note:** This change is temporary and will revert upon reboot. To make it permanent, you'll need to edit the `/etc/sysctl.conf` file and add `vm.max_map_count=262144`, then apply with `sudo sysctl -p`.
-
-2.  Navigate to the `single-node` directory within your repository:
+This deployment uses the `single-node/docker-compose.yml` file, which defines a setup with one Wazuh manager container, one Wazuh indexer container, and one Wazuh dashboard container. Follow these steps to deploy it:
 
+1.  Navigate to the `single-node` directory within your repository:
     ```bash
     cd single-node
     ```
 
-3.  Download the certificate creation script and `config.yml` file:
-
+2.  Increase `vm.max_map_count` on each Docker host that will run a Wazuh Indexer container (Linux). This setting is crucial for Wazuh Indexer to operate correctly. This command requires root permissions:
     ```bash
-    curl -o wazuh-certs-tool.sh https://packages.wazuh.com/5.0/wazuh-certs-tool-5.0.0-1.sh
-    curl -o config.yml https://packages.wazuh.com/5.0/config-5.0.0-1.yml
+    sudo sysctl -w vm.max_map_count=262144
     ```
+    **Note:** This change is temporary and will revert upon reboot. To make it permanent, you'll need to edit the `/etc/sysctl.conf` file and add `vm.max_map_count=262144`, then apply with `sudo sysctl -p`.
 
-4.  Edit the config.yml file with the configuration of the Wazuh components to be deployed
-
-    ```yaml
-    nodes:
-      # Wazuh indexer server nodes
-      indexer:
-        - name: wazuh.indexer
-          dns: "wazuh.indexer"
-
-      # Wazuh manager nodes
-      # Use node_type only with more than one Wazuh manager
-      manager:
-        - name: wazuh.manager
-          dns: "wazuh.manager"
-
-      # Wazuh dashboard node
-      dashboard:
-        - name: wazuh.dashboard
-          dns: "wazuh.dashboard"
-    ```
-
-5.  Run the certificate creation script:
-
+3.  Run the script to generate the necessary certificates for the Wazuh Stack. This ensures secure communication between the nodes:
     ```bash
-    sudo bash ../tools/utils/deployment/certificates-conf.sh --cert --copy --priv
+    docker-compose -f generate-certs.yml run --rm generator
     ```
 
-6.  Start the Wazuh environment using `docker compose`:
+4.  Start the Wazuh environment using `docker-compose`:
 
     * To run in the foreground (logs will be displayed in your current terminal; press `Ctrl+C` to stop):
-
         ```bash
-        docker compose up
+        docker-compose up
         ```
-
     * To run in the background (detached mode, allowing the containers to run independently of your terminal):
-
         ```bash
-        docker compose up -d
+        docker-compose up -d
         ```
 
 Please allow some time for the environment to initialize, especially on the first run. It can take approximately a minute or two (depending on your host's resources) as the Wazuh Indexer starts up and generates the necessary indexes and index patterns.
+

docs/ref/getting-started/deployment/wazuh-agent.md

@@ -23,14 +23,14 @@ Follow these steps to deploy the Wazuh agent using Docker.
     ```
     **Note:** Replace `<YOUR_WAZUH_MANAGER_IP_OR_HOSTNAME>` with the actual IP address or hostname of your Wazuh manager.
 
-3.  Start the environment using `docker compose`:
+3.  Start the environment using `docker-compose`:
 
     * To run in the foreground (logs will be displayed in your current terminal, and you can stop it with `Ctrl+C`):
         ```bash
-        docker compose up
+        docker-compose up
         ```
 
     * To run in the background (detached mode, allowing the container to run independently of your terminal):
         ```bash
-        docker compose up -d
+        docker-compose up -d
         ```

docs/ref/getting-started/getting-started.md

@@ -1,6 +1,6 @@
 # Reference Manual - Getting Started
 
-This section guides you through the initial steps to get your Wazuh-docker (version 5.0.0) environment up and running. We will cover the prerequisites and point you to the deployment instructions.
+This section guides you through the initial steps to get your Wazuh-docker (version 6.0.0) environment up and running. We will cover the prerequisites and point you to the deployment instructions.
 
 ## Overview
 
@@ -18,7 +18,7 @@ Getting started with Wazuh-Docker involves the following general steps:
 
 Before diving into the deployment, please ensure you have reviewed:
 
--   The [Description](ref/introduction/description.md) of Wazuh-docker to understand the components and architecture.
+-   The [Description](ref/Introduction/description.md) of Wazuh-docker to understand the components and architecture.
 -   The [Requirements](ref/getting-started/requirements.md) to confirm your environment is suitable.
 
 ## Steps to Get Started
@@ -27,11 +27,11 @@ Before diving into the deployment, please ensure you have reviewed:
     Verify that your host system has sufficient RAM, CPU, and disk space. Ensure Docker and Docker Compose are installed and functioning correctly.
 
 2.  **Obtain Wazuh-docker Configuration**:
-    You'll need the Docker Compose files and any associated configuration files from the `wazuh-docker` repository for version 5.0.0.
+    You'll need the Docker Compose files and any associated configuration files from the `wazuh-docker` repository for version 6.0.0.
     ```bash
     git clone [https://github.com/wazuh/wazuh-docker.git](https://github.com/wazuh/wazuh-docker.git)
     cd wazuh-docker
-    git checkout v5.0.0
+    git checkout v6.0.0
     # Navigate to the specific docker-compose directory, e.g., single-node or multi-node
     # cd docker-compose/single-node/ (example path)
     ```

docs/ref/getting-started/requirements.md

@@ -1,6 +1,6 @@
 # Reference Manual - Requirements
 
-Before deploying Wazuh-Docker (version 5.0.0), it's essential to ensure your environment meets the necessary hardware and software requirements. Meeting these prerequisites will help ensure a stable and performant Wazuh deployment.
+Before deploying Wazuh-Docker (version 6.0.0), it's essential to ensure your environment meets the necessary hardware and software requirements. Meeting these prerequisites will help ensure a stable and performant Wazuh deployment.
 
 ## Host System Requirements
 
@@ -24,17 +24,17 @@ These are general recommendations. Actual needs may vary based on the number of
 * **Network**:
     * A stable network connection with sufficient bandwidth, especially if agents are reporting from remote locations.
 
-### Software Prerequisites:
-
-#### Linux:
+### Software:
 
+* **Operating System**:
+    * A 64-bit Linux distribution is preferred (e.g., Ubuntu, CentOS, RHEL, Debian).
 * **Docker Engine**:
     * Version `20.10.0` or newer.
     * Install Docker by following the official instructions: [Install Docker Engine](https://docs.docker.com/engine/install/).
 * **Git Client**:
     * Required for cloning the `wazuh-docker` repository.
 * **Web Browser**:
-    * A modern web browser (e.g., Chrome, Firefox, Edge, Safari) for accessing the Wazuh dashboard.
+    * A modern web browser (e.g., Chrome, Firefox, Edge, Safari) for accessing the Wazuh Dashboard.
 * **`vm.max_map_count` (Linux Hosts for Wazuh Indexer/OpenSearch)**:
     * The Wazuh Indexer (OpenSearch) requires a higher `vm.max_map_count` setting than the default on most Linux systems.
     * Set it permanently:
@@ -48,33 +48,6 @@ These are general recommendations. Actual needs may vary based on the number of
             ```
     * This is crucial for the stability of the Wazuh Indexer.
 
-#### Windows:
-
-* **Docker Desktop**
-    * Install Docker Desktop by following the official instructions: [Install Docker Desktop](https://docs.docker.com/desktop/setup/install/windows-install/).
-* **WSL Linux distribution**
-    * Install Ubuntu or other compatible Linux distribution (bash in Alpine is not compatible with wazuh-certs-tool-5.0.0-1.sh): [Install Ubuntu on WSL](https://documentation.ubuntu.com/wsl/stable/howto/install-ubuntu-wsl2/)
-* **Git Client**:
-    * Required for cloning the `wazuh-docker` repository.
-* **Web Browser**:
-    * A modern web browser (e.g., Chrome, Firefox, Edge, Safari) for accessing the Wazuh dashboard.
-
-#### macOS:
-
-* **Docker Desktop**
-    * Install Docker Desktop by following the official instructions: [Install Docker Desktop](https://docs.docker.com/desktop/setup/install/mac-install/).
-* **Bash Shell**
-* **GNU versions of apps**:
-    * [Install GNU sed](https://formulae.brew.sh/formula/gnu-sed).
-    * [Install GNU awk](https://formulae.brew.sh/formula/gawk).
-    * [Install GNU grep](https://formulae.brew.sh/formula/grep).
-* **OpenSSL**:
-    * [Install OpenSSL](https://formulae.brew.sh/formula/openssl@3).
-* **Git Client**:
-    * Required for cloning the `wazuh-docker` repository.
-* **Web Browser**:
-    * A modern web browser (e.g., Chrome, Firefox, Edge, Safari) for accessing the Wazuh dashboard.
-
 ## Network Ports
 
 Ensure that the necessary network ports are open and available on the Docker host and any firewalls:

docs/ref/glossary.md

@@ -1,6 +1,6 @@
 # Reference Manual - Glossary
 
-This glossary defines key terms and concepts related to Wazuh, Docker, and their use together in the Wazuh-Docker project (version 5.0.0).
+This glossary defines key terms and concepts related to Wazuh, Docker, and their use together in the Wazuh-Docker project (version 6.0.0).
 
 ---
 
@@ -22,7 +22,7 @@ This glossary defines key terms and concepts related to Wazuh, Docker, and their
 
 **D**
 
--   **Dashboard (Wazuh Dashboard / OpenSearch Dashboards / Kibana)**: A web-based visualization tool used to explore, analyze, and visualize data stored in the Wazuh Indexer. It provides dashboards, visualizations, and a query interface for security events and alerts. For Wazuh 5.0.0, this is typically OpenSearch Dashboards.
+-   **Dashboard (Wazuh Dashboard / OpenSearch Dashboards / Kibana)**: A web-based visualization tool used to explore, analyze, and visualize data stored in the Wazuh Indexer. It provides dashboards, visualizations, and a query interface for security events and alerts. For Wazuh 6.0.0, this is typically OpenSearch Dashboards.
 -   **Decoder**: A component in the Wazuh Manager that parses and extracts relevant information (fields) from raw log messages or event data.
 -   **Docker**: An open platform for developing, shipping, and running applications inside containers.
 -   **Docker Compose**: A tool for defining and running multi-container Docker applications. It uses a YAML file (`docker-compose.yml`) to configure the application's services, networks, and volumes.
@@ -42,7 +42,7 @@ This glossary defines key terms and concepts related to Wazuh, Docker, and their
 
 **I**
 
--   **Indexer (Wazuh Indexer / OpenSearch / Elasticsearch)**: The component responsible for storing, indexing, and making searchable the alerts and event data generated by the Wazuh Manager. For Wazuh 5.0.0, this is typically OpenSearch.
+-   **Indexer (Wazuh Indexer / OpenSearch / Elasticsearch)**: The component responsible for storing, indexing, and making searchable the alerts and event data generated by the Wazuh Manager. For Wazuh 6.0.0, this is typically OpenSearch.
 
 **L**
 
@@ -60,7 +60,7 @@ This glossary defines key terms and concepts related to Wazuh, Docker, and their
 
 **O**
 
--   **`ossec.conf`**: The main configuration file for the Wazuh Agent.
+-   **`ossec.conf`**: The main configuration file for the Wazuh Manager and Wazuh Agent.
 
 **R**
 
@@ -84,7 +84,6 @@ This glossary defines key terms and concepts related to Wazuh, Docker, and their
 -   **Wazuh Dashboard**: See Dashboard.
 -   **Wazuh Indexer**: See Indexer.
 -   **Wazuh Manager**: See Manager.
--   **`wazuh-manager.conf`**: The main configuration file for the Wazuh Manager.
 
 ---
 This glossary provides a starting point. For more detailed definitions or terms not listed here, please refer to the official Wazuh and Docker documentation.

docs/ref/introduction/compatibility.md

@@ -1,22 +0,0 @@
-# Compatibility
-
-This section provides information about the compatibility of the Wazuh Docker stack with different platforms.
-
-## Supported platforms
-
-### Host operating system and architecture
-
-- Linux hosts are recommended for running the stack.
-- Windows and macOS are supported when using Docker Desktop. On Windows, the WSL 2 backend is recommended.
-- When building images, the build process supports `linux/amd64` and `linux/arm64`.
-
-### Privileged ports and rootless Docker
-
-The default Compose deployments publish some privileged ports on the host (for example, the Dashboard on `443/tcp` and syslog on `514/udp`).
-
-- If you run Docker in rootless mode or under restrictive policies, publishing ports below `1024` may fail.
-- In such environments, map the services to non-privileged host ports in the corresponding `docker-compose.yml` file.
-
-### Resource constraints
-
-For detailed information on resource requirements and recommendations, please refer to the [Requirements](../getting-started/requirements.md) section.

docs/ref/performance.md

@@ -1,42 +0,0 @@
-# Performance
-
-This section provides practical recommendations to improve performance for Wazuh Docker deployments (single-node and multi-node). Apply the controls that match your workload and environment.
-
-## Performance drivers
-
-- **Wazuh Indexer** is typically the main bottleneck (JVM heap, disk I/O, and CPU).
-- **Wazuh Manager** load grows with the number of connected agents and event throughput.
-- **Wazuh Dashboard** mainly affects interactive usage and depends on Indexer responsiveness.
-
-For baseline host sizing and prerequisites, see [Requirements](getting-started/requirements.md).
-
-## Storage and host
-
-- Use low-latency storage for the Indexer data volume (see [Requirements](getting-started/requirements.md)).
-- Avoid slow or inconsistent storage for the Indexer (for example, network filesystems) unless you have validated latency and durability for your use case.
-- Monitor disk space growth. Index data and persistent volumes can grow quickly in high-ingest environments.
-
-## Wazuh Indexer (OpenSearch)
-
-- Set the JVM heap explicitly using `OPENSEARCH_JAVA_OPTS` (documented in [Environment variables](configuration/environment-variables.md)).
-- Keep heap sizing conservative relative to available memory so the OS can cache filesystem data; oversized heap commonly degrades disk-heavy workloads.
-- Ensure the Linux host meets the required `vm.max_map_count` prerequisite (documented in [Requirements](getting-started/requirements.md)).
-- Prioritize heap sizing and GC stability.
-- Prioritize disk throughput/latency for the Indexer data volume.
-- Prioritize CPU availability during ingest peaks.
-
-## Wazuh Manager
-
-- If you observe ingestion backpressure or delayed processing, validate that the Manager has sufficient CPU and memory and that persistent volumes are not constrained by slow storage.
-- For multi-node deployments, distribute agent load appropriately (for example, by separating responsibilities between master/worker nodes) to avoid overloading.
-
-## Dashboard
-
-- Dashboard responsiveness depends on Indexer health. Address Indexer resource constraints first when troubleshooting slow UI queries.
-- Avoid exposing the Dashboard to excessive concurrent users on small hosts; scale the host or deployment model if needed.
-
-## Observability and troubleshooting
-
-- Start with container-level signals: `docker stats`, container logs, and host disk utilization.
-- For Indexer issues, validate basic cluster health and look for sustained CPU saturation, JVM memory pressure, and disk I/O contention.
-- For Manager issues, review Manager logs for queue growth and repeated connection retries.

docs/ref/security.md

@@ -1,26 +0,0 @@
-# Security
-
-This section summarizes security recommendations for Wazuh Docker deployments (single-node and multi-node). Apply the controls that match your environment and risk profile.
-
-## Credentials and secrets
-
-- Do not use default credentials. The Compose examples include placeholder values for the Wazuh API, Dashboard, and Indexer access.
-- Prefer injecting secrets at runtime (for example, via your CI/CD secret store or an external secrets manager) instead of hardcoding them in `docker-compose.yml`.
-- Rotate credentials regularly and after any suspected exposure.
-
-## Certificates and TLS
-
-- Protect the generated `wazuh-certificates/` directory. Limit filesystem permissions and do not publish it.
-- Regenerate certificates if private keys are leaked or if nodes are re-provisioned.
-- Use certificates and TLS settings appropriate for production (trusted CA, correct DNS names, and key protection).
-
-## Network exposure
-
-- Restrict access to exposed service ports at the host firewall and security group level.
-- Do not expose internal-only endpoints to untrusted networks. In particular, limit access to the Indexer API port (`9200`) and the Wazuh API port (`55000`) to administrative networks.
-
-## Host and runtime hardening
-
-- Run Docker on a hardened host (patched OS, minimal installed packages, restricted SSH access).
-- Limit access to the Docker daemon. Docker socket access grants administrative control over the host.
-- Ensure persistent volumes and bind-mounted configuration files are backed by secure storage and appropriate permissions.

docs/ref/uninstall.md

@@ -1,49 +0,0 @@
-# Uninstall
-
-This section describes how to uninstall a Wazuh Docker deployment by stopping and removing the resources created.
-
-## Uninstalling single-node and multi-node deployments
-
-1. Navigate to the deployment directory (`single-node` or `multi-node`):
-
-    ```bash
-    cd <deployment-directory>
-    ```
-
-2. Stop and remove the containers, persistent volumes and all stored data:
-
-    ```bash
-    docker compose down -v
-    ```
-
-3. Remove generated or downloaded files:
-
-    ```bash
-    rm -rf wazuh-certificates/ config.yml wazuh-certs-tool.sh config/*/certs
-    ```
-
-4. Verify that the deployment is removed:
-
-    ```bash
-    docker ps
-    ```
-
-## Wazuh agent deployment
-
-1. Navigate to the agent deployment directory:
-
-    ```bash
-    cd wazuh-agent
-    ```
-
-2. Stop and remove the container:
-
-    ```bash
-    docker compose down
-    ```
-
-3. Verify that the deployment is removed:
-
-    ```bash
-    docker ps
-    ```

docs/ref/upgrade.md

@@ -1,79 +1,10 @@
 # Upgrading Wazuh in Docker
 
-To upgrade your Wazuh deployment when using Docker, the process primarily involves updating the image tags in your `docker-compose.yml` file to the desired version.
+To upgrade your Wazuh deployment when using Docker, we recommend following the official Wazuh documentation. It contains the most accurate and up-to-date information for upgrading from previous versions to the current one.
 
-Below is a step-by-step example of how to perform this update:
+> 📘 Please refer to the official guide:
+> [Upgrading Wazuh Docker](https://documentation.wazuh.com/current/deployment-options/docker/upgrading-wazuh-docker.html)
 
-1. **Stop the current deployment**:
-   Stop and remove the existing containers.
-   ```bash
-   docker-compose down
-   ```
+This external guide provides detailed upgrade instructions that cover multiple scenarios and configurations.
 
-2. **Update the image tags**:
-   Edit your `docker-compose.yml` file and update the `image` field for all Wazuh services to the desired version.
-
-   ### Single-node configuration
-   Update the image tag for the following services in `single-node/docker-compose.yml`:
-   - `wazuh.manager`
-   - `wazuh.indexer`
-   - `wazuh.dashboard`
-
-   Example (update to 5.0.0):
-
-   ```yaml
-   services:
-     wazuh.manager:
-       image: wazuh/wazuh-manager:5.0.0
-       ...
-
-     wazuh.indexer:
-       image: wazuh/wazuh-indexer:5.0.0
-       ...
-
-     wazuh.dashboard:
-       image: wazuh/wazuh-dashboard:5.0.0
-       ...
-   ```
-
-   ### Multi-node configuration
-   Update the image tag for the following services in `multi-node/docker-compose.yml`:
-   - `wazuh.master`
-   - `wazuh.worker`
-   - `wazuh1.indexer`, `wazuh2.indexer`, and `wazuh3.indexer`
-   - `wazuh.dashboard`
-
-   Example (update to 5.0.0):
-
-   ```yaml
-   services:
-     wazuh.master:
-       image: wazuh/wazuh-manager:5.0.0
-       ...
-
-     wazuh.worker:
-       image: wazuh/wazuh-manager:5.0.0
-       ...
-
-     wazuh1.indexer:
-       image: wazuh/wazuh-indexer:5.0.0
-       ...
-
-     wazuh2.indexer:
-       image: wazuh/wazuh-indexer:5.0.0
-       ...
-
-     wazuh3.indexer:
-       image: wazuh/wazuh-indexer:5.0.0
-       ...
-
-     wazuh.dashboard:
-       image: wazuh/wazuh-dashboard:5.0.0
-       ...
-   ```
-
-3. **Start the updated deployment**:
-   Start the containers again. Docker will automatically pull the new images.
-   ```bash
-   docker-compose up -d
-   ```
+Following the official documentation ensures a smoother and safer upgrade process, with fewer risks of data loss or configuration issues.

indexer-certs-creator/README.md

@@ -0,0 +1,9 @@
+# Certificate creation image build
+
+The dockerfile hosted in this directory is used to build the image used to boot Wazuh's single node and multi node stacks.
+
+To create the image, the following command must be executed:
+
+```
+$ docker build -t wazuh/wazuh-certs-generator:0.0.2 .
+```

multi-node/Migration-to-Wazuh-4.4.md

@@ -0,0 +1,361 @@
+# Opendistro data migration to Wazuh indexer on docker.
+This procedure explains how to migrate Opendistro data from Opendistro to Wazuh indexer in docker production deployments.
+The example is migrating from v4.2 to v4.4.
+
+## Procedure
+Assuming that you have a v4.2 production deployment, perform the following steps.
+
+**1. Stop 4.2 environment**
+`docker-compose -f production-cluster.yml stop`
+
+**2. List elasticsearch volumes**
+`docker volume ls --filter name='wazuh-docker_elastic-data'`
+
+**3. Inspect elasticsearch volume**
+`docker volume inspect wazuh-docker_elastic-data-1`
+
+**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 compose version and project name as parameters.**
+
+Ex: $ multi-node/volume-migrator.sh 1.25.0 multi-node
+
+**5. Run the volume create command:** create new indexer and Wazuh manager volumes using the `com.docker.compose.version` label value from the previous command.
+
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=wazuh-indexer-data-1 \
+           multi-node_wazuh-indexer-data-1
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=wazuh-indexer-data-2 \
+           multi-node_wazuh-indexer-data-2
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=wazuh-indexer-data-3 \
+           multi-node_wazuh-indexer-data-3
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=master_wazuh_api_configuration \
+           multi-node_master_wazuh_api_configuration
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=master_wazuh_etc \
+           multi-node_docker_wazuh_etc
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=master-wazuh-logs \
+           multi-node_master-wazuh-logs
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=master-wazuh-queue \
+           multi-node_master-wazuh-queue
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=master-wazuh-var-multigroups \
+           multi-node_master-wazuh-var-multigroups
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=master-wazuh-integrations \
+           multi-node_master-wazuh-integrations
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=master-wazuh-active-response \
+           multi-node_master-wazuh-active-response
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=master-wazuh-agentless \
+           multi-node_master-wazuh-agentless
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=master-wazuh-wodles \
+           multi-node_master-wazuh-wodles
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=master-filebeat-etc \
+           multi-node_master-filebeat-etc
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=master-filebeat-var \
+           multi-node_master-filebeat-var
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=worker_wazuh_api_configuration \
+           multi-node_worker_wazuh_api_configuration
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=worker_wazuh_etc \
+           multi-node_worker-wazuh-etc
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=worker-wazuh-logs \
+           multi-node_worker-wazuh-logs
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=worker-wazuh-queue \
+           multi-node_worker-wazuh-queue
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=worker-wazuh-var-multigroups \
+           multi-node_worker-wazuh-var-multigroups
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=worker-wazuh-integrations \
+           multi-node_worker-wazuh-integrations
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=worker-wazuh-active-response \
+           multi-node_worker-wazuh-active-response
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=worker-wazuh-agentless \
+           multi-node_worker-wazuh-agentless
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=worker-wazuh-wodles \
+           multi-node_worker-wazuh-wodles
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=worker-filebeat-etc \
+           multi-node_worker-filebeat-etc
+```
+```
+docker volume create \
+           --label com.docker.compose.project=multi-node \
+           --label com.docker.compose.version=1.25.0 \
+           --label com.docker.compose.volume=worker-filebeat-var \
+           multi-node_worker-filebeat-var
+```
+**6. Copy the volume content from elasticsearch to Wazuh indexer volumes and old Wazuh manager content to new volumes.**
+```
+docker container run --rm -it \
+           -v wazuh-docker_elastic-data-1:/from \
+           -v multi-node_wazuh-indexer-data-1:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_elastic-data-2:/from \
+           -v multi-node_wazuh-indexer-data-2:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_elastic-data-3:/from \
+           -v multi-node_wazuh-indexer-data-3:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_ossec-api-configuration:/from \
+           -v multi-node_master-wazuh-api-configuration:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_ossec-etc:/from \
+           -v multi-node_master-wazuh-etc:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_ossec-logs:/from \
+           -v multi-node_master-wazuh-logs:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_ossec-queue:/from \
+           -v multi-node_master-wazuh-queue:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_ossec-var-multigroups:/from \
+           -v multi-node_master-wazuh-var-multigroups:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_ossec-integrations:/from \
+           -v multi-node_master-wazuh-integrations:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_ossec-active-response:/from \
+           -v multi-node_master-wazuh-active-response:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_ossec-agentless:/from \
+           -v multi-node_master-wazuh-agentless:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_ossec-wodles:/from \
+           -v multi-node_master-wazuh-wodles:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_filebeat-etc:/from \
+           -v multi-node_master-filebeat-etc:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_filebeat-var:/from \
+           -v multi-node_master-filebeat-var:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-api-configuration:/from \
+           -v multi-node_worker-wazuh-api-configuration:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-etc:/from \
+           -v multi-node_worker-wazuh-etc:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-logs:/from \
+           -v multi-node_worker-wazuh-logs:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-queue:/from \
+           -v multi-node_worker-wazuh-queue:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-var-multigroups:/from \
+           -v multi-node_worker-wazuh-var-multigroups:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-integrations:/from \
+           -v multi-node_worker-wazuh-integrations:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-active-response:/from \
+           -v multi-node_worker-wazuh-active-response:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-agentless:/from \
+           -v multi-node_worker-wazuh-agentless:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-wodles:/from \
+           -v multi-node_worker-wazuh-wodles:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_worker-filebeat-etc:/from \
+           -v multi-node_worker-filebeat-etc:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+```
+docker container run --rm -it \
+           -v wazuh-docker_worker-filebeat-var:/from \
+           -v multi-node_worker-filebeat-var:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+```
+
+**7. Start the 4.4 environment.**
+```
+git checkout 4.4
+cd multi-node
+docker-compose -f generate-certs.yml run --rm generator
+docker-compose up -d
+```
+
+**8. Check the access to Wazuh dashboard**: go to the Wazuh dashboard using the web browser and check the data.

multi-node/README.md

@@ -0,0 +1,26 @@
+# Deploy Wazuh Docker in multi node configuration
+
+This deployment is defined in the `docker-compose.yml` file with two Wazuh manager containers, three Wazuh indexer containers, and one Wazuh dashboard container. It can be deployed by following these steps:
+
+1) Increase max_map_count on your host (Linux). This command must be run with root permissions:
+```
+$ sysctl -w vm.max_map_count=262144
+```
+2) Run the certificate creation script:
+```
+$ docker compose -f generate-certs.yml run --rm generator
+```
+3) Start the environment with docker compose:
+
+- In the foregroud:
+```
+$ docker compose up
+```
+
+- In the background:
+```
+$ docker compose up -d
+```
+
+
+The environment takes about 1 minute to get up (depending on your Docker host) for the first time since Wazuh Indexer must be started for the first time and the indexes and index patterns must be generated.

multi-node/config/certs.yml

@@ -0,0 +1,24 @@
+nodes:
+  # Wazuh indexer server nodes
+  indexer:
+    - name: wazuh1.indexer
+      ip: wazuh1.indexer
+    - name: wazuh2.indexer
+      ip: wazuh2.indexer
+    - name: wazuh3.indexer
+      ip: wazuh3.indexer
+
+  # Wazuh server nodes
+  # Use node_type only with more than one Wazuh manager
+  server:
+    - name: wazuh.master
+      ip: wazuh.master
+      node_type: master
+    - name: wazuh.worker
+      ip: wazuh.worker
+      node_type: worker
+
+  # Wazuh dashboard node
+  dashboard:
+    - name: wazuh.dashboard
+      ip: wazuh.dashboard

multi-node/config/wazuh_cluster/wazuh_manager.conf

@@ -0,0 +1,313 @@
+<ossec_config>
+  <global>
+    <jsonout_output>yes</jsonout_output>
+    <alerts_log>yes</alerts_log>
+    <logall>no</logall>
+    <logall_json>no</logall_json>
+    <email_notification>no</email_notification>
+    <smtp_server>smtp.example.wazuh.com</smtp_server>
+    <email_from>wazuh@example.wazuh.com</email_from>
+    <email_to>recipient@example.wazuh.com</email_to>
+    <email_maxperhour>12</email_maxperhour>
+    <email_log_source>alerts.log</email_log_source>
+    <agents_disconnection_time>10m</agents_disconnection_time>
+    <agents_disconnection_alert_time>0</agents_disconnection_alert_time>
+  </global>
+
+  <alerts>
+    <log_alert_level>3</log_alert_level>
+    <email_alert_level>12</email_alert_level>
+  </alerts>
+
+  <!-- Choose between "plain", "json", or "plain,json" for the format of internal logs -->
+  <logging>
+    <log_format>plain</log_format>
+  </logging>
+
+  <remote>
+    <connection>secure</connection>
+    <port>1514</port>
+    <protocol>tcp</protocol>
+    <queue_size>131072</queue_size>
+  </remote>
+
+  <!-- Policy monitoring -->
+  <rootcheck>
+    <disabled>no</disabled>
+    <check_files>yes</check_files>
+    <check_trojans>yes</check_trojans>
+    <check_dev>yes</check_dev>
+    <check_sys>yes</check_sys>
+    <check_pids>yes</check_pids>
+    <check_ports>yes</check_ports>
+    <check_if>yes</check_if>
+
+    <!-- Frequency that rootcheck is executed - every 12 hours -->
+    <frequency>43200</frequency>
+
+    <rootkit_files>etc/rootcheck/rootkit_files.txt</rootkit_files>
+    <rootkit_trojans>etc/rootcheck/rootkit_trojans.txt</rootkit_trojans>
+
+    <skip_nfs>yes</skip_nfs>
+  </rootcheck>
+
+  <wodle name="cis-cat">
+    <disabled>yes</disabled>
+    <timeout>1800</timeout>
+    <interval>1d</interval>
+    <scan-on-start>yes</scan-on-start>
+
+    <java_path>wodles/java</java_path>
+    <ciscat_path>wodles/ciscat</ciscat_path>
+  </wodle>
+
+  <!-- Osquery integration -->
+  <wodle name="osquery">
+    <disabled>yes</disabled>
+    <run_daemon>yes</run_daemon>
+    <log_path>/var/log/osquery/osqueryd.results.log</log_path>
+    <config_path>/etc/osquery/osquery.conf</config_path>
+    <add_labels>yes</add_labels>
+  </wodle>
+
+  <!-- System inventory -->
+  <wodle name="syscollector">
+    <disabled>no</disabled>
+    <interval>1h</interval>
+    <scan_on_start>yes</scan_on_start>
+    <hardware>yes</hardware>
+    <os>yes</os>
+    <network>yes</network>
+    <packages>yes</packages>
+    <ports all="no">yes</ports>
+    <processes>yes</processes>
+
+    <!-- Database synchronization settings -->
+    <synchronization>
+      <max_eps>10</max_eps>
+    </synchronization>
+  </wodle>
+
+  <sca>
+    <enabled>yes</enabled>
+    <scan_on_start>yes</scan_on_start>
+    <interval>12h</interval>
+    <skip_nfs>yes</skip_nfs>
+  </sca>
+
+  <vulnerability-detection>
+    <enabled>yes</enabled>
+    <index-status>yes</index-status>
+    <feed-update-interval>60m</feed-update-interval>
+  </vulnerability-detection>
+
+  <indexer>
+    <enabled>yes</enabled>
+    <hosts>
+      <host>https://wazuh1.indexer:9200</host>
+      <host>https://wazuh2.indexer:9200</host>
+      <host>https://wazuh3.indexer:9200</host>
+    </hosts>
+    <ssl>
+      <certificate_authorities>
+        <ca>/etc/ssl/root-ca.pem</ca>
+      </certificate_authorities>
+      <certificate>/etc/ssl/filebeat.pem</certificate>
+      <key>/etc/ssl/filebeat.key</key>
+    </ssl>
+  </indexer>
+
+  <!-- File integrity monitoring -->
+  <syscheck>
+    <disabled>no</disabled>
+
+    <!-- Frequency that syscheck is executed default every 12 hours -->
+    <frequency>43200</frequency>
+
+    <scan_on_start>yes</scan_on_start>
+
+    <!-- Generate alert when new file detected -->
+    <alert_new_files>yes</alert_new_files>
+
+    <!-- Don't ignore files that change more than 'frequency' times -->
+    <auto_ignore frequency="10" timeframe="3600">no</auto_ignore>
+
+    <!-- Directories to check  (perform all possible verifications) -->
+    <directories>/etc,/usr/bin,/usr/sbin</directories>
+    <directories>/bin,/sbin,/boot</directories>
+
+    <!-- Files/directories to ignore -->
+    <ignore>/etc/mtab</ignore>
+    <ignore>/etc/hosts.deny</ignore>
+    <ignore>/etc/mail/statistics</ignore>
+    <ignore>/etc/random-seed</ignore>
+    <ignore>/etc/random.seed</ignore>
+    <ignore>/etc/adjtime</ignore>
+    <ignore>/etc/httpd/logs</ignore>
+    <ignore>/etc/utmpx</ignore>
+    <ignore>/etc/wtmpx</ignore>
+    <ignore>/etc/cups/certs</ignore>
+    <ignore>/etc/dumpdates</ignore>
+    <ignore>/etc/svc/volatile</ignore>
+
+    <!-- File types to ignore -->
+    <ignore type="sregex">.log$|.swp$</ignore>
+
+    <!-- Check the file, but never compute the diff -->
+    <nodiff>/etc/ssl/private.key</nodiff>
+
+    <skip_nfs>yes</skip_nfs>
+    <skip_dev>yes</skip_dev>
+    <skip_proc>yes</skip_proc>
+    <skip_sys>yes</skip_sys>
+
+    <!-- Nice value for Syscheck process -->
+    <process_priority>10</process_priority>
+
+    <!-- Maximum output throughput -->
+    <max_eps>100</max_eps>
+
+    <!-- Database synchronization settings -->
+    <synchronization>
+      <enabled>yes</enabled>
+      <interval>5m</interval>
+      <max_interval>1h</max_interval>
+      <max_eps>10</max_eps>
+    </synchronization>
+  </syscheck>
+
+  <!-- Active response -->
+  <global>
+    <white_list>127.0.0.1</white_list>
+    <white_list>^localhost.localdomain$</white_list>
+  </global>
+
+  <command>
+    <name>disable-account</name>
+    <executable>disable-account</executable>
+    <timeout_allowed>yes</timeout_allowed>
+  </command>
+
+  <command>
+    <name>restart-wazuh</name>
+    <executable>restart-wazuh</executable>
+  </command>
+
+  <command>
+    <name>firewall-drop</name>
+    <executable>firewall-drop</executable>
+    <timeout_allowed>yes</timeout_allowed>
+  </command>
+
+  <command>
+    <name>host-deny</name>
+    <executable>host-deny</executable>
+    <timeout_allowed>yes</timeout_allowed>
+  </command>
+
+  <command>
+    <name>route-null</name>
+    <executable>route-null</executable>
+    <timeout_allowed>yes</timeout_allowed>
+  </command>
+
+  <command>
+    <name>win_route-null</name>
+    <executable>route-null.exe</executable>
+    <timeout_allowed>yes</timeout_allowed>
+  </command>
+
+  <command>
+    <name>netsh</name>
+    <executable>netsh.exe</executable>
+    <timeout_allowed>yes</timeout_allowed>
+  </command>
+
+  <!--
+  <active-response>
+    active-response options here
+  </active-response>
+  -->
+
+  <!-- Log analysis -->
+  <localfile>
+    <log_format>command</log_format>
+    <command>df -P</command>
+    <frequency>360</frequency>
+  </localfile>
+
+  <localfile>
+    <log_format>full_command</log_format>
+    <command>netstat -tulpn | sed 's/\([[:alnum:]]\+\)\ \+[[:digit:]]\+\ \+[[:digit:]]\+\ \+\(.*\):\([[:digit:]]*\)\ \+\([0-9\.\:\*]\+\).\+\ \([[:digit:]]*\/[[:alnum:]\-]*\).*/\1 \2 == \3 == \4 \5/' | sort -k 4 -g | sed 's/ == \(.*\) ==/:\1/' | sed 1,2d</command>
+    <alias>netstat listening ports</alias>
+    <frequency>360</frequency>
+  </localfile>
+
+  <localfile>
+    <log_format>full_command</log_format>
+    <command>last -n 20</command>
+    <frequency>360</frequency>
+  </localfile>
+
+  <ruleset>
+    <!-- Default ruleset -->
+    <decoder_dir>ruleset/decoders</decoder_dir>
+    <rule_dir>ruleset/rules</rule_dir>
+    <rule_exclude>0215-policy_rules.xml</rule_exclude>
+    <list>etc/lists/audit-keys</list>
+    <list>etc/lists/amazon/aws-eventnames</list>
+    <list>etc/lists/security-eventchannel</list>
+    <list>etc/lists/malicious-ioc/malicious-ip</list>
+    <list>etc/lists/malicious-ioc/malicious-domains</list>
+    <list>etc/lists/malicious-ioc/malware-hashes</list>
+
+    <!-- User-defined ruleset -->
+    <decoder_dir>etc/decoders</decoder_dir>
+    <rule_dir>etc/rules</rule_dir>
+  </ruleset>
+
+  <rule_test>
+    <enabled>yes</enabled>
+    <threads>1</threads>
+    <max_sessions>64</max_sessions>
+    <session_timeout>15m</session_timeout>
+  </rule_test>
+
+  <!-- Configuration for wazuh-authd -->
+  <auth>
+    <disabled>no</disabled>
+    <port>1515</port>
+    <use_source_ip>no</use_source_ip>
+    <purge>yes</purge>
+    <use_password>no</use_password>
+    <ciphers>HIGH:!ADH:!EXP:!MD5:!RC4:!3DES:!CAMELLIA:@STRENGTH</ciphers>
+    <!-- <ssl_agent_ca></ssl_agent_ca> -->
+    <ssl_verify_host>no</ssl_verify_host>
+    <ssl_manager_cert>etc/sslmanager.cert</ssl_manager_cert>
+    <ssl_manager_key>etc/sslmanager.key</ssl_manager_key>
+    <ssl_auto_negotiate>no</ssl_auto_negotiate>
+  </auth>
+
+  <cluster>
+    <name>wazuh</name>
+    <node_name>manager</node_name>
+    <node_type>master</node_type>
+    <key>c98b6ha9b6169zc5f67rae55ae4z5647</key>
+    <port>1516</port>
+    <bind_addr>0.0.0.0</bind_addr>
+    <nodes>
+        <node>wazuh.master</node>
+    </nodes>
+    <hidden>no</hidden>
+    <disabled>no</disabled>
+  </cluster>
+
+</ossec_config>
+
+<ossec_config>
+  <localfile>
+    <log_format>syslog</log_format>
+    <location>/var/ossec/logs/active-responses.log</location>
+  </localfile>
+
+</ossec_config>

multi-node/config/wazuh_cluster/wazuh_worker.conf

@@ -0,0 +1,313 @@
+<ossec_config>
+  <global>
+    <jsonout_output>yes</jsonout_output>
+    <alerts_log>yes</alerts_log>
+    <logall>no</logall>
+    <logall_json>no</logall_json>
+    <email_notification>no</email_notification>
+    <smtp_server>smtp.example.wazuh.com</smtp_server>
+    <email_from>wazuh@example.wazuh.com</email_from>
+    <email_to>recipient@example.wazuh.com</email_to>
+    <email_maxperhour>12</email_maxperhour>
+    <email_log_source>alerts.log</email_log_source>
+    <agents_disconnection_time>10m</agents_disconnection_time>
+    <agents_disconnection_alert_time>0</agents_disconnection_alert_time>
+  </global>
+
+  <alerts>
+    <log_alert_level>3</log_alert_level>
+    <email_alert_level>12</email_alert_level>
+  </alerts>
+
+  <!-- Choose between "plain", "json", or "plain,json" for the format of internal logs -->
+  <logging>
+    <log_format>plain</log_format>
+  </logging>
+
+  <remote>
+    <connection>secure</connection>
+    <port>1514</port>
+    <protocol>tcp</protocol>
+    <queue_size>131072</queue_size>
+  </remote>
+
+  <!-- Policy monitoring -->
+  <rootcheck>
+    <disabled>no</disabled>
+    <check_files>yes</check_files>
+    <check_trojans>yes</check_trojans>
+    <check_dev>yes</check_dev>
+    <check_sys>yes</check_sys>
+    <check_pids>yes</check_pids>
+    <check_ports>yes</check_ports>
+    <check_if>yes</check_if>
+
+    <!-- Frequency that rootcheck is executed - every 12 hours -->
+    <frequency>43200</frequency>
+
+    <rootkit_files>etc/rootcheck/rootkit_files.txt</rootkit_files>
+    <rootkit_trojans>etc/rootcheck/rootkit_trojans.txt</rootkit_trojans>
+
+    <skip_nfs>yes</skip_nfs>
+  </rootcheck>
+
+  <wodle name="cis-cat">
+    <disabled>yes</disabled>
+    <timeout>1800</timeout>
+    <interval>1d</interval>
+    <scan-on-start>yes</scan-on-start>
+
+    <java_path>wodles/java</java_path>
+    <ciscat_path>wodles/ciscat</ciscat_path>
+  </wodle>
+
+  <!-- Osquery integration -->
+  <wodle name="osquery">
+    <disabled>yes</disabled>
+    <run_daemon>yes</run_daemon>
+    <log_path>/var/log/osquery/osqueryd.results.log</log_path>
+    <config_path>/etc/osquery/osquery.conf</config_path>
+    <add_labels>yes</add_labels>
+  </wodle>
+
+  <!-- System inventory -->
+  <wodle name="syscollector">
+    <disabled>no</disabled>
+    <interval>1h</interval>
+    <scan_on_start>yes</scan_on_start>
+    <hardware>yes</hardware>
+    <os>yes</os>
+    <network>yes</network>
+    <packages>yes</packages>
+    <ports all="no">yes</ports>
+    <processes>yes</processes>
+
+    <!-- Database synchronization settings -->
+    <synchronization>
+      <max_eps>10</max_eps>
+    </synchronization>
+  </wodle>
+
+  <sca>
+    <enabled>yes</enabled>
+    <scan_on_start>yes</scan_on_start>
+    <interval>12h</interval>
+    <skip_nfs>yes</skip_nfs>
+  </sca>
+
+  <vulnerability-detection>
+    <enabled>yes</enabled>
+    <index-status>yes</index-status>
+    <feed-update-interval>60m</feed-update-interval>
+  </vulnerability-detection>
+
+  <indexer>
+    <enabled>yes</enabled>
+    <hosts>
+      <host>https://wazuh1.indexer:9200</host>
+      <host>https://wazuh2.indexer:9200</host>
+      <host>https://wazuh3.indexer:9200</host>
+    </hosts>
+    <ssl>
+      <certificate_authorities>
+        <ca>/etc/ssl/root-ca.pem</ca>
+      </certificate_authorities>
+      <certificate>/etc/ssl/filebeat.pem</certificate>
+      <key>/etc/ssl/filebeat.key</key>
+    </ssl>
+  </indexer>
+
+  <!-- File integrity monitoring -->
+  <syscheck>
+    <disabled>no</disabled>
+
+    <!-- Frequency that syscheck is executed default every 12 hours -->
+    <frequency>43200</frequency>
+
+    <scan_on_start>yes</scan_on_start>
+
+    <!-- Generate alert when new file detected -->
+    <alert_new_files>yes</alert_new_files>
+
+    <!-- Don't ignore files that change more than 'frequency' times -->
+    <auto_ignore frequency="10" timeframe="3600">no</auto_ignore>
+
+    <!-- Directories to check  (perform all possible verifications) -->
+    <directories>/etc,/usr/bin,/usr/sbin</directories>
+    <directories>/bin,/sbin,/boot</directories>
+
+    <!-- Files/directories to ignore -->
+    <ignore>/etc/mtab</ignore>
+    <ignore>/etc/hosts.deny</ignore>
+    <ignore>/etc/mail/statistics</ignore>
+    <ignore>/etc/random-seed</ignore>
+    <ignore>/etc/random.seed</ignore>
+    <ignore>/etc/adjtime</ignore>
+    <ignore>/etc/httpd/logs</ignore>
+    <ignore>/etc/utmpx</ignore>
+    <ignore>/etc/wtmpx</ignore>
+    <ignore>/etc/cups/certs</ignore>
+    <ignore>/etc/dumpdates</ignore>
+    <ignore>/etc/svc/volatile</ignore>
+
+    <!-- File types to ignore -->
+    <ignore type="sregex">.log$|.swp$</ignore>
+
+    <!-- Check the file, but never compute the diff -->
+    <nodiff>/etc/ssl/private.key</nodiff>
+
+    <skip_nfs>yes</skip_nfs>
+    <skip_dev>yes</skip_dev>
+    <skip_proc>yes</skip_proc>
+    <skip_sys>yes</skip_sys>
+
+    <!-- Nice value for Syscheck process -->
+    <process_priority>10</process_priority>
+
+    <!-- Maximum output throughput -->
+    <max_eps>100</max_eps>
+
+    <!-- Database synchronization settings -->
+    <synchronization>
+      <enabled>yes</enabled>
+      <interval>5m</interval>
+      <max_interval>1h</max_interval>
+      <max_eps>10</max_eps>
+    </synchronization>
+  </syscheck>
+
+  <!-- Active response -->
+  <global>
+    <white_list>127.0.0.1</white_list>
+    <white_list>^localhost.localdomain$</white_list>
+  </global>
+
+  <command>
+    <name>disable-account</name>
+    <executable>disable-account</executable>
+    <timeout_allowed>yes</timeout_allowed>
+  </command>
+
+  <command>
+    <name>restart-wazuh</name>
+    <executable>restart-wazuh</executable>
+  </command>
+
+  <command>
+    <name>firewall-drop</name>
+    <executable>firewall-drop</executable>
+    <timeout_allowed>yes</timeout_allowed>
+  </command>
+
+  <command>
+    <name>host-deny</name>
+    <executable>host-deny</executable>
+    <timeout_allowed>yes</timeout_allowed>
+  </command>
+
+  <command>
+    <name>route-null</name>
+    <executable>route-null</executable>
+    <timeout_allowed>yes</timeout_allowed>
+  </command>
+
+  <command>
+    <name>win_route-null</name>
+    <executable>route-null.exe</executable>
+    <timeout_allowed>yes</timeout_allowed>
+  </command>
+
+  <command>
+    <name>netsh</name>
+    <executable>netsh.exe</executable>
+    <timeout_allowed>yes</timeout_allowed>
+  </command>
+
+  <!--
+  <active-response>
+    active-response options here
+  </active-response>
+  -->
+
+  <!-- Log analysis -->
+  <localfile>
+    <log_format>command</log_format>
+    <command>df -P</command>
+    <frequency>360</frequency>
+  </localfile>
+
+  <localfile>
+    <log_format>full_command</log_format>
+    <command>netstat -tulpn | sed 's/\([[:alnum:]]\+\)\ \+[[:digit:]]\+\ \+[[:digit:]]\+\ \+\(.*\):\([[:digit:]]*\)\ \+\([0-9\.\:\*]\+\).\+\ \([[:digit:]]*\/[[:alnum:]\-]*\).*/\1 \2 == \3 == \4 \5/' | sort -k 4 -g | sed 's/ == \(.*\) ==/:\1/' | sed 1,2d</command>
+    <alias>netstat listening ports</alias>
+    <frequency>360</frequency>
+  </localfile>
+
+  <localfile>
+    <log_format>full_command</log_format>
+    <command>last -n 20</command>
+    <frequency>360</frequency>
+  </localfile>
+
+  <ruleset>
+    <!-- Default ruleset -->
+    <decoder_dir>ruleset/decoders</decoder_dir>
+    <rule_dir>ruleset/rules</rule_dir>
+    <rule_exclude>0215-policy_rules.xml</rule_exclude>
+    <list>etc/lists/audit-keys</list>
+    <list>etc/lists/amazon/aws-eventnames</list>
+    <list>etc/lists/security-eventchannel</list>
+    <list>etc/lists/malicious-ioc/malicious-ip</list>
+    <list>etc/lists/malicious-ioc/malicious-domains</list>
+    <list>etc/lists/malicious-ioc/malware-hashes</list>
+
+    <!-- User-defined ruleset -->
+    <decoder_dir>etc/decoders</decoder_dir>
+    <rule_dir>etc/rules</rule_dir>
+  </ruleset>
+
+  <rule_test>
+    <enabled>yes</enabled>
+    <threads>1</threads>
+    <max_sessions>64</max_sessions>
+    <session_timeout>15m</session_timeout>
+  </rule_test>
+
+  <!-- Configuration for wazuh-authd -->
+  <auth>
+    <disabled>no</disabled>
+    <port>1515</port>
+    <use_source_ip>no</use_source_ip>
+    <purge>yes</purge>
+    <use_password>no</use_password>
+    <ciphers>HIGH:!ADH:!EXP:!MD5:!RC4:!3DES:!CAMELLIA:@STRENGTH</ciphers>
+    <!-- <ssl_agent_ca></ssl_agent_ca> -->
+    <ssl_verify_host>no</ssl_verify_host>
+    <ssl_manager_cert>etc/sslmanager.cert</ssl_manager_cert>
+    <ssl_manager_key>etc/sslmanager.key</ssl_manager_key>
+    <ssl_auto_negotiate>no</ssl_auto_negotiate>
+  </auth>
+
+  <cluster>
+    <name>wazuh</name>
+    <node_name>worker01</node_name>
+    <node_type>worker</node_type>
+    <key>c98b6ha9b6169zc5f67rae55ae4z5647</key>
+    <port>1516</port>
+    <bind_addr>0.0.0.0</bind_addr>
+    <nodes>
+        <node>wazuh.master</node>
+    </nodes>
+    <hidden>no</hidden>
+    <disabled>no</disabled>
+  </cluster>
+
+</ossec_config>
+
+<ossec_config>
+  <localfile>
+    <log_format>syslog</log_format>
+    <location>/var/ossec/logs/active-responses.log</location>
+  </localfile>
+
+</ossec_config>

multi-node/config/wazuh_dashboard/wazuh.yml

@@ -0,0 +1,7 @@
+hosts:
+  - 1513629884013:
+      url: "https://wazuh.master"
+      port: 55000
+      username: wazuh-wui
+      password: "MyS3cr37P450r.*-"
+      run_as: false

multi-node/config/wazuh_indexer/internal_users.yml

@@ -0,0 +1,56 @@
+---
+# This is the internal user database
+# The hash value is a bcrypt hash and can be generated with plugin/tools/hash.sh
+
+_meta:
+  type: "internalusers"
+  config_version: 2
+
+# Define your internal users here
+
+## Demo users
+
+admin:
+  hash: "$2y$12$K/SpwjtB.wOHJ/Nc6GVRDuc1h0rM1DfvziFRNPtk27P.c4yDr9njO"
+  reserved: true
+  backend_roles:
+  - "admin"
+  description: "Demo admin user"
+
+kibanaserver:
+  hash: "$2a$12$4AcgAt3xwOWadA5s5blL6ev39OXDNhmOesEoo33eZtrq2N0YrU3H."
+  reserved: true
+  description: "Demo kibanaserver user"
+
+kibanaro:
+  hash: "$2a$12$JJSXNfTowz7Uu5ttXfeYpeYE0arACvcwlPBStB1F.MI7f0U9Z4DGC"
+  reserved: false
+  backend_roles:
+  - "kibanauser"
+  - "readall"
+  attributes:
+    attribute1: "value1"
+    attribute2: "value2"
+    attribute3: "value3"
+  description: "Demo kibanaro user"
+
+logstash:
+  hash: "$2a$12$u1ShR4l4uBS3Uv59Pa2y5.1uQuZBrZtmNfqB3iM/.jL0XoV9sghS2"
+  reserved: false
+  backend_roles:
+  - "logstash"
+  description: "Demo logstash user"
+
+readall:
+  hash: "$2a$12$ae4ycwzwvLtZxwZ82RmiEunBbIPiAmGZduBAjKN0TXdwQFtCwARz2"
+  reserved: false
+  backend_roles:
+  - "readall"
+  description: "Demo readall user"
+
+snapshotrestore:
+  hash: "$2y$12$DpwmetHKwgYnorbgdvORCenv4NAK8cPUg8AI6pxLCuWf/ALc0.v7W"
+  reserved: false
+  backend_roles:
+  - "snapshotrestore"
+  description: "Demo snapshotrestore user"

multi-node/docker-compose.yml

@@ -1,19 +1,9 @@
 # Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
 services:
   wazuh.master:
-    image: wazuh/wazuh-manager:5.0.0
+    image: wazuh/wazuh-manager:6.0.0
     hostname: wazuh.master
-    container_name: multi-node-wazuh.master
     restart: always
-    depends_on:
-      wazuh1.indexer:
-        condition: service_healthy
-    healthcheck:
-      test: [ "CMD-SHELL", "/var/wazuh-manager/bin/wazuh-manager-control status 2>/dev/null | grep -q 'not running' && exit 1 || exit 0" ]
-      interval: 15s
-      timeout: 5s
-      retries: 5
-      start_period: 60s
     ulimits:
       memlock:
         soft: -1
@@ -26,34 +16,36 @@ services:
       - "514:514/udp"
       - "55000:55000"
     environment:
-      - WAZUH_INDEXER_HOSTS=wazuh1.indexer:9200,wazuh2.indexer:9200,wazuh3.indexer:9200
-      - WAZUH_NODE_NAME=master
-      - WAZUH_NODE_TYPE=master
-      - WAZUH_CLUSTER_BIND_ADDR=0.0.0.0
-      - WAZUH_CLUSTER_NODES=wazuh.master
-      - INDEXER_USERNAME=admin
-      - INDEXER_PASSWORD=admin
+      INDEXER_URL: https://wazuh1.indexer:9200
+      INDEXER_USERNAME: admin
+      INDEXER_PASSWORD: admin
+      FILEBEAT_SSL_VERIFICATION_MODE: full
+      SSL_CERTIFICATE_AUTHORITIES: /etc/ssl/root-ca.pem
+      SSL_CERTIFICATE: /etc/ssl/filebeat.pem
+      SSL_KEY: /etc/ssl/filebeat.key
+      API_USERNAME: wazuh-wui
+      API_PASSWORD: MyS3cr37P450r.*-
     volumes:
-      - master-wazuh-api-configuration:/var/wazuh-manager/api/configuration
-      - master-wazuh-etc:/var/wazuh-manager/etc
-      - master-wazuh-logs:/var/wazuh-manager/logs
-      - master-wazuh-queue:/var/wazuh-manager/queue
-      - master-wazuh-var-multigroups:/var/wazuh-manager/var/multigroups
-      - ./config/root-ca/certs/root-ca.pem:/var/wazuh-manager/etc/certs/root-ca.pem
-      - ./config/wazuh_master/certs/wazuh.master.pem:/var/wazuh-manager/etc/certs/manager.pem
-      - ./config/wazuh_master/certs/wazuh.master-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem
+      - master-wazuh-api-configuration:/var/ossec/api/configuration
+      - master-wazuh-etc:/var/ossec/etc
+      - master-wazuh-logs:/var/ossec/logs
+      - master-wazuh-queue:/var/ossec/queue
+      - master-wazuh-var-multigroups:/var/ossec/var/multigroups
+      - master-wazuh-integrations:/var/ossec/integrations
+      - master-wazuh-active-response:/var/ossec/active-response/bin
+      - master-wazuh-agentless:/var/ossec/agentless
+      - master-wazuh-wodles:/var/ossec/wodles
+      - master-filebeat-etc:/etc/filebeat
+      - master-filebeat-var:/var/lib/filebeat
+      - ./config/wazuh_indexer_ssl_certs/root-ca-manager.pem:/etc/ssl/root-ca.pem
+      - ./config/wazuh_indexer_ssl_certs/wazuh.master.pem:/etc/ssl/filebeat.pem
+      - ./config/wazuh_indexer_ssl_certs/wazuh.master-key.pem:/etc/ssl/filebeat.key
+      - ./config/wazuh_cluster/wazuh_manager.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh.worker:
-    image: wazuh/wazuh-manager:5.0.0
+    image: wazuh/wazuh-manager:6.0.0
     hostname: wazuh.worker
-    container_name: multi-node-wazuh.worker
     restart: always
-    healthcheck:
-      test: [ "CMD-SHELL", "/var/wazuh-manager/bin/wazuh-manager-control status 2>/dev/null | grep -v apid | grep -q 'not running' && exit 1 || exit 0" ]
-      interval: 15s
-      timeout: 5s
-      retries: 5
-      start_period: 60s
     ulimits:
       memlock:
         soft: -1
@@ -61,84 +53,88 @@ services:
       nofile:
         soft: 655360
         hard: 655360
-    depends_on:
-      wazuh.master:
-        condition: service_healthy
     environment:
-      - WAZUH_INDEXER_HOSTS=wazuh1.indexer:9200,wazuh2.indexer:9200,wazuh3.indexer:9200
-      - WAZUH_NODE_NAME=worker01
-      - WAZUH_NODE_TYPE=worker
-      - WAZUH_CLUSTER_BIND_ADDR=0.0.0.0
-      - WAZUH_CLUSTER_NODES=wazuh.master
-      - INDEXER_USERNAME=admin
-      - INDEXER_PASSWORD=admin
+      INDEXER_URL: https://wazuh1.indexer:9200
+      INDEXER_USERNAME: admin
+      INDEXER_PASSWORD: admin
+      FILEBEAT_SSL_VERIFICATION_MODE: full
+      SSL_CERTIFICATE_AUTHORITIES: /etc/ssl/root-ca.pem
+      SSL_CERTIFICATE: /etc/ssl/filebeat.pem
+      SSL_KEY: /etc/ssl/filebeat.key
     volumes:
-      - worker-wazuh-api-configuration:/var/wazuh-manager/api/configuration
-      - worker-wazuh-etc:/var/wazuh-manager/etc
-      - worker-wazuh-logs:/var/wazuh-manager/logs
-      - worker-wazuh-queue:/var/wazuh-manager/queue
-      - worker-wazuh-var-multigroups:/var/wazuh-manager/var/multigroups
-      - ./config/root-ca/certs/root-ca.pem:/var/wazuh-manager/etc/certs/root-ca.pem
-      - ./config/wazuh_worker/certs/wazuh.worker.pem:/var/wazuh-manager/etc/certs/manager.pem
-      - ./config/wazuh_worker/certs/wazuh.worker-key.pem:/var/wazuh-manager/etc/certs/manager-key.pem
+      - worker-wazuh-api-configuration:/var/ossec/api/configuration
+      - worker-wazuh-etc:/var/ossec/etc
+      - worker-wazuh-logs:/var/ossec/logs
+      - worker-wazuh-queue:/var/ossec/queue
+      - worker-wazuh-var-multigroups:/var/ossec/var/multigroups
+      - worker-wazuh-integrations:/var/ossec/integrations
+      - worker-wazuh-active-response:/var/ossec/active-response/bin
+      - worker-wazuh-agentless:/var/ossec/agentless
+      - worker-wazuh-wodles:/var/ossec/wodles
+      - worker-filebeat-etc:/etc/filebeat
+      - worker-filebeat-var:/var/lib/filebeat
+      - ./config/wazuh_indexer_ssl_certs/root-ca-manager.pem:/etc/ssl/root-ca.pem
+      - ./config/wazuh_indexer_ssl_certs/wazuh.worker.pem:/etc/ssl/filebeat.pem
+      - ./config/wazuh_indexer_ssl_certs/wazuh.worker-key.pem:/etc/ssl/filebeat.key
+      - ./config/wazuh_cluster/wazuh_worker.conf:/wazuh-config-mount/etc/ossec.conf
 
   wazuh1.indexer:
-    image: wazuh/wazuh-indexer:5.0.0
+    image: wazuh/wazuh-indexer:6.0.0
     hostname: wazuh1.indexer
-    container_name: multi-node-wazuh1.indexer
     restart: always
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+      nofile:
+        soft: 65536
+        hard: 65536
     ports:
       - "9200:9200"
     environment:
-      - OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g
-      - bootstrap.memory_lock=true
-      - network.host=0.0.0.0
-      - node.name=wazuh1.indexer
-      - cluster.initial_cluster_manager_nodes=wazuh1.indexer,wazuh2.indexer,wazuh3.indexer
-      - discovery.seed_hosts=wazuh1.indexer,wazuh2.indexer,wazuh3.indexer
-      - node.max_local_storage_nodes=3
-      - plugins.security.allow_default_init_securityindex=true
-      - NODES_DN=CN=wazuh1.indexer,OU=Wazuh,O=Wazuh,L=California,C=US;CN=wazuh2.indexer,OU=Wazuh,O=Wazuh,L=California,C=US;CN=wazuh3.indexer,OU=Wazuh,O=Wazuh,L=California,C=US
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
-      nofile:
-        soft: 65536
-        hard: 65536
-    healthcheck:
-      test: [ "CMD-SHELL", "curl -fks https://localhost:9200/_plugins/_security/health | grep -q '\"status\":\"UP\"'" ]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-      start_period: 60s
+      OPENSEARCH_JAVA_OPTS: "-Xms1g -Xmx1g"
+      bootstrap.memory_lock: "true"
+      NETWORK_HOST: wazuh1.indexer
+      NODE_NAME: wazuh1.indexer
+      CLUSTER_INITIAL_MASTER_NODES: '["wazuh1.indexer", "wazuh2.indexer", "wazuh3.indexer"]'
+      CLUSTER_NAME: "wazuh-cluster"
+      DISCOVERY_SEED_HOSTS: '["wazuh1.indexer", "wazuh2.indexer", "wazuh3.indexer"]'
+      NODE_MAX_LOCAL_STORAGE_NODES: "3"
+      PATH_DATA: /var/lib/wazuh-indexer
+      PATH_LOGS: /var/log/wazuh-indexer
+      PLUGINS_SECURITY_SSL_HTTP_PEMCERT_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh1.indexer.pem
+      PLUGINS_SECURITY_SSL_HTTP_PEMKEY_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh1.indexer.key
+      PLUGINS_SECURITY_SSL_HTTP_PEMTRUSTEDCAS_FILEPATH: /usr/share/wazuh-indexer/certs/root-ca.pem
+      PLUGINS_SECURITY_SSL_TRANSPORT_PEMCERT_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh1.indexer.pem
+      PLUGINS_SECURITY_SSL_TRANSPORT_PEMKEY_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh1.indexer.key
+      PLUGINS_SECURITY_SSL_TRANSPORT_PEMTRUSTEDCAS_FILEPATH: /usr/share/wazuh-indexer/certs/root-ca.pem
+      PLUGINS_SECURITY_SSL_HTTP_ENABLED: "true"
+      PLUGINS_SECURITY_SSL_TRANSPORT_ENFORCE_HOSTNAME_VERIFICATION: "false"
+      PLUGINS_SECURITY_SSL_TRANSPORT_RESOLVE_HOSTNAME: "false"
+      PLUGINS_SECURITY_AUTHCZ_ADMIN_DN: "CN=admin,OU=Wazuh,O=Wazuh,L=California,C=US"
+      PLUGINS_SECURITY_CHECK_SNAPSHOT_RESTORE_WRITE_PRIVILEGES: "true"
+      PLUGINS_SECURITY_ENABLE_SNAPSHOT_RESTORE_PRIVILEGE: "true"
+      PLUGINS_SECURITY_NODES_DN: '["CN=wazuh1.indexer,OU=Wazuh,O=Wazuh,L=California,C=US", "CN=wazuh2.indexer,OU=Wazuh,O=Wazuh,L=California,C=US", "CN=wazuh3.indexer,OU=Wazuh,O=Wazuh,L=California,C=US", "CN=filebeat,OU=Wazuh,O=Wazuh,L=California,C=US"]'
+      PLUGINS_SECURITY_RESTAPI_ROLES_ENABLED: '["all_access", "security_rest_api_access"]'
+      PLUGINS_SECURITY_SYSTEM_INDICES_ENABLED: "true"
+      PLUGINS_SECURITY_SYSTEM_INDICES_INDICES: '[".opendistro-alerting-config", ".opendistro-alerting-alert*", ".opendistro-anomaly-results*", ".opendistro-anomaly-detector*", ".opendistro-anomaly-checkpoints", ".opendistro-anomaly-detection-state", ".opendistro-reports-*", ".opendistro-notifications-*", ".opendistro-notebooks", ".opensearch-observability", ".opendistro-asynchronous-search-response*", ".replication-metadata-store"]'
+      PLUGINS_SECURITY_ALLOW_DEFAULT_INIT_SECURITYINDEX: "true"
+      CLUSTER_ROUTING_ALLOCATION_DISK_THRESHOLD_ENABLED: "false"
+      COMPATIBILITY_OVERRIDE_MAIN_RESPONSE_VERSION: "true"
     volumes:
       - wazuh-indexer-data-1:/var/lib/wazuh-indexer
-      - ./config/root-ca/certs/root-ca.pem:/usr/share/wazuh-indexer/config/certs/root-ca.pem
-      - ./config/wazuh1_indexer/certs/wazuh1.indexer-key.pem:/usr/share/wazuh-indexer/config/certs/indexer-key.pem
-      - ./config/wazuh1_indexer/certs/wazuh1.indexer.pem:/usr/share/wazuh-indexer/config/certs/indexer.pem
-      - ./config/wazuh1_indexer/certs/admin.pem:/usr/share/wazuh-indexer/config/certs/admin.pem
-      - ./config/wazuh1_indexer/certs/admin-key.pem:/usr/share/wazuh-indexer/config/certs/admin-key.pem
+      - ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-indexer/certs/root-ca.pem
+      - ./config/wazuh_indexer_ssl_certs/wazuh1.indexer-key.pem:/usr/share/wazuh-indexer/certs/wazuh1.indexer.key
+      - ./config/wazuh_indexer_ssl_certs/wazuh1.indexer.pem:/usr/share/wazuh-indexer/certs/wazuh1.indexer.pem
+      - ./config/wazuh_indexer_ssl_certs/admin.pem:/usr/share/wazuh-indexer/certs/admin.pem
+      - ./config/wazuh_indexer_ssl_certs/admin-key.pem:/usr/share/wazuh-indexer/certs/admin-key.pem
+      #  if you need mount a custom opensearch.yml, uncomment the next line and delete the environment variables
+      # - ./config/wazuh_indexer/wazuh1.indexer.yml:/usr/share/wazuh-indexer/opensearch.yml
 
   wazuh2.indexer:
-    image: wazuh/wazuh-indexer:5.0.0
+    image: wazuh/wazuh-indexer:6.0.0
     hostname: wazuh2.indexer
-    container_name: multi-node-wazuh2.indexer
     restart: always
-    entrypoint: >
-      /bin/sh -c " echo 'Waiting for wazuh1.indexer...'; sleep 5; until getent hosts wazuh1.indexer; do sleep 2; done; /entrypoint.sh opensearch"
-    depends_on:
-      - wazuh1.indexer
-    environment:
-      - OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g
-      - bootstrap.memory_lock=true
-      - network.host=0.0.0.0
-      - node.name=wazuh2.indexer
-      - cluster.initial_cluster_manager_nodes=wazuh1.indexer,wazuh2.indexer,wazuh3.indexer
-      - discovery.seed_hosts=wazuh1.indexer,wazuh2.indexer,wazuh3.indexer
-      - node.max_local_storage_nodes=3
-      - plugins.security.allow_default_init_securityindex=true
-      - NODES_DN=CN=wazuh1.indexer,OU=Wazuh,O=Wazuh,L=California,C=US;CN=wazuh2.indexer,OU=Wazuh,O=Wazuh,L=California,C=US;CN=wazuh3.indexer,OU=Wazuh,O=Wazuh,L=California,C=US
     ulimits:
       memlock:
         soft: -1
@@ -146,37 +142,48 @@ services:
       nofile:
         soft: 65536
         hard: 65536
-    healthcheck:
-      test: [ "CMD-SHELL", "curl -fks https://localhost:9200/_plugins/_security/health | grep -q '\"status\":\"UP\"'" ]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-      start_period: 60s
+    environment:
+      OPENSEARCH_JAVA_OPTS: "-Xms1g -Xmx1g"
+      bootstrap.memory_lock: "true"
+      NETWORK_HOST: wazuh2.indexer
+      NODE_NAME: wazuh2.indexer
+      CLUSTER_INITIAL_MASTER_NODES: '["wazuh1.indexer", "wazuh2.indexer", "wazuh3.indexer"]'
+      CLUSTER_NAME: "wazuh-cluster"
+      DISCOVERY_SEED_HOSTS: '["wazuh1.indexer", "wazuh2.indexer", "wazuh3.indexer"]'
+      NODE_MAX_LOCAL_STORAGE_NODES: "3"
+      PATH_DATA: /var/lib/wazuh-indexer
+      PATH_LOGS: /var/log/wazuh-indexer
+      PLUGINS_SECURITY_SSL_HTTP_PEMCERT_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh2.indexer.pem
+      PLUGINS_SECURITY_SSL_HTTP_PEMKEY_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh2.indexer.key
+      PLUGINS_SECURITY_SSL_HTTP_PEMTRUSTEDCAS_FILEPATH: /usr/share/wazuh-indexer/certs/root-ca.pem
+      PLUGINS_SECURITY_SSL_TRANSPORT_PEMCERT_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh2.indexer.pem
+      PLUGINS_SECURITY_SSL_TRANSPORT_PEMKEY_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh2.indexer.key
+      PLUGINS_SECURITY_SSL_TRANSPORT_PEMTRUSTEDCAS_FILEPATH: /usr/share/wazuh-indexer/certs/root-ca.pem
+      PLUGINS_SECURITY_SSL_HTTP_ENABLED: "true"
+      PLUGINS_SECURITY_SSL_TRANSPORT_ENFORCE_HOSTNAME_VERIFICATION: "false"
+      PLUGINS_SECURITY_SSL_TRANSPORT_RESOLVE_HOSTNAME: "false"
+      PLUGINS_SECURITY_AUTHCZ_ADMIN_DN: "CN=admin,OU=Wazuh,O=Wazuh,L=California,C=US"
+      PLUGINS_SECURITY_CHECK_SNAPSHOT_RESTORE_WRITE_PRIVILEGES: "true"
+      PLUGINS_SECURITY_ENABLE_SNAPSHOT_RESTORE_PRIVILEGE: "true"
+      PLUGINS_SECURITY_NODES_DN: '["CN=wazuh1.indexer,OU=Wazuh,O=Wazuh,L=California,C=US", "CN=wazuh2.indexer,OU=Wazuh,O=Wazuh,L=California,C=US", "CN=wazuh3.indexer,OU=Wazuh,O=Wazuh,L=California,C=US", "CN=filebeat,OU=Wazuh,O=Wazuh,L=California,C=US"]'
+      PLUGINS_SECURITY_RESTAPI_ROLES_ENABLED: '["all_access", "security_rest_api_access"]'
+      PLUGINS_SECURITY_SYSTEM_INDICES_ENABLED: "true"
+      PLUGINS_SECURITY_SYSTEM_INDICES_INDICES: '[".opendistro-alerting-config", ".opendistro-alerting-alert*", ".opendistro-anomaly-results*", ".opendistro-anomaly-detector*", ".opendistro-anomaly-checkpoints", ".opendistro-anomaly-detection-state", ".opendistro-reports-*", ".opendistro-notifications-*", ".opendistro-notebooks", ".opensearch-observability", ".opendistro-asynchronous-search-response*", ".replication-metadata-store"]'
+      PLUGINS_SECURITY_ALLOW_DEFAULT_INIT_SECURITYINDEX: "true"
+      CLUSTER_ROUTING_ALLOCATION_DISK_THRESHOLD_ENABLED: "false"
+      COMPATIBILITY_OVERRIDE_MAIN_RESPONSE_VERSION: "true"
     volumes:
       - wazuh-indexer-data-2:/var/lib/wazuh-indexer
-      - ./config/root-ca/certs/root-ca.pem:/usr/share/wazuh-indexer/config/certs/root-ca.pem
-      - ./config/wazuh2_indexer/certs/wazuh2.indexer-key.pem:/usr/share/wazuh-indexer/config/certs/indexer-key.pem
-      - ./config/wazuh2_indexer/certs/wazuh2.indexer.pem:/usr/share/wazuh-indexer/config/certs/indexer.pem
+      - ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-indexer/certs/root-ca.pem
+      - ./config/wazuh_indexer_ssl_certs/wazuh2.indexer-key.pem:/usr/share/wazuh-indexer/certs/wazuh2.indexer.key
+      - ./config/wazuh_indexer_ssl_certs/wazuh2.indexer.pem:/usr/share/wazuh-indexer/certs/wazuh2.indexer.pem
+      #  if you need mount a custom opensearch.yml, uncomment the next line and delete the environment variables
+      # - ./config/wazuh_indexer/wazuh2.indexer.yml:/usr/share/wazuh-indexer/opensearch.yml
 
   wazuh3.indexer:
-    image: wazuh/wazuh-indexer:5.0.0
+    image: wazuh/wazuh-indexer:6.0.0
     hostname: wazuh3.indexer
-    container_name: multi-node-wazuh3.indexer
     restart: always
-    entrypoint: >
-      /bin/sh -c " echo 'Waiting for wazuh1.indexer...'; sleep 5;until getent hosts wazuh1.indexer; do sleep 2; done; /entrypoint.sh opensearch"
-    depends_on:
-      - wazuh1.indexer
-    environment:
-      - OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g
-      - bootstrap.memory_lock=true
-      - network.host=0.0.0.0
-      - node.name=wazuh3.indexer
-      - cluster.initial_cluster_manager_nodes=wazuh1.indexer,wazuh2.indexer,wazuh3.indexer
-      - discovery.seed_hosts=wazuh1.indexer,wazuh2.indexer,wazuh3.indexer
-      - node.max_local_storage_nodes=3
-      - plugins.security.allow_default_init_securityindex=true
-      - NODES_DN=CN=wazuh1.indexer,OU=Wazuh,O=Wazuh,L=California,C=US;CN=wazuh2.indexer,OU=Wazuh,O=Wazuh,L=California,C=US;CN=wazuh3.indexer,OU=Wazuh,O=Wazuh,L=California,C=US
     ulimits:
       memlock:
         soft: -1
@@ -184,59 +191,93 @@ services:
       nofile:
         soft: 65536
         hard: 65536
-    healthcheck:
-      test: [ "CMD-SHELL", "curl -fks https://localhost:9200/_plugins/_security/health | grep -q '\"status\":\"UP\"'" ]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-      start_period: 60s
+    environment:
+      OPENSEARCH_JAVA_OPTS: "-Xms1g -Xmx1g"
+      bootstrap.memory_lock: "true"
+      NETWORK_HOST: wazuh3.indexer
+      NODE_NAME: wazuh3.indexer
+      CLUSTER_INITIAL_MASTER_NODES: '["wazuh1.indexer", "wazuh2.indexer", "wazuh3.indexer"]'
+      CLUSTER_NAME: "wazuh-cluster"
+      DISCOVERY_SEED_HOSTS: '["wazuh1.indexer", "wazuh2.indexer", "wazuh3.indexer"]'
+      NODE_MAX_LOCAL_STORAGE_NODES: "3"
+      PATH_DATA: /var/lib/wazuh-indexer
+      PATH_LOGS: /var/log/wazuh-indexer
+      PLUGINS_SECURITY_SSL_HTTP_PEMCERT_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh3.indexer.pem
+      PLUGINS_SECURITY_SSL_HTTP_PEMKEY_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh3.indexer.key
+      PLUGINS_SECURITY_SSL_HTTP_PEMTRUSTEDCAS_FILEPATH: /usr/share/wazuh-indexer/certs/root-ca.pem
+      PLUGINS_SECURITY_SSL_TRANSPORT_PEMCERT_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh3.indexer.pem
+      PLUGINS_SECURITY_SSL_TRANSPORT_PEMKEY_FILEPATH: /usr/share/wazuh-indexer/certs/wazuh3.indexer.key
+      PLUGINS_SECURITY_SSL_TRANSPORT_PEMTRUSTEDCAS_FILEPATH: /usr/share/wazuh-indexer/certs/root-ca.pem
+      PLUGINS_SECURITY_SSL_HTTP_ENABLED: "true"
+      PLUGINS_SECURITY_SSL_TRANSPORT_ENFORCE_HOSTNAME_VERIFICATION: "false"
+      PLUGINS_SECURITY_SSL_TRANSPORT_RESOLVE_HOSTNAME: "false"
+      PLUGINS_SECURITY_AUTHCZ_ADMIN_DN: "CN=admin,OU=Wazuh,O=Wazuh,L=California,C=US"
+      PLUGINS_SECURITY_CHECK_SNAPSHOT_RESTORE_WRITE_PRIVILEGES: "true"
+      PLUGINS_SECURITY_ENABLE_SNAPSHOT_RESTORE_PRIVILEGE: "true"
+      PLUGINS_SECURITY_NODES_DN: '["CN=wazuh1.indexer,OU=Wazuh,O=Wazuh,L=California,C=US", "CN=wazuh2.indexer,OU=Wazuh,O=Wazuh,L=California,C=US", "CN=wazuh3.indexer,OU=Wazuh,O=Wazuh,L=California,C=US", "CN=filebeat,OU=Wazuh,O=Wazuh,L=California,C=US"]'
+      PLUGINS_SECURITY_RESTAPI_ROLES_ENABLED: '["all_access", "security_rest_api_access"]'
+      PLUGINS_SECURITY_SYSTEM_INDICES_ENABLED: "true"
+      PLUGINS_SECURITY_SYSTEM_INDICES_INDICES: '[".opendistro-alerting-config", ".opendistro-alerting-alert*", ".opendistro-anomaly-results*", ".opendistro-anomaly-detector*", ".opendistro-anomaly-checkpoints", ".opendistro-anomaly-detection-state", ".opendistro-reports-*", ".opendistro-notifications-*", ".opendistro-notebooks", ".opensearch-observability", ".opendistro-asynchronous-search-response*", ".replication-metadata-store"]'
+      PLUGINS_SECURITY_ALLOW_DEFAULT_INIT_SECURITYINDEX: "true"
+      CLUSTER_ROUTING_ALLOCATION_DISK_THRESHOLD_ENABLED: "false"
+      COMPATIBILITY_OVERRIDE_MAIN_RESPONSE_VERSION: "true"
     volumes:
       - wazuh-indexer-data-3:/var/lib/wazuh-indexer
-      - ./config/root-ca/certs/root-ca.pem:/usr/share/wazuh-indexer/config/certs/root-ca.pem
-      - ./config/wazuh3_indexer/certs/wazuh3.indexer-key.pem:/usr/share/wazuh-indexer/config/certs/indexer-key.pem
-      - ./config/wazuh3_indexer/certs/wazuh3.indexer.pem:/usr/share/wazuh-indexer/config/certs/indexer.pem
+      - ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-indexer/certs/root-ca.pem
+      - ./config/wazuh_indexer_ssl_certs/wazuh3.indexer-key.pem:/usr/share/wazuh-indexer/certs/wazuh3.indexer.key
+      - ./config/wazuh_indexer_ssl_certs/wazuh3.indexer.pem:/usr/share/wazuh-indexer/certs/wazuh3.indexer.pem
+      #  if you need mount a custom opensearch.yml, uncomment the next line and delete the environment variables
+      # - ./config/wazuh_indexer/wazuh3.indexer.yml:/usr/share/wazuh-indexer/opensearch.yml
 
   wazuh.dashboard:
-    image: wazuh/wazuh-dashboard:5.0.0
+    image: wazuh/wazuh-dashboard:6.0.0
     hostname: wazuh.dashboard
-    container_name: multi-node-wazuh.dashboard
     restart: always
-    healthcheck:
-      test: [ "CMD", "curl", "-k", "-s", "-o", "/dev/null", "https://localhost:5601/login" ]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 30s
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+      nofile:
+        soft: 65536
+        hard: 65536
     ports:
       - 443:5601
     environment:
-      - SERVER_PORT=5601
-      - SERVER_HOST=0.0.0.0
-      - OPENSEARCH_HOSTS=["https://wazuh1.indexer:9200","https://wazuh2.indexer:9200","https://wazuh3.indexer:9200"]
-      - INDEXER_USERNAME=admin
-      - INDEXER_PASSWORD=admin
-      - WAZUH_API_URL=https://wazuh.master
-      - DASHBOARD_USERNAME=kibanaserver
-      - DASHBOARD_PASSWORD=kibanaserver
-      - SERVER_SSL_CERTIFICATE=/usr/share/wazuh-dashboard/config/certs/wazuh-dashboard.pem
-      - SERVER_SSL_KEY=/usr/share/wazuh-dashboard/config/certs/wazuh-dashboard-key.pem
-      - OPENSEARCH_SSL_CERTIFICATE_AUTHORITIES=/usr/share/wazuh-dashboard/config/certs/root-ca.pem
+      OPENSEARCH_HOSTS: "https://wazuh1.indexer:9200"
+      WAZUH_API_URL: "https://wazuh.master"
+      API_USERNAME: wazuh-wui
+      API_PASSWORD: MyS3cr37P450r.*-
+      DASHBOARD_USERNAME: kibanaserver
+      DASHBOARD_PASSWORD: kibanaserver
+      SERVER_HOST: "0.0.0.0"
+      SERVER_PORT: "5601"
+      OPENSEARCH_SSL_VERIFICATIONMODE: certificate
+      OPENSEARCH_REQUESTHEADERSALLOWLIST: '["securitytenant","Authorization"]'
+      OPENSEARCH_SECURITY_MULTITENANCY_ENABLED: "false"
+      SERVER_SSL_ENABLED: "true"
+      OPENSEARCH_SECURITY_READONLY_MODE_ROLES: '["kibana_read_only"]'
+      SERVER_SSL_KEY: "/usr/share/wazuh-dashboard/certs/wazuh-dashboard-key.pem"
+      SERVER_SSL_CERTIFICATE: "/usr/share/wazuh-dashboard/certs/wazuh-dashboard.pem"
+      OPENSEARCH_SSL_CERTIFICATEAUTHORITIES: '["/usr/share/wazuh-dashboard/certs/root-ca.pem"]'
+      UISETTINGS_OVERRIDES_DEFAULTROUTE: /app/wz-home
     volumes:
-      - ./config/wazuh_dashboard/certs/wazuh.dashboard.pem:/usr/share/wazuh-dashboard/config/certs/wazuh-dashboard.pem
-      - ./config/wazuh_dashboard/certs/wazuh.dashboard-key.pem:/usr/share/wazuh-dashboard/config/certs/wazuh-dashboard-key.pem
-      - ./config/root-ca/certs/root-ca.pem:/usr/share/wazuh-dashboard/config/certs/root-ca.pem
-      - wazuh-dashboard-config:/usr/share/wazuh-dashboard/config
+      - wazuh-dashboard-config:/usr/share/wazuh-dashboard/data/wazuh/config
       - wazuh-dashboard-custom:/usr/share/wazuh-dashboard/plugins/wazuh/public/assets/custom
+      - ./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
+      - ./config/wazuh_indexer_ssl_certs/root-ca.pem:/usr/share/wazuh-dashboard/certs/root-ca.pem
+      - ./config/wazuh_dashboard/wazuh.yml:/usr/share/wazuh-dashboard/data/wazuh/config/wazuh.yml
+      #  if you need mount a custom opensearch-dashboards.yml, uncomment the next line and delete the environment variables
+      # - ./config/wazuh_dashboard/opensearch_dashboards.yml:/usr/share/wazuh-dashboard/config/opensearch_dashboards.yml
     depends_on:
-      wazuh1.indexer:
-        condition: service_healthy
-      wazuh.master:
-        condition: service_healthy
+      - wazuh1.indexer
+    links:
+      - wazuh1.indexer:wazuh1.indexer
+      - wazuh.master:wazuh.master
 
   nginx:
     image: nginx:stable
     hostname: nginx
-    container_name: multi-node-nginx
     restart: always
     ports:
       - "1514:1514"
@@ -244,6 +285,10 @@ services:
       - wazuh.master
       - wazuh.worker
       - wazuh.dashboard
+    links:
+      - wazuh.master:wazuh.master
+      - wazuh.worker:wazuh.worker
+      - wazuh.dashboard:wazuh.dashboard
     volumes:
       - ./config/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
 
@@ -253,11 +298,23 @@ volumes:
   master-wazuh-logs:
   master-wazuh-queue:
   master-wazuh-var-multigroups:
+  master-wazuh-integrations:
+  master-wazuh-active-response:
+  master-wazuh-agentless:
+  master-wazuh-wodles:
+  master-filebeat-etc:
+  master-filebeat-var:
   worker-wazuh-api-configuration:
   worker-wazuh-etc:
   worker-wazuh-logs:
   worker-wazuh-queue:
   worker-wazuh-var-multigroups:
+  worker-wazuh-integrations:
+  worker-wazuh-active-response:
+  worker-wazuh-agentless:
+  worker-wazuh-wodles:
+  worker-filebeat-etc:
+  worker-filebeat-var:
   wazuh-indexer-data-1:
   wazuh-indexer-data-2:
   wazuh-indexer-data-3:

multi-node/generate-certs.yml

@@ -0,0 +1,9 @@
+# Wazuh App Copyright (C) 2017, Wazuh Inc. (License GPLv2)
+services:
+  generator:
+    image: wazuh/wazuh-cert-tool:6.0.0
+    hostname: wazuh-cert-tool
+    container_name: wazuh-cert-tool
+    volumes:
+      - ./config/wazuh_indexer_ssl_certs/:/certificates/
+      - ./config/certs.yml:/config/certs.yml

multi-node/volume-migrator.sh

@@ -0,0 +1,279 @@
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=wazuh-indexer-data-1 \
+           $2_wazuh-indexer-data-1
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=wazuh-indexer-data-2 \
+           $2_wazuh-indexer-data-2
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=wazuh-indexer-data-3 \
+           $2_wazuh-indexer-data-3
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=master_wazuh_api_configuration \
+           $2_master_wazuh_api_configuration
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=master_wazuh_etc \
+           $2_docker_wazuh_etc
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=master-wazuh-logs \
+           $2_master-wazuh-logs
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=master-wazuh-queue \
+           $2_master-wazuh-queue
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=master-wazuh-var-multigroups \
+           $2_master-wazuh-var-multigroups
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=master-wazuh-integrations \
+           $2_master-wazuh-integrations
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=master-wazuh-active-response \
+           $2_master-wazuh-active-response
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=master-wazuh-agentless \
+           $2_master-wazuh-agentless
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=master-wazuh-wodles \
+           $2_master-wazuh-wodles
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=master-filebeat-etc \
+           $2_master-filebeat-etc
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=master-filebeat-var \
+           $2_master-filebeat-var
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=worker_wazuh_api_configuration \
+           $2_worker_wazuh_api_configuration
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=worker_wazuh_etc \
+           $2_worker-wazuh-etc
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=worker-wazuh-logs \
+           $2_worker-wazuh-logs
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=worker-wazuh-queue \
+           $2_worker-wazuh-queue
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=worker-wazuh-var-multigroups \
+           $2_worker-wazuh-var-multigroups
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=worker-wazuh-integrations \
+           $2_worker-wazuh-integrations
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=worker-wazuh-active-response \
+           $2_worker-wazuh-active-response
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=worker-wazuh-agentless \
+           $2_worker-wazuh-agentless
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=worker-wazuh-wodles \
+           $2_worker-wazuh-wodles
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=worker-filebeat-etc \
+           $2_worker-filebeat-etc
+
+docker volume create \
+           --label com.docker.compose.project=$2 \
+           --label com.docker.compose.version=$1 \
+           --label com.docker.compose.volume=worker-filebeat-var \
+           $2_worker-filebeat-var
+
+docker container run --rm -it \
+           -v wazuh-docker_worker-filebeat-var:/from \
+           -v $2_worker-filebeat-var:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_elastic-data-1:/from \
+           -v $2_wazuh-indexer-data-1:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_elastic-data-2:/from \
+           -v $2_wazuh-indexer-data-2:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_elastic-data-3:/from \
+           -v $2_wazuh-indexer-data-3:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_ossec-api-configuration:/from \
+           -v $2_master-wazuh-api-configuration:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_ossec-etc:/from \
+           -v $2_master-wazuh-etc:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_ossec-logs:/from \
+           -v $2_master-wazuh-logs:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_ossec-queue:/from \
+           -v $2_master-wazuh-queue:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_ossec-var-multigroups:/from \
+           -v $2_master-wazuh-var-multigroups:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_ossec-integrations:/from \
+           -v $2_master-wazuh-integrations:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_ossec-active-response:/from \
+           -v $2_master-wazuh-active-response:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_ossec-agentless:/from \
+           -v $2_master-wazuh-agentless:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_ossec-wodles:/from \
+           -v $2_master-wazuh-wodles:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_filebeat-etc:/from \
+           -v $2_master-filebeat-etc:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_filebeat-var:/from \
+           -v $2_master-filebeat-var:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-api-configuration:/from \
+           -v $2_worker-wazuh-api-configuration:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-etc:/from \
+           -v $2_worker-wazuh-etc:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-logs:/from \
+           -v $2_worker-wazuh-logs:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-queue:/from \
+           -v $2_worker-wazuh-queue:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-var-multigroups:/from \
+           -v $2_worker-wazuh-var-multigroups:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-integrations:/from \
+           -v $2_worker-wazuh-integrations:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-active-response:/from \
+           -v $2_worker-wazuh-active-response:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-agentless:/from \
+           -v $2_worker-wazuh-agentless:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_worker-ossec-wodles:/from \
+           -v $2_worker-wazuh-wodles:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_worker-filebeat-etc:/from \
+           -v $2_worker-filebeat-etc:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"
+
+docker container run --rm -it \
+           -v wazuh-docker_worker-filebeat-var:/from \
+           -v $2_worker-filebeat-var:/to \
+           alpine ash -c "cd /from ; cp -avp . /to"