From 126fc81200d4c5f82709fc576f51a83180262a8c Mon Sep 17 00:00:00 2001 From: vcerenu Date: Fri, 13 Jun 2025 09:22:56 -0300 Subject: [PATCH 1/3] Add permanent_data exceptions --- build-docker-images/wazuh-manager/config/permanent_data.env | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-docker-images/wazuh-manager/config/permanent_data.env b/build-docker-images/wazuh-manager/config/permanent_data.env index 555a3145..33f1b92c 100644 --- a/build-docker-images/wazuh-manager/config/permanent_data.env +++ b/build-docker-images/wazuh-manager/config/permanent_data.env @@ -97,6 +97,9 @@ 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 From 056300b59d54133b77bbab5d3df6c56563ac979f Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno <14913942+rauldpm@users.noreply.github.com> Date: Fri, 13 Jun 2025 15:38:46 +0200 Subject: [PATCH 2/3] fix: added admin privilege to PR merge --- .github/workflows/4_bumper_repository.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/4_bumper_repository.yml b/.github/workflows/4_bumper_repository.yml index 2016a55d..aed9b1b7 100644 --- a/.github/workflows/4_bumper_repository.yml +++ b/.github/workflows/4_bumper_repository.yml @@ -131,7 +131,7 @@ jobs: - name: Merge pull request run: | # Any checks for the PR are bypassed since the branch is expected to be functional (i.e. the bump process does not introduce any bugs) - gh pr merge "${{ steps.create_pr.outputs.pull_request_url }}" --merge + gh pr merge "${{ steps.create_pr.outputs.pull_request_url }}" --merge --admin - name: Show logs run: | From bbe5b5eb095dfdf2983d7f85e5b6bd4dad806581 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Tue, 17 Jun 2025 15:05:52 -0300 Subject: [PATCH 3/3] Add changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d516090..5987c60b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file. ### Added +- 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)) - Added repository_bumper script. ([#1781](https://github.com/wazuh/wazuh-docker/pull/1781))