138 Commits

Author	SHA1	Message	Date
vcerenu	6c87ecf7f0	Resolving conflicts	2025-08-14 08:56:57 -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	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
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
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
vcerenu	126fc81200	Add permanent_data exceptions	2025-06-13 09:22:56 -03:00
vcerenu	02de528417	Bump 5.0.0 version	2025-05-13 14:54:48 -03: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
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
vcerenu	347187c411	Add exceptions into PERMANENT_DATA script	2025-01-10 16:02:45 -03:00
vcerenu	369560f59f	Fix permanent data scripts	2024-11-01 11:45:39 -03:00
vcerenu	1aa149933b	Fix typos	2024-10-10 11:09:09 -03:00
Enrique Araque	92d0582201	Revert create_user.py script deletion	2024-10-03 13:18:25 +02: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
vcerenu	6eb435a82f	Add Azure wodle files to persistence excepction	2024-08-06 09:37:47 -03:00
vcerenu	bc2a446c17	Fix Wazuh indexer and manager build error	2024-08-05 12:13:20 -03:00
David Correa Rodríguez	0a440c0433	Removed whitespaces	2024-07-18 14:34:12 +02:00
David Correa Rodríguez	311ffc72d8	Merge branch '4.8.1' into merge-4.8.1-into-4.9.0	2024-07-18 14:28:33 +02:00
Victor Ereñú	b60e875962	Revert "Add new keystore certificate"	2024-07-11 23:01:18 +10:00
vcerenu	a275a08cfe	Upward merge	2024-07-08 11:54:01 -03:00
vcerenu	2487a5481e	Add new keystore generation	2024-07-02 15:01:37 -03:00
vcerenu	390a71ebea	resolving conflicts	2024-04-30 07:03:06 -03:00
Carlos Anguita López	92d6f87091	Changed Docker base image ocurrences from amazonlinux:2023.3.20240304.0 to amazonlinux:2023	2024-04-10 13:18:01 +02:00
David Correa Rodríguez	b13aef91d1	Merge branch '4.8.2' into merge-4.8.2-into-4.9.0	2024-04-01 10:58:25 +02:00
vcerenu	e03cfde3bc	delete create_user.py script	2024-03-22 08:47:32 -03:00
vcerenu	02ee94f312	update al2024 version	2024-03-13 11:58:52 -03:00
Gonzalo Acuña	51e17d2dac	Merge pull request #1247 from wazuh/1220-modify-uid ... Modify uid and gid	2024-03-11 11:26:11 -03:00
vcerenu	73650d79b3	add exceptions	2024-03-06 06:24:26 -03:00
vcerenu	b4af946000	delete chmod for upgrade	2024-03-05 11:41:43 -03:00
vcerenu	992fa82f6d	update base and fix wazuh manager build	2024-02-29 11:11:59 -03:00
David Correa Rodríguez	0bb7a00125	Merge branch '4.8.0' into change/1210-change-the-base-image-to-amazon-linux-2023	2024-02-22 17:58:40 +01:00
David Correa Rodríguez	467a405754	Upgraded ownership files for Wazuh files	2024-02-22 17:51:47 +01:00
vcerenu	6fef542ee2	add aws wodle files for permanent data excp	2024-02-22 10:12:02 -03:00
David Correa Rodríguez	55f9fe3ded	Added procps to Manager dockerfile	2024-02-21 17:51:36 +01:00
vcerenu	0d628f20cc	move pagerduty exception	2024-02-21 11:57:29 -03:00
vcerenu	53b9d71c23	add maltiverse files into permanent exceptions	2024-02-21 11:43:23 -03:00
David Correa Rodríguez	4ba6e124b1	Updated dependencies	2024-02-20 17:37:40 +01:00
David Correa Rodríguez	98037bf25c	Commands and dependencies adapted	2024-02-20 10:33:29 +01:00
Gonzalo Acuña	ec9076261f	Merge pull request #1209 from wazuh/21806-dashboard-does-not-displays-alerts-while-alertlog-file-does-in-docker-deployments ... Add filebeat parameters to inject wazuh template	2024-02-19 09:16:19 -03:00
vcerenu	d6cefe7288	add filebeat parameters for inyect template	2024-02-14 11:52:50 -03:00
vcerenu	057752d7bc	merge layers into Wazuh manager Dockerfile	2024-02-14 07:06:40 -03:00
Gonzalo Acuña	ec63264545	Changed user for username in the wazuh-keystore command	2024-01-31 09:23:50 -03:00
Gonzalo Acuña	114d6edff2	Indexer tag and wazuh-keystore updates	2024-01-29 15:48:48 -03:00
vcerenu	adba797c54	add xz-utils install	2024-01-16 12:40:17 -03:00