Change filebeat test for multi node deployment

Fixed login in Docker Hub before triggering the QEMU action

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

@@ -6,9 +6,8 @@ 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
+    docker exec "$MASTER_CONTAINERS" $COMMAND_TO_EXECUTE
+    if [[ $? -eq 0 ]]; then
       echo "No errors in filebeat"
       echo "${FILEBEAT_OUTPUT}"
     else
@@ -25,9 +24,8 @@ 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
+    docker exec "$MASTER_CONTAINERS" $COMMAND_TO_EXECUTE
+    if [[ $? -eq 0 ]]; then
       echo "No errors in filebeat"
       echo "${FILEBEAT_OUTPUT}"
     else

.github/workflows/4_bumper_repository.yml

@@ -31,7 +31,7 @@ on:
 jobs:
   bump:
     name: Repository bumper
-    runs-on: ubuntu-22.04
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     permissions:
       contents: write
       pull-requests: write

.github/workflows/Procedure_push_docker_images.yml

@@ -72,7 +72,7 @@ on:
 
 jobs:
   setup:
-    runs-on: ubuntu-22.04
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
 
     permissions:
       id-token: write
@@ -130,7 +130,7 @@ jobs:
         echo "WAZUH_COMPONENTS=$JSON_ARRAY" >> $GITHUB_OUTPUT
 
   build-and-push:
-    runs-on: ubuntu-22.04
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
 
     permissions:
       id-token: write
@@ -155,8 +155,11 @@ jobs:
       with:
         ref: ${{ inputs.docker_reference }}
 
-    - name: free disk space
-      uses: ./.github/free-disk-space
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v4
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v4
@@ -175,13 +178,6 @@ jobs:
       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
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
     - name: Build Wazuh images
       run: |
         IMAGE_TAG="${{ inputs.image_tag }}"
@@ -216,7 +212,7 @@ jobs:
 
 
   notify:
-    runs-on: ubuntu-22.04
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     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' }}

.github/workflows/push.yml

@@ -2,14 +2,28 @@ name: Wazuh Docker pipeline
 
 on: [pull_request]
 
+env:
+  ARTIFACTS_LOCAL_DIR: /home/runner/work/wazuh-docker/wazuh-docker/docker-images
+  ARTIFACT_NAMES: |
+    wazuh-manager.tar
+    wazuh-indexer.tar
+    wazuh-dashboard.tar
+    wazuh-agent.tar
+
 jobs:
   build-docker-images:
-    runs-on: ubuntu-22.04
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     steps:
 
     - name: Check out code
       uses: actions/checkout@v6
 
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v4
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
     - name: Build Wazuh images
       run: ./build-images.sh
       working-directory: ./build-docker-images
@@ -25,47 +39,20 @@ jobs:
         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
 
-    - name: Temporarily save Wazuh manager Docker image
-      uses: actions/upload-artifact@v7
-      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@v7
-      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@v7
-      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@v7
-      with:
-        name: docker-artifact-agent
-        path: /home/runner/work/wazuh-docker/wazuh-docker/docker-images/wazuh-agent.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}}
+    - name: Temporarily save Wazuh Docker images
       env:
-        GOSS_SLEEP: 30
-        GOSS_FILE: .github/.goss.yaml
+        S3_ARTIFACTS_PATH: s3://${{ secrets.CI_DEV_INTERNAL_S3_BUCKET }}/wazuh-docker/4_pr_check/${{ github.run_id }}
+      run: |
+        echo "Uploading Docker image artifacts to S3..."
+        while IFS= read -r artifact; do
+          [ -z "$artifact" ] && continue
+          echo "  Uploading: $artifact"
+          aws s3 cp "${ARTIFACTS_LOCAL_DIR}/${artifact}" "${S3_ARTIFACTS_PATH}/${artifact}"
+        done <<< "$ARTIFACT_NAMES"
+        echo "All artifacts uploaded successfully."
 
   check-single-node:
-    runs-on: ubuntu-22.04
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     needs: build-docker-images
     steps:
 
@@ -75,32 +62,27 @@ jobs:
     - name: Create enviroment variables
       run: cat .env > $GITHUB_ENV
 
-    - name: Retrieve saved Wazuh indexer Docker image
-      uses: actions/download-artifact@v8
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v4
       with:
