Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 4.11.0 into 4.12.0 #1696

Merged
merged 11 commits into from
Jan 17, 2025
Merged

Merge 4.11.0 into 4.12.0 #1696

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
347187c
Add exceptions into PERMANENT_DATA script
vcerenu Jan 10, 2025
633c50b
Merge pull request #1674 from wazuh/bug/1673-add-permanent_data_excps
teddytpc1 Jan 13, 2025
845f7e5
Bump revision for 4.10.1-rc1
Enaraque Jan 15, 2025
5b3f461
Merge pull request #1679 from wazuh/enhancement/1678-bump-revision-to…
CarlosALgit Jan 15, 2025
1ee604e
Change docker image for 4.10.1-rc1
Enaraque Jan 15, 2025
69b4169
Merge pull request #1680 from wazuh/enhancement/1678-change-docker-image
CarlosALgit Jan 15, 2025
c548f3e
Revert docker image for 4.10.1-rc1
Enaraque Jan 15, 2025
a0c1fd8
Merge pull request #1681 from wazuh/enhancement/1678-revert-docker-image
Enaraque Jan 15, 2025
d2bb16a
Merge 4.10.2 into 4.11.0
Enaraque Jan 17, 2025
06e2597
Merge pull request #1695 from wazuh/merge-4.10.2-into-4.11.0
Enaraque Jan 17, 2025
31440d4
Merge branch '4.11.0' into merge-4.11.0-into-4.12.0
Enaraque Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions build-docker-images/wazuh-manager/config/permanent_data.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,21 @@ 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"
export PERMANENT_DATA_EXCP

# Files mounted in a volume that should be deleted
Expand Down
Loading