Commit Graph

2405 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
vcerenu
74c34e87b1 Migrate to Docker Compose v2 2025-05-16 09:25:36 -03:00
vcerenu
f3a74ffff7 Add changelog 2025-05-14 16:10:58 -03:00
vcerenu
027ebadd6e Change directory structure 2025-05-14 16:03:50 -03:00
vcerenu
4bb6cc9a29 Change deploy process 2025-05-14 15:44:12 -03:00
vcerenu
16c6984a8a Add upgrade process 2025-05-14 14:52:21 -03:00
vcerenu
3a69f6aabc Add build and deploy doc 2025-05-14 14:04:44 -03:00
vcerenu
ce480d5c75 Add mdbook documentation 2025-05-13 16:43:59 -03:00
Gonzalo Acuña
81eca8872f Merge pull request #1817 from wazuh/enhancement/1794-add-wazuh-agent-test-and-push
Add wazuh agent test and push
2025-05-12 14:04:47 -03:00
Gonzalo Acuña
f31a80c579 Merge branch '4.12.2' into enhancement/1794-add-wazuh-agent-test-and-push 2025-05-12 14:04:02 -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
vcerenu
4348acbb83 Modify PR number 2025-05-12 12:47:10 -03:00
vcerenu
5e5ea10655 Modify PR number 2025-05-12 12:43:28 -03:00
Gonzalo Acuña
57810d387d Merge pull request #1815 from wazuh/revert-1801-enhancement/1792-add-wazuh-image-4.12.1
Revert "Add Wazuh agent image build and deploy"
2025-05-12 12:08:22 -03:00
Victor Ereñú
6875c81bed Revert "Add Wazuh agent image build and deploy" 2025-05-13 01:04:03 +10:00
Gonzalo Acuña
dd9ebdcba6 Merge pull request #1814 from wazuh/revert-1809-enhancement/1794-add-wazuh-agent-test-and-push
Revert "Add wazuh agent test and push"
2025-05-12 12:03:41 -03:00
Victor Ereñú
2efaf8c8d6 Revert "Add wazuh agent test and push" 2025-05-13 01:01:03 +10:00
Gonzalo Acuña
4a7fb3c095 Merge pull request #1809 from wazuh/enhancement/1794-add-wazuh-agent-test-and-push
Add wazuh agent test and push
2025-05-12 10:56:41 -03:00