-        name: docker-artifact-indexer
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
-    - name: Retrieve saved Wazuh manager Docker image
-      uses: actions/download-artifact@v8
-      with:
-        name: docker-artifact-manager
-
-    - name: Retrieve saved Wazuh dashboard Docker image
-      uses: actions/download-artifact@v8
-      with:
-        name: docker-artifact-dashboard
-
-    - name: Retrieve saved Wazuh agent Docker image
-      uses: actions/download-artifact@v8
-      with:
-        name: docker-artifact-agent
-
-    - name: Docker load
+    - name: Retrieve saved Wazuh Docker images and load them into Docker
+      env:
+        S3_ARTIFACTS_PATH: s3://${{ secrets.CI_DEV_INTERNAL_S3_BUCKET }}/wazuh-docker/4_pr_check/${{ github.run_id }}
+        ARTIFACTS_LOCAL_DIR: /home/runner/work/wazuh-docker/wazuh-docker/docker-images
       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
+        mkdir -p "${ARTIFACTS_LOCAL_DIR}"
+        echo "Downloading and loading Docker image artifacts from S3..."
+        while IFS= read -r artifact; do
+          [ -z "$artifact" ] && continue
+          echo "  Downloading: $artifact"
+          aws s3 cp "${S3_ARTIFACTS_PATH}/${artifact}" "${ARTIFACTS_LOCAL_DIR}/${artifact}"
+          echo "  Loading into Docker: $artifact"
+          docker load -i "${ARTIFACTS_LOCAL_DIR}/${artifact}"
+        done <<< "$ARTIFACT_NAMES"
+        echo "All artifacts downloaded and loaded successfully."
 
     - name: Create single node certficates
       run: docker compose -f single-node/generate-indexer-certs.yml run --rm generator
@@ -111,6 +93,11 @@ jobs:
     - name: Check Wazuh indexer start
       run: |
        sleep 60
+       timeout 600 bash -c 'until curl -XGET "https://localhost:9200/_cluster/health" -u admin:SecretPassword -k -s | grep "green"; do sleep 5; done'
+       if [ $? -ne 0 ]; then
+         docker ps -a
+         exit 1
+       fi
        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
@@ -120,6 +107,7 @@ jobs:
        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`"
+       timeout 120 bash -c 'until [ $status_index_green -eq $status_index ]; do sleep 5; done'
        if [[ $status_index_green -eq $status_index ]]; then
         curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s
        else
@@ -138,19 +126,9 @@ jobs:
         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: |
+       timeout 360 bash -c 'until templates=$(curl -XGET "https://0.0.0.0:9200/_cat/templates" -u admin:SecretPassword -k -s | grep "wazuh" | wc -l); echo "Templates: $templates"; [ $templates -ge 3 ]; do sleep 5; done'
        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
@@ -202,11 +180,22 @@ jobs:
       env:
         TOKEN: $(curl -s -u wazuh-wui:MyS3cr37P450r.*- -k -X GET "https://0.0.0.0:55000/security/user/authenticate?raw=true")
 
+    - 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 errors in ossec.log for Wazuh manager
       run: ./.github/single-node-log-check.sh
 
   check-multi-node:
-    runs-on: ubuntu-22.04
+    runs-on: codebuild-github-actions-codebuild-runner-devops-amd-${{ github.run_id }}-${{ github.run_attempt }}
     needs: build-docker-images
     steps:
 
@@ -216,36 +205,30 @@ jobs:
     - 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@v8
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v4
       with:
-        name: docker-artifact-dashboard
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_PASSWORD }}
+    
+    - name: Set vm.max_map_count
+      run: sysctl -w vm.max_map_count=262144
 
-    - name: Retrieve saved Wazuh manager Docker image
-      uses: actions/download-artifact@v8
-      with:
-        name: docker-artifact-manager
-
-    - name: Retrieve saved Wazuh indexer Docker image
-      uses: actions/download-artifact@v8
-      with:
-        name: docker-artifact-indexer
-
-    - name: Retrieve saved Wazuh agent Docker image
-      uses: actions/download-artifact@v8
-      with:
-        name: docker-artifact-agent
-
-    - name: Docker load
+    - name: Retrieve saved Wazuh Docker images and load them into Docker
+      env:
+        S3_ARTIFACTS_PATH: s3://${{ secrets.CI_DEV_INTERNAL_S3_BUCKET }}/wazuh-docker/4_pr_check/${{ github.run_id }}
+        ARTIFACTS_LOCAL_DIR: /home/runner/work/wazuh-docker/wazuh-docker/docker-images
       run: |
-        docker load --input ./wazuh-manager.tar
-        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
+        mkdir -p "${ARTIFACTS_LOCAL_DIR}"
+        echo "Downloading and loading Docker image artifacts from S3..."
+        while IFS= read -r artifact; do
+          [ -z "$artifact" ] && continue
+          echo "  Downloading: $artifact"
+          aws s3 cp "${S3_ARTIFACTS_PATH}/${artifact}" "${ARTIFACTS_LOCAL_DIR}/${artifact}"
+          echo "  Loading into Docker: $artifact"
+          docker load -i "${ARTIFACTS_LOCAL_DIR}/${artifact}"
+        done <<< "$ARTIFACT_NAMES"
+        echo "All artifacts downloaded and loaded successfully."
 
     - name: Create multi node certficates
       run: docker compose -f multi-node/generate-indexer-certs.yml run --rm generator
@@ -255,13 +238,12 @@ jobs:
 
     - 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
+       sleep 120
+       timeout 600 bash -c 'until curl -XGET "https://localhost:9200/_cluster/health" -u admin:SecretPassword -k -s | grep -v "yellow"; do sleep 5; done'
+       if [ $? -ne 0 ]; then
+         docker ps -a
+         exit 1
+       fi
        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
@@ -270,7 +252,8 @@ jobs:
         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`"
