Commit Graph

2502 Commits

Author SHA1 Message Date
vcerenu
a1afcd2c40 Merge branch 'main' of github.com:wazuh/wazuh-docker into merge-4.14.0-into-main 2025-07-25 10:00:39 -03:00
Gonzalo Acuña
76e3c62b9a Merge pull request #1944 from wazuh/merge-4.13.1-into-4.14.0
Merge 4.13.1 into 4.14.0
2025-07-25 09:58:41 -03:00
vcerenu
5a1daaf4ce Merge branch '4.14.0' of github.com:wazuh/wazuh-docker into merge-4.13.1-into-4.14.0 2025-07-25 09:54:44 -03:00
Gonzalo Acuña
0222bcc9f8 Merge pull request #1943 from wazuh/merge-4.13.0-into-4.13.1
Merge 4.13.0 into 4.13.1
2025-07-25 09:48:04 -03:00
vcerenu
23e8982c45 Fix dev stage example 2025-07-25 09:44:43 -03:00
vcerenu
cb6c3de364 Fix dev stage example 2025-07-25 09:43:41 -03:00
vcerenu
89184e77ab Resolving conflicts 2025-07-25 09:27:03 -03:00
vcerenu
191ef58a9b Resolving conflicts 2025-07-25 09:22:48 -03:00
Carlos Bordon
ac7121e411 Merge pull request #1938 from wazuh/enhancement/1936-revert-image-tag
Revert rc2 stage into 4.13.0 branch
2025-07-18 10:15:52 -03:00
vcerenu
1146acb3a4 Revert rc2 stage into 4.13.0 branch 2025-07-18 10:03:11 -03:00
Wazuh CI
a8582fdd4b Merge pull request #1937 from wazuh/enhancement/wqa2817-bump-4.13.0
Bump 4.13.0 branch
2025-07-18 10:04:11 +02:00
wazuhci
7a13fa72b3 feat: bump 4.13.0 2025-07-18 08:04:06 +00:00
Carlos Anguita
dc74728c42 Merge pull request #1932 from wazuh/enhancement/1930-revert-image-tag-for-4.13.0rc1 2025-07-14 09:58:27 +02:00
Enrique Araque
7fdcb0a320 Change docker image tag for 4.13.0-rc1 2025-07-14 09:50:19 +02:00
Wazuh CI
5c99764d2c Merge pull request #1931 from wazuh/enhancement/wqa2745-bump-4.13.0
Bump 4.13.0 branch
2025-07-14 09:20:03 +02:00
wazuhci
28f7be1f7d feat: bump 4.13.0 2025-07-14 07:19:55 +00:00
Gonzalo Acuña
2d2d3ec7ca Merge pull request #1928 from wazuh/bug/1924-add-copy-indexer-files
Update Dockerfile to copy `opensearch-security` files
2025-07-11 12:55:26 -03:00
fcaffieri
9cc135d05b Update CHANGELOG 2025-07-08 17:30:26 -03:00
fcaffieri
60e43e2737 Update Dockerfile 2025-07-08 16:25:53 -03:00
Gonzalo Acuña
92bbd3395f Merge pull request #1926 from wazuh/bug/1920-set-right-permissions-for-malicious-ioc-list-files
Set right ownership for malicious-ioc files on container start
2025-07-04 15:36:35 -03:00
Jesus Garcia
49594251a6 Set right ownership for malicious-ioc files on container start 2025-07-04 12:52:29 -05:00
Gonzalo Acuña
8cb8437d7f Merge pull request #1925 from wazuh/enhancement/1922-delete-version-statement
Delete services statement in wazuh agent deployment
2025-07-04 13:42:13 -03:00
vcerenu
5bbce9e403 Change docker-compose references 2025-07-04 12:43:41 -03:00
vcerenu
8306a49967 Add Changelog 2025-07-04 12:04:31 -03:00
vcerenu
1ae575d56f Delete services statement in wazuh agent deployment 2025-07-04 11:49:37 -03:00
Carlos Anguita
fb65400657 Merge pull request #1919 from wazuh/enhancement/1917-remove-stage-from-tag 2025-07-02 12:05:20 +02:00
Enrique Araque
283ca123e3 Revert docker image for 4.13.0-beta1 2025-07-02 11:56:58 +02:00
Wazuh CI
16202f2f21 Merge pull request #1918 from wazuh/enhancement/wqa2654-bump-4.13.0
Bump 4.13.0 branch
2025-07-02 10:12:35 +02:00
wazuhci
b99d946282 feat: bump 4.13.0 2025-07-02 08:12:31 +00:00
Carlos Anguita
a809b4b60b Merge pull request #1903 from wazuh/merge-4.14.0-into-main 2025-06-27 12:34:13 +02:00
Gonzalo Acuña
a5eab952aa Merge pull request #1898 from wazuh/bug/1563-filebeatconf-file-is-not-updated-if-file-already-exists-in-etcfilebeatfilebeatyml
Add filebeat config file in the `PERMANENT_DATA_EXCP` list
2025-06-23 14:25:53 -03:00
Gonzalo Acuña
78948b164a Merge pull request #1899 from wazuh/enhancement/1891-opensearch-deprecated-settings
Fix Opensearch deprecated settings
2025-06-23 13:55:48 -03:00
fcaffieri
de11f97bf0 Update CHANGELOG 2025-06-23 13:41:56 -03:00
fcaffieri
f7cbdd4884 Update CHANGELOG 2025-06-23 13:33:22 -03:00
fcaffieri
184802c3b9 Fix Opensearch deprecated settings 2025-06-23 13:29:39 -03:00
Enrique Araque
a5d961040a Update changelog 2025-06-20 13:18:05 +02:00
Enrique Araque
bca60dd0b6 add filebeat config file in the exclusion path 2025-06-20 11:43:37 +02:00
Gonzalo Acuña
6bac41a05d Merge pull request #1895 from wazuh/enhancement/1892-bumper-main
Bumper propagation to main
2025-06-19 11:44:56 -03:00
Gonzalo Acuña
1bfc4ff4c2 Merge pull request #1894 from wazuh/enhancement/1892-bumper-4.14.0
Bumper propagation to 4.14.0
2025-06-19 11:42:05 -03:00
Gonzalo Acuña
f5473f0004 Merge pull request #1893 from wazuh/enhancement/1892-bumper
Enhancement/1892 bumper
2025-06-19 11:35:49 -03:00
Gonzalo Acuña
1b75ebb67a Merge pull request #1890 from wazuh/enhancement/1882-add-pd-excp
Add permanent_data exceptions
2025-06-17 15:34:33 -03:00
vcerenu
bbe5b5eb09 Add changelog 2025-06-17 15:05:52 -03:00
Carlos Bordon
4a9176b71e Merge pull request #1889 from wazuh/bug/wqa2229-add-admin-privilege-bumper
Added an admin flag to the repository bumper workflow merge action
2025-06-13 11:00:31 -03:00
Raul Del Pozo Moreno
056300b59d fix: added admin privilege to PR merge 2025-06-13 15:38:46 +02:00
Carlos Bordon
a3479b0035 Merge pull request #1888 from wazuh/merge-4.14.0-into-main
Merge 4.14.0 into main
2025-06-13 10:04:25 -03:00
Carlos Anguita López
f57f0b33f2 Merge branch '4.14.0' into merge-4.14.0-into-main 2025-06-13 14:59:48 +02:00
Carlos Bordon
ba4e72a2e0 Merge pull request #1887 from wazuh/merge-4.13.1-into-4.14.0
Merge 4.13.1 into 4.14.0
2025-06-13 09:57:17 -03:00
Carlos Anguita López
b374f4ba2e merge 4.13.1 into 4.14.0 2025-06-13 14:52:26 +02:00
vcerenu
126fc81200 Add permanent_data exceptions 2025-06-13 09:22:56 -03:00
Gonzalo Acuña
e211c97f59 Merge pull request #1884 from wazuh/enhancement/1883-bump-4.13.1-version
Bump 4.13.1 version
2025-06-13 08:32:12 -03:00