Commit Graph
102 Commits
Author SHA1 Message Date
vcerenu 69df531ca9 Resolve conflicts 2024-10-17 13:04:31 -03:00
David Correa Rodríguez 301ea9e21a Merge branch '4.8.2' into merge-4.8.2-into-4.9.0 2024-09-23 10:20:48 +02:00
vcerenu 73fffcf52d Modify check repository for image builder 2024-09-05 13:12:47 -03:00
David Correa Rodríguez d5a60b7264 Merge branch '4.10.0' into merge-4.10.0-into-master 2024-08-21 12:30:00 +02:00
David Correa Rodríguez bbc4529088 Merge branch '4.9.1' into merge-4.9.1-into-4.10.0 2024-08-21 12:10:54 +02:00
vcerenu 2ee7cfa515 Add eazuh.yml file in the Wazuh dashboard image build process 2024-07-19 12:25:09 -03:00
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
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 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
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
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 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 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
vcerenu 387727d496 rollback uid and gid for Wazuh indexer and dashboard owner 2024-03-11 10:05:53 -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
vcerenu 992fa82f6d update base and fix wazuh manager build 2024-02-29 11:11:59 -03:00
David Correa Rodríguez 98037bf25c Commands and dependencies adapted 2024-02-20 10:33:29 +01:00
David Correa Rodríguez 94c6a1b446 Merge branch '4.7.1' into merge-4.7.1-into-4.8.0 2023-11-27 17:03:09 +01:00
c-bordon 423fc248ef Removed report dependencies from Wazuh dashboard image 2023-11-21 15:05:17 -03:00
David Correa Rodríguez 37d38ecf92 Fixed identation 2023-11-16 15:59:44 +01:00
David Correa Rodríguez 573090edcb Added variables in validations for different repositories 2023-11-16 15:54:25 +01:00
David Correa Rodríguez c38a25224c Adapted docker build to multiple Wazuh Dashboards plugins 2023-11-16 13:52:41 +01:00
Carlos Bordon 4863d54c99 Merge pull request #1092 from wazuh/merge-4.7.1-into-4.8.0
Merge 4.7.1 into 4.8.0
2023-10-31 13:52:40 -03:00
rafabailon d352019385 Rename Kibana as Dashboard 2023-10-31 10:09:45 +01:00
David Correa Rodríguez f1140fc088 Updated wazuh-kibana-app references 2023-10-25 15:56:11 +02:00
Gonzalo Acuña 4c2582952f Dashboard default route update 2023-10-23 13:28:22 -03:00
David Correa Rodríguez 6b89644918 Merge branch '4.7.1' into merge-4.7.1-into-master 2023-10-09 11:07:47 +02:00
David Correa Rodríguez 14dcc8b6a6 Merge 4.6.0 into 4.7.0 2023-10-09 09:41:25 +02:00
c-bordon b22fa235c7 Updated build image script 2023-10-03 15:52:25 -03:00
David Correa Rodríguez d8f7fd6767 Merge remote-tracking branch 'origin/4.7.1' into merge-4.7.1-into-master 2023-09-22 12:47:11 +02:00
David Correa Rodríguez 7312f86235 Merge remote-tracking branch 'origin/4.6.0' into merge-4.6.0-into-4.7.0 2023-09-22 12:07:13 +02:00
David Correa Rodríguez 62627e32fd Merge remote-tracking branch 'origin/4.5.3' into merge-4.5.3-into-4.6.0 2023-09-22 11:11:45 +02:00
vcerenu 2ac53b9b3d add custom directory and persistence 2023-09-15 12:41:05 -03:00
vcerenu 63817dfd55 add extensions for wazuh.yml 2023-09-07 12:15:25 -03:00
vcerenu d0eaae482c modify base for Wazuh Docker images 2023-08-11 12:15:28 -03:00
vcerenu 919500bd74 bump master to 4.8.0 2023-07-14 16:22:52 -03:00