+       status_index_green="`curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s | grep "green" | wc -l`"
+       timeout 120 bash -c 'until [ $status_index_green -eq $status_index ]; do sleep 5; done'
        if [[ $status_index_green -eq $status_index ]]; then
         curl -XGET "https://0.0.0.0:9200/_cat/indices" -u admin:SecretPassword -k -s
        else
@@ -288,25 +271,9 @@ jobs:
         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: |
+       timeout 360 bash -c 'until templates=$(curl -XGET "https://0.0.0.0:9200/_cat/templates" -u admin:SecretPassword -k -s | grep "wazuh" | wc -l); echo "Templates: $templates"; [ $templates -ge 3 ]; do sleep 5; done'
        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
@@ -325,7 +292,7 @@ jobs:
           echo "Wazuh Manager Services: ${services}"
           echo "OK"
         else
-          echo "Wazuh indexer nodes: ${nodes}"
+          echo "Wazuh Manager Services: ${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
           exit 1
         fi
@@ -343,7 +310,7 @@ jobs:
       run: ./.github/multi-node-filebeat-check.sh
 
     - name: Check Wazuh dashboard service URL
-      run: |
+      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}"
@@ -365,5 +332,22 @@ jobs:
       env:
         TOKEN: $(curl -s -u wazuh-wui:MyS3cr37P450r.*- -k -X GET "https://0.0.0.0:55000/security/user/authenticate?raw=true")
 
+    - 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 errors in ossec.log for Wazuh manager
       run: ./.github/multi-node-log-check.sh

CHANGELOG.md

@@ -9,10 +9,12 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
-- None
+- Change artifact upload and download 4.14.6 ([#2503](https://github.com/wazuh/wazuh-docker/pull/2503))
+- Change runners on repository workflows ([#2470](https://github.com/wazuh/wazuh-docker/pull/2470))
 
 ### Fixed
 
+- Fixed login in Docker Hub before triggering the QEMU action ([#2494](https://github.com/wazuh/wazuh-docker/pull/2494))
 - 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))
 
@@ -266,6 +268,80 @@ All notable changes to this project will be documented in this file.
 
 - None
 
+## [4.10.5]
+
+### Added
+
+- None
+
+### Changed
+
+- None
+
+### Fixed
+
+- None
+
+### Deleted
+
+- None
+
+## [4.10.4]
+
+### Added
+
+- None
+
+### Changed
+
+- Removed sslmanager key from the docker manager image. ([#2092](https://github.com/wazuh/wazuh-docker/pull/2092))
+- Backport 4.13.0 changes: Modify wazuh-keystore use ([#2036](https://github.com/wazuh/wazuh-docker/pull/2036)) \- (wazuh-keystore)
+
+### Fixed
+
+- Changed update_user function from wazuh.security to wazuh.rbac.orm module ([#2405](https://github.com/wazuh/wazuh-docker/pull/2405))
+- Add wazuh-template.json into permanent data exception ([#1967](https://github.com/wazuh/wazuh-docker/pull/1967))
+
+### Deleted
+
+- None
+
+## [4.10.3]
+
+### Added
+
+- None
+
+### Changed
+
+- None
+
+### Fixed
+
+- None
+
+### Deleted
+
+- None
+
+## [4.10.2]
+
+### Added
+
+- None
+
+### Changed
+
+- None
+
+### Fixed
+
+- Updated docker/login-action module ([#1837](https://github.com/wazuh/wazuh-docker/pull/1837))
+
+### Deleted
+
+- None
+
 ## [4.10.1]
 
 ### Added

VERSION.json

@@ -1,4 +1,4 @@
 {
     "version": "4.14.6",
-    "stage": "alpha0"
+    "stage": "rc2"
 }