diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index a0562c6f..2e28062c 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -155,9 +155,6 @@ jobs: with: ref: ${{ inputs.docker_reference }} - - name: free disk space - uses: ./.github/free-disk-space - - name: Set up QEMU uses: docker/setup-qemu-action@v4 @@ -176,7 +173,6 @@ jobs: 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 }} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index db2506c4..156323c6 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -139,17 +139,6 @@ 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: | 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`" @@ -203,6 +192,17 @@ 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 @@ -223,9 +223,6 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} - - name: free disk space - uses: ./.github/free-disk-space - - name: Retrieve saved Wazuh dashboard Docker image uses: actions/download-artifact@v8 with: @@ -295,23 +292,6 @@ 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: | qty_templates="`curl -XGET "https://0.0.0.0:9200/_cat/templates" -u admin:SecretPassword -k -s | grep "wazuh" | wc -l`" @@ -372,5 +352,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