Commit Graph

1835 Commits

Author SHA1 Message Date
Gonzalo Acuña
654d1dbf36 Merge pull request #1268 from wazuh/bug/1193-review-version-references-in-the-master-branch
Fixed references to 4.8 version
2024-03-20 12:58:19 -03:00
David Correa Rodríguez
219843dbb8 Fixed references to 4.8 version 2024-03-19 11:32:06 +01:00
Gonzalo Acuña
92eef99c13 Merge pull request #1250 from wazuh/merge-4.8.2-into-4.9.0
Merge 4.8.2 into 4.9.0
2024-03-04 13:42:59 -03:00
David Correa Rodríguez
f5b237458a Merge branch '4.8.2' into merge-4.8.2-into-4.9.0 2024-03-04 17:39:42 +01:00
Gonzalo Acuña
04c64e78bc Merge pull request #1249 from wazuh/merge-4.8.1-into-4.8.2
Merge 4.8.1 into 4.8.2
2024-03-04 13:38:09 -03:00
David Correa Rodríguez
8d9d04adc5 Merge branch '4.8.1' into merge-4.8.1-into-4.8.2 2024-03-04 17:31:52 +01:00
Gonzalo Acuña
1e8db5cfbd Merge pull request #1248 from wazuh/merge-4.8.0-into-4.8.1
Merge 4.8.0 into 4.8.1
2024-03-04 13:28:41 -03:00
David Correa Rodríguez
59e0ec54bd Merge branch '4.8.0' into merge-4.8.0-into-4.8.1 2024-03-04 17:10:56 +01: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
Gonzalo Acuña
1564b2d4cd Merge pull request #1241 from wazuh/fix-readme
Fix readme 4.7.3
2024-03-01 14:30:42 -03:00
Gonzalo Acuña
96048c7bf3 Fix readme 4.7.3 2024-03-01 14:25:28 -03:00
Gonzalo Acuña
401673e743 Merge pull request #1239 from wazuh/1237-bump-revision
Bump revision `4.8.0-beta3`
2024-03-01 10:20:26 -03:00
Gonzalo Acuña
d8780f0e37 Revision bump (4.8.0-beta3) 2024-03-01 10:14:50 -03:00
Gonzalo Acuña
520291162f Merge pull request #1238 from wazuh/merge-4.8.0-into-4.8.1
Merge 4.8.0 into 4.8.1
2024-03-01 08:42:44 -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
Gonzalo Acuña
8c44d566df Merge pull request #1236 from wazuh/merge-4.7.3-into-4.8.0
Merge 4.7.3 into 4.8.0
2024-03-01 08:23:28 -03:00
David Correa Rodríguez
d0b02cf15c Merge branch '4.7.3' into merge-4.7.3-into-4.8.0 2024-03-01 12:14:19 +01:00
Gonzalo Acuña
b274806f60 Merge pull request #1234 from wazuh/596-filebeat-fix
Modify Dockerfile for Pod restart in Kubernetes
2024-02-29 13:43:27 -03:00
vcerenu
2e8c7f99b5 fix goss test 2024-02-29 13:03:50 -03:00
vcerenu
992fa82f6d update base and fix wazuh manager build 2024-02-29 11:11:59 -03:00
David Correa Rodríguez
c88172dc56 Merge pull request #1233 from wazuh/bump-revision-40713
Bump revision to 40713
v4.7.3
2024-02-29 11:09:37 +01:00
David Correa Rodríguez
3f8444a71e Bump revision to 40713 2024-02-29 10:47:34 +01:00
Gonzalo Acuña
0de952d1b3 Merge pull request #1230 from wazuh/bump-revision
Bump revision to 40804
2024-02-23 11:58:04 -03:00
David Correa Rodríguez
8a574da9ec Bump revision to 40804 2024-02-23 15:50:57 +01:00
David Correa Rodríguez
6b35c9d4bc Merge pull request #1226 from wazuh/merge-4.7.3-into-4.8.0
Merge 4.7.3 into 4.8.0
2024-02-23 10:58:28 +01:00
David Correa Rodríguez
f7e7a5a5fb Added 4.7.3 to CHANGELOG.md 2024-02-23 10:41:54 +01:00
David Correa Rodríguez
7835e6a678 Merge branch '4.7.3' into merge-4.7.3-into-4.8.0 2024-02-23 10:41:17 +01:00
Gonzalo Acuña
23900dbcc1 Merge pull request #1224 from wazuh/change/1210-change-the-base-image-to-amazon-linux-2023
Changed the base image to Amazon Linux 2023
2024-02-22 16:12:48 -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
Gonzalo Acuña
1046a3a13e Merge pull request #1223 from wazuh/1216-aws-data-excp
Review Wazuh docker permanent data exceptions for the AWS wodle
2024-02-22 13:21:51 -03: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
Gonzalo Acuña
d538e47eef Merge pull request #1217 from wazuh/770-add-maltiverse-except
Add maltiverse files into permanent exceptions
2024-02-21 13:45:51 -03: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
Gonzalo Acuña
1b3251852c Merge pull request #1215 from wazuh/1214-rollback-ism-changes
Rollback ISM changes
2024-02-20 14:49:57 -03:00
David Correa Rodríguez
4ba6e124b1 Updated dependencies 2024-02-20 17:37:40 +01:00
vcerenu
33a55344d3 rollback ISM 2024-02-20 12:01:22 -03:00
David Correa Rodríguez
a4a9207dec Added findutils dependency to indexer 2024-02-20 12:23:41 +01:00
David Correa Rodríguez
98037bf25c Commands and dependencies adapted 2024-02-20 10:33:29 +01:00
Gonzalo Acuña
7f09331a95 Merge pull request #1213 from wazuh/bump-revision
Bump 4.7.3 version
2024-02-19 10:48:34 -03: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
5a5fbdd62c bump 4.7.3 version 2024-02-19 06:02:47 -03:00
vcerenu
d6cefe7288 add filebeat parameters for inyect template 2024-02-14 11:52:50 -03:00
Gonzalo Acuña
0296f59f8c Merge pull request #1208 from wazuh/1198-reduce-sizze-of-wazuh-manager
Merge layers into Wazuh manager Dockerfile
2024-02-14 08:28:09 -03:00
vcerenu
057752d7bc merge layers into Wazuh manager Dockerfile 2024-02-14 07:06:40 -03:00
Gonzalo Acuña
91a56eb429 Merge pull request #1204 from wazuh/merge-4.8.2-into-master
Merge `4.8.2` into `master`
2024-02-07 13:52:49 -03:00
Gonzalo Acuña
c99985f479 Merge pull request #1203 from wazuh/merge-4.8.1-into-4.8.2
Merge `4.8.1` into `4.8.2`
2024-02-07 13:46:23 -03:00