Commit Graph

292 Commits

Author SHA1 Message Date
David Correa Rodríguez
1a1bc2d72b Merge branch 'master' into merge-4.10.0-into-master 2024-07-19 15:38:49 +02:00
Carlos Bordon
54b2d4ce33 Revert "Revert merges of 4.9.0 branch into master branch" 2024-07-19 10:34:13 -03:00
David Correa Rodríguez
096f0abb32 Merge branch '4.10.0' into merge-4.10.0-into-master 2024-07-19 13:19:41 +02:00
David Correa Rodríguez
719d4c2b05 Merge branch '4.9.0' into merge-4.9.0-into-4.10.0 2024-07-19 11:32:51 +02:00
David Correa Rodríguez
eded59bc25 Revert "Merge branch '4.9.0' into merge-4.9.0-into-master"
This reverts commit 4923750ea4, reversing
changes made to e1d70c35fe.
2024-07-19 09:27:46 +02:00
David Correa Rodríguez
4923750ea4 Merge branch '4.9.0' into merge-4.9.0-into-master 2024-07-18 14:48:50 +02: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
Carlos Anguita López
9c36a8a13b Removed references to modules because they are now enabled by default 2024-07-04 12:53:33 +02:00
vcerenu
2487a5481e Add new keystore generation 2024-07-02 15:01:37 -03:00
vcerenu
24f12a72d7 Modify Wazuh indexer and dashboard Dockerfles 2024-06-25 09:33:41 -03:00
vcerenu
8019e386bc Bump 4.10.0 version 2024-06-19 10:20:28 -03:00
vcerenu
450a59a7c8 Change the name dir to Wazuh cert tool Dockerfile 2024-06-10 07:11:20 -03:00
vcerenu
fc1ece705e Add the build of Wazuh cert tool image to build image process 2024-06-07 05:44:14 -03:00
Gonzalo Acuña
f8b2399347 Bump to 4.8.1 2024-06-04 11:43:03 -03:00
Gonzalo Acuña
937b5fad87 Merge pull request #1312 from wazuh/461-conf-files-environment
Add environment for configure wazuh indexer and dashboard files
2024-05-17 09:36:41 -03:00
Gonzalo Acuña
3d7c673671 Merge pull request #1327 from wazuh/merge-4.9.0-into-master
Merge 4.9.0 into master
2024-04-30 08:21:30 -03:00
vcerenu
390a71ebea resolving conflicts 2024-04-30 07:03:06 -03:00
vcerenu
10f278cadb add environment variables for configure wazuh indexer and dashboard files 2024-04-23 11:43:29 -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
Carlos Anguita López
f4ccd4b0a6 Removed commented lines 87 to 91 2024-04-09 09:26:47 +02:00
David Correa Rodríguez
f685bfaa9d Merge branch 'master' into merge-4.9.0-into-master 2024-04-01 11:26:05 +02:00
David Correa Rodríguez
dc13ef3f72 Merge branch '4.9.0' into merge-4.9.0-into-master 2024-04-01 11:11:14 +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
David Correa Rodríguez
4b98b24999 Merge branch '4.8.1' into merge-4.8.1-into-4.8.2 2024-04-01 10:48:42 +02:00
David Correa Rodríguez
97ba114f8e Merge branch '4.8.0' into merge-4.8.0-into-4.8.1 2024-04-01 10:06:22 +02:00
vcerenu
e03cfde3bc delete create_user.py script 2024-03-22 08:47:32 -03:00
David Correa Rodríguez
935aee6d2a Fixed references to 4.8 in master 2024-03-19 11:39:01 +01:00
David Correa Rodríguez
219843dbb8 Fixed references to 4.8 version 2024-03-19 11:32:06 +01: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
387727d496 rollback uid and gid for Wazuh indexer and dashboard owner 2024-03-11 10:05:53 -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
a826212051 add upgrade functions into entrypoints 2024-03-04 12:14:20 -03:00
vcerenu
6e7e8525bb modify uid and giufor indexer and dashboard user and file permissions 2024-03-04 07:51:00 -03:00
Gonzalo Acuña
799dadc1cf Merge pull request #1243 from wazuh/merge-4.9.0-into-master
Merge 4.9.0 into master
2024-03-01 15:55:14 -03:00
Gonzalo Acuña
8f3478361d Merge pull request #1242 from wazuh/merge-4.8.2-into-4.9.0
Merge 4.8.2 into 4.9.0
2024-03-01 15:41:47 -03:00
Gonzalo Acuña
6a242a36ce Merge pull request #1240 from wazuh/merge-4.8.1-into-4.8.2
Merge 4.8.1 into 4.8.2
2024-03-01 14:43:38 -03:00
David Correa Rodríguez
63217770f7 Merge branch '4.8.0' into merge-4.8.0-into-4.8.1 2024-03-01 12:32:27 +01: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