358 Commits

Author	SHA1	Message	Date
vcerenu	cb6fa28bbc	Wazuh server clean-up	2025-10-01 13:30:25 -03:00
vcerenu	0989e11d43	Resolving conflicts	2025-08-14 09:00:41 -03:00
vcerenu	6c87ecf7f0	Resolving conflicts	2025-08-14 08:56:57 -03:00
vcerenu	54fe999414	Merge branch '4.14.1' of github.com:wazuh/wazuh-docker into 4.14.0	2025-08-14 08:22:00 -03:00
vcerenu	7bc871bde9	Resolving conflicts	2025-08-14 08:09:22 -03:00
vcerenu	14caf8058d	Add wazuh-template.json into permanent data exception	2025-08-13 08:29:40 -03:00
vcerenu	fb5b4488de	Revert version	2025-08-07 08:38:27 -03:00
vcerenu	29190cce99	Delete Dcokerfile line	2025-08-05 12:50:34 -03:00
vcerenu	85709013bc	Fix config directory for opensearch_security plugin work	2025-08-01 12:44:43 -03:00
wazuhci	846ae52263	feat: bump 4.14.1	2025-07-29 16:11:09 +00:00
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
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
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	191ef58a9b	Resolving conflicts	2025-07-25 09:22:48 -03:00
wazuhci	7a13fa72b3	feat: bump 4.13.0	2025-07-18 08:04:06 +00:00
wazuhci	28f7be1f7d	feat: bump 4.13.0	2025-07-14 07:19:55 +00:00
fcaffieri	60e43e2737	Update Dockerfile	2025-07-08 16:25:53 -03:00
Jesus Garcia	49594251a6	Set right ownership for malicious-ioc files on container start	2025-07-04 12:52:29 -05:00
Carlos Anguita	a809b4b60b	Merge pull request #1903 from wazuh/merge-4.14.0-into-main	2025-06-27 12:34:13 +02:00
fcaffieri	184802c3b9	Fix Opensearch deprecated settings	2025-06-23 13:29:39 -03: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
vcerenu	126fc81200	Add permanent_data exceptions	2025-06-13 09:22:56 -03:00
vcerenu	fb4a062f5a	Bump 4.13.1 version	2025-06-13 08:26:34 -03:00
c-bordon	c111f8497e	Merge 4.14.0 into main	2025-06-05 16:17:18 -03:00
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
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
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
vcerenu	02de528417	Bump 5.0.0 version	2025-05-13 14:54:48 -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