Commit Graph
328 Commits
Author SHA1 Message Date
c-bordon 04f386e050 Merge 4.13.0 into 4.14.0 2025-06-05 16:09:20 -03:00
c-bordon beaf93d9ab Moved wazuh-agent.conf file 2025-06-05 15:55:38 -03:00
c-bordon 44aa64c81f Fixes some merge differences 2025-06-05 15:54:04 -03:00
c-bordon cfa6e9bf81 Merge 4.12.1 into 4.13.0 2025-06-05 15:52:11 -03:00
Gonzalo Acuña 3593e5ed8c Merge pull request #1844 from wazuh/merge-4.13.0-into-4.14.0
Merge 4.13.0 into 4.14.0
2025-05-27 15:22:18 -03:00
vcerenu 3b88bd9852 Resolving conflicts 2025-05-27 14:09:31 -03:00
vcerenu 54cbbf1485 Add docker compose v2 compatibility 2025-05-21 09:09:47 -03:00
Jesus Garcia 393956be6a Bump from 4.13.0 to 4.14.0 2025-05-19 12:37:09 -05:00
vcerenu 74c34e87b1 Migrate to Docker Compose v2 2025-05-16 09:25:36 -03:00
Gonzalo Acuña 033617591e Merge pull request #1816 from wazuh/enhancement/1792-add-wazuh-image-4.12.1
Add Wazuh agent image build and deploy
2025-05-12 13:39:20 -03:00
Victor Ereñú 6875c81bed Revert "Add Wazuh agent image build and deploy" 2025-05-13 01:04:03 +10:00
vcerenu ff94a0db26 Fix changelog, hostanem and agent version 2025-05-08 04:21:35 -03:00
vcerenu 7f51efa287 Add wazuh agent image build and deploy 2025-05-07 12:37:52 -03:00
vcerenu 81a41f93ed Bump 4.12.2 version 2025-05-06 13:56:32 -03:00
Jesus Garcia a371c28a05 Bump to 4.12.1 2025-04-09 10:24:24 -05:00
vcerenu 1186c6f9d6 Modify wazuh-keystore use 2025-03-11 15:31:31 -03:00
vcerenu 7f08f4cbff Modify wazuh-keystore use 2025-03-11 15:07:14 -03:00
vcerenu b2de3600ce Bump 4.13.0 version 2025-03-10 13:44:19 -03:00
Enrique Araque e60c07a18f Merge 4.11.1 into 4.12.0 2025-03-07 12:18:07 +01:00
Jesus Garcia fc8a8d6869 Bump 4.11.1-rc1 revision 2025-02-26 14:40:25 -05:00
vcerenu ebf8379373 Delete VERSION file reference 2025-02-17 14:44:43 -03:00
Carlos Anguita López 0adf702f70 support new wazuh version 4.11.1 2025-02-06 13:08:58 +01:00
Enrique Araque 31440d4a54 Merge branch '4.11.0' into merge-4.11.0-into-4.12.0 2025-01-17 11:35:45 +01:00
Enrique Araque d2bb16a493 Merge 4.10.2 into 4.11.0 2025-01-17 11:27:24 +01:00
vcerenu 347187c411 Add exceptions into PERMANENT_DATA script 2025-01-10 16:02:45 -03:00
vcerenu 39768a397a Bump 4.12.0 version 2024-12-20 10:45:08 -03:00
vcerenu 66a1533425 Bump 4.11.0 version 2024-12-20 10:40:22 -03:00
vcerenu 2c2388ce4a Bump 4.10.1 version 2024-12-20 10:14:29 -03:00
vcerenu ff54368593 Bump new version 2024-12-18 13:58:58 -03:00
Enrique Araque 0980cf0257 Merge branch '4.10.1' into merge-4.10.1-into-4.10.2 2024-12-13 13:31:28 +01:00
Enrique Araque 240f22b19c Merge 4.10.0 into 4.10.1 2024-12-13 13:19:45 +01:00
vcerenu 521711bf63 Add unset capabilities 2024-11-12 12:15:02 -03:00
vcerenu 369560f59f Fix permanent data scripts 2024-11-01 11:45:39 -03:00
vcerenu a5c313843e Resolve conflicts 2024-10-17 12:49:32 -03:00
vcerenu 42977e3131 Resolve conflicts 2024-10-17 12:33:13 -03:00
vcerenu 691694a38d Resolve conflicts 2024-10-17 12:22:38 -03:00
vcerenu 1aa149933b Fix typos 2024-10-10 11:09:09 -03:00
vcerenu 8695a087d5 Resolving merge conflicts 2024-10-10 08:05:07 -03:00
c-bordon e6c5e82a32 Bumped branch 4.10.2 to 4.10.2 version 2024-10-03 12:11:27 -03:00
Enrique Araque 92d0582201 Revert create_user.py script deletion 2024-10-03 13:18:25 +02:00
vcerenu 08ba82d16d Bump new Wazuh 4.10.1 version 2024-09-24 12:09:02 -03:00
David Correa Rodríguez 301ea9e21a Merge branch '4.8.2' into merge-4.8.2-into-4.9.0 2024-09-23 10:20:48 +02:00
JESUS D. GARCIA b38b3c7e59 * Update the Procedure push docker images workflow file
* Handle the build process exit code properly
2024-09-12 14:43:55 -05:00
vcerenu 8e7b2cd390 Add delete of wazuh yum repo 2024-09-05 15:19:32 -03:00
vcerenu 73fffcf52d Modify check repository for image builder 2024-09-05 13:12:47 -03:00
David Correa Rodríguez bbc4529088 Merge branch '4.9.1' into merge-4.9.1-into-4.10.0 2024-08-21 12:10:54 +02:00
David Correa Rodríguez f08c39ed6d Merge branch '4.9.0' into merge-4.9.0-into-4.9.1 2024-08-21 11:45:09 +02:00
vcerenu 6eb435a82f Add Azure wodle files to persistence excepction 2024-08-06 09:37:47 -03:00
vcerenu a063b27592 Fix Wazuh indexer and manager build error 2024-08-05 14:14:28 -03:00
vcerenu bc2a446c17 Fix Wazuh indexer and manager build error 2024-08-05 12:13:20 -03:00