Commit Graph
2424 Commits
Author SHA1 Message Date
Gonzalo Acuña 99a703136d Merge pull request #1868 from wazuh/merge-4.14.0-into-main
Merge 4.14.0 into main
2025-06-05 16:18:46 -03:00
c-bordon c111f8497e Merge 4.14.0 into main 2025-06-05 16:17:18 -03:00
Gonzalo Acuña 52570181ba Merge pull request #1867 from wazuh/merge-4.13.0-into-4.14.0
Merge 4.13.0 into 4.14.0
2025-06-05 16:11:45 -03:00
c-bordon 04f386e050 Merge 4.13.0 into 4.14.0 2025-06-05 16:09:20 -03:00
Gonzalo Acuña 472b990514 Merge pull request #1866 from wazuh/merge-4.12.1-into-4.13.0
Merge 4.12.1 into 4.13.0
2025-06-05 16:03:49 -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 43b129c857 Merge pull request #1857 from wazuh/enhancement/2385-bump-5.0.0-technical-documentation
Bump 5.0.0 technical documentation
2025-05-30 11:21:43 -03:00
vcerenu f1a3a48c1a Bump 5.0.0 technical documentation 2025-05-30 11:18:10 -03:00
Gonzalo Acuña 18ee73b015 Merge pull request #1856 from wazuh/enhancement/1854-revert-image-tag
Revert image tag
2025-05-30 11:05:02 -03:00
vcerenu 0cf60da585 Revert image tag 2025-05-30 10:53:10 -03:00
Gonzalo Acuña 90411d071e Merge pull request #1855 from wazuh/enhancement/1854-bump-revision-and-image-tag
Bump revision and image tag for rc1 stage
2025-05-30 10:46:11 -03:00
vcerenu b23ae2f4cc Bump revision and image tag for rc1 stage 2025-05-30 10:33:50 -03:00
Gonzalo Acuña 90eb7a5af8 Merge pull request #1853 from wazuh/enhancement/2385-bump-4.14.0-technical-documentation
Bump 4.14.0 technical documentation
2025-05-30 10:10:33 -03:00
vcerenu aa46ce2079 Bump 4.14.0 technical documentation 2025-05-30 10:05:47 -03:00
Gonzalo Acuña e83310dd23 Merge pull request #1852 from wazuh/enhancement/2385-bump-4.13.0-technical-documentation
Bump 4.13.0 technical documentation
2025-05-30 09:51:02 -03:00
vcerenu 7ae4167223 Bump wazuh agent 2025-05-30 09:47:37 -03:00
vcerenu c32fa133e3 Bump 4.13.0 technical documentation 2025-05-30 09:36:37 -03:00
Carlos Bordon 3717c6cfe2 Merge pull request #1850 from wazuh/enhancement/remove-4.12.2-entries-from-main-branch
Remove 4.12.2 references from 4.14.0 branch
2025-05-29 09:32:14 -03:00
fcaffieri cd69030b16 Remove 4.12.2 references from 4.14.0 branch 2025-05-29 09:30:11 -03:00
Carlos Bordon 947f87b9ad Merge pull request #1849 from wazuh/enhancement/remove-4.12.2-entries-from-4.14.0-branch
Remove 4.12.2 references from 4.14.0 branch
2025-05-29 09:29:56 -03:00
Carlos Bordon b5f61d37fa Merge pull request #1848 from wazuh/enhacement/remove-4.12.2-entries-from-4.13.0-branch
Remove 4.12.2 references from 4.13.0 branch
2025-05-29 09:28:46 -03:00
fcaffieri b326241400 Remove 4.12.2 references from 4.14.0 branch 2025-05-29 09:28:09 -03:00
fcaffieri 08bc37198f Remove 4.12.2 references from 4.13.0 branch 2025-05-29 09:25:52 -03:00
fcaffieri d13127b5de Remove 4.12.2 references from 4.13.0 branch 2025-05-29 09:23:59 -03:00
fcaffieri c4f225cb1b Remove 4.12.2 references from 4.13.0 branch 2025-05-29 09:22:27 -03:00
Gonzalo Acuña 662d5aaa70 Merge pull request #1845 from wazuh/merge-4.14.0-into-main
Merge 4.14.0 into main
2025-05-27 15:37:49 -03:00
vcerenu c6327ac7a2 Resolving conflicts 2025-05-27 15:30:26 -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
Gonzalo Acuña 60d1de2c30 Merge pull request #1843 from wazuh/merge-4.12.2-into-4.13.0
Merge 4.12.2 into 4.13.0
2025-05-27 14:23:14 -03:00
vcerenu 3b88bd9852 Resolving conflicts 2025-05-27 14:09:31 -03:00
Gonzalo Acuña 35d7b63a18 Merge pull request #1828 from wazuh/enhancement/1805-migrate-docker-compose-v2
Fix Warning message when migrating Docker compose v2
2025-05-26 16:01:54 -03:00
Gonzalo Acuña 3613aae2ef Merge branch '4.12.2' into enhancement/1805-migrate-docker-compose-v2 2025-05-26 16:01:36 -03:00
Gonzalo Acuña aac480eeac Merge pull request #1822 from wazuh/enhancement/1808-add-mdbook-documentation
Add technical documentation
2025-05-21 14:07:14 -03:00
vcerenu b30ac0a2b6 Add wazuh agent description into README.md file 2025-05-21 10:59:50 -03:00
vcerenu 2b61eeb74c Add wazuh agent description into README.md file 2025-05-21 09:17:34 -03:00
vcerenu 54cbbf1485 Add docker compose v2 compatibility 2025-05-21 09:09:47 -03:00
vcerenu 0041c25218 Add changelog 2025-05-21 09:05:55 -03:00
vcerenu 90cc26f037 Modify FILEBEAT_STATUS test 2025-05-20 14:52:12 -03:00
vcerenu a1514129ff Change filebeat output test for multi node test 2025-05-20 14:36:55 -03:00
vcerenu 91a2566aa2 Change grep filter 2025-05-20 14:22:44 -03:00
vcerenu 3cdebd4275 Change filebeat output test for single node test 2025-05-20 10:15:24 -03:00
vcerenu 6bc6569dc1 Add env vars, tests and upgrade doc 2025-05-19 16:08:01 -03:00
Carlos Bordon e32f46a6d1 Merge pull request #1832 from wazuh/1831/bump-to-4.14.0
Bump to 4.14.0
2025-05-19 14:39:07 -03:00
Jesus Garcia 393956be6a Bump from 4.13.0 to 4.14.0 2025-05-19 12:37:09 -05:00
vcerenu ed4674215e Add reference documentation 2025-05-16 14:12:54 -03:00
vcerenu 1eae96ee4d Add reference documentation 2025-05-16 14:09:15 -03:00
vcerenu b120eff771 Add reference documentation 2025-05-16 14:02:00 -03:00
vcerenu 6861e077b6 Migrate to Docker Compose v2 2025-05-16 09:32:21 -03:00