Commit Graph

2560 Commits

Author SHA1 Message Date
David Correa Rodríguez
7422e5790a
Merge branch '4.7.3' into merge-4.7.3-into-4.8.0 2024-02-23 10:55:37 +01:00
Gonzalo Acuña
e129cedf17
Merge pull request #1216 from wazuh/1213-rollback-ism-changes
ISM changes rollback
2024-02-22 09:55:45 -03:00
Gonzalo Acuña
4c36c1de8b
ISM changes rollback 2024-02-20 16:05:25 -03:00
Gonzalo Acuña
4c8d8e7d71
Merge pull request #1212 from wazuh/bump-revision
Bump 4.7.3 version
2024-02-19 10:48:04 -03:00
vcerenu
8660b5b1ca
bump 4.7.3 version 2024-02-19 05:34:37 -03:00
David Correa Rodríguez
165ea64dd2
Merge pull request #1209 from wazuh/bump-5.0.0
Bump version to 5.0.0
2024-02-13 10:33:22 +01:00
David Correa Rodríguez
16ea37e738
Bump version to 5.0.0 2024-02-13 10:27:59 +01:00
Gonzalo Acuña
a8734c8bbb
Merge pull request #1207 from wazuh/merge-4.8.2-into-master
Merge `4.8.2` into `master`
2024-02-07 13:12:09 -03:00
Gonzalo Acuña
33b036c90b
Merge pull request #1206 from wazuh/merge-4.8.1-into-4.8.2
Merge `4.8.1` into `4.8.2`
2024-02-07 13:04:05 -03:00
Gonzalo Acuña
8d56653637
Merge pull request #1205 from wazuh/merge-4.8.0-into-4.8.1
Merge 4.8.0 into 4.8.1
2024-02-07 12:17:04 -03:00
Gonzalo Acuña
40b2f0dc23
Merge branch '4.8.1' into merge-4.8.0-into-4.8.1 2024-02-07 12:15:33 -03:00
David Correa Rodríguez
daa512c6e2
Merge pull request #1203 from wazuh/1202-support-new-stage-beta-1-for-480-in-wazuh-ansible-repository 2024-02-05 09:01:19 +01:00
vcerenu
21bfbac8cd
bump revision 2024-02-05 04:58:29 -03:00
Gonzalo Acuña
0d30c50b80
Merge pull request #1198 from wazuh/enhancement/wa-1479-indexer-cluster-initialization-and-ism-execution-should-be-executed-once-in-demo
Some indexer tasks are only executed once
2024-02-02 11:26:45 -03:00
David Correa Rodríguez
e72837de1e
Merge pull request #1197 from wazuh/1196-adapt-vd-to-wazuh-keystore-for-indexer-configuration
VD keystore changes
2024-02-02 10:44:02 +01:00
David Correa Rodríguez
b820347568
Splitted wazuh-keystore generation task 2024-02-01 16:13:41 +01:00
Gonzalo Acuña
5936bf290f
Changed user for username in the wazuh-keystore command 2024-01-31 09:26:13 -03:00
David Correa Rodríguez
eb9c4edcc9
Added condition to the custom user creation for Demo 2024-01-30 16:18:25 +01:00
Gonzalo Acuña
65d896ec7f
VD keystore changes 2024-01-24 10:39:31 -03:00
Gonzalo Acuña
a6dfcfba56
Merge pull request #1188 from wazuh/bug/1187-review-and-fix-the-wazuh-version-references-in-48-and-49-branches
Fixed version in cert tool variable
2024-01-11 09:02:29 -03:00
David Correa Rodríguez
5f80a6d041
Indexer cluster initialization and ISM script are only executed once 2024-01-11 12:28:46 +01:00
Gonzalo Acuña
e74a7fbaec
Merge pull request #1195 from wazuh/merge-4.8.2-into-master
Merge 4.8.2 into master
2024-01-10 13:56:45 -03:00
Gonzalo Acuña
8b1bab8248
Merge pull request #1194 from wazuh/merge-4.8.1-into-4.8.2
Merge 4.8.1 into 4.8.2
2024-01-10 13:52:10 -03:00
Gonzalo Acuña
e325a1237e
Merge pull request #1193 from wazuh/merge-4.8.0-into-4.8.1
Merge 4.8.0 into 4.8.1
2024-01-10 13:46:16 -03:00
Carlos Bordon
eb5f7cdb4b
Merge branch '4.8.1' into merge-4.8.0-into-4.8.1 2024-01-10 13:43:03 -03:00
Gonzalo Acuña
a4295b4c33
Merge pull request #1190 from wazuh/1189-bump-revision
Bump revision for 4.8.0-alpha2
2024-01-09 10:52:24 -03:00
Gonzalo Acuña
6f65896a15
Bump revision for alpha2 2024-01-09 10:41:19 -03:00
David Correa Rodríguez
557a222a3f
Fixed version in cert tool variable 2024-01-08 18:34:03 +01:00
Gonzalo Acuña
b13cf47f87
Merge pull request #1184 from wazuh/merge-4.8.2-into-master
Merge 4.8.2 into master
2024-01-04 14:57:56 -03:00
Gonzalo Acuña
e9432d06db
Merge branch 'master' into merge-4.8.2-into-master 2024-01-04 14:52:39 -03:00
Gonzalo Acuña
7e3b66e1c4
Merge pull request #1183 from wazuh/merge-4.8.1-into-4.8.2
Merge 4.8.1 into 4.8.2
2024-01-04 14:50:17 -03:00
Gonzalo Acuña
6e06652d0e
Merge pull request #1182 from wazuh/merge-4.8.0-into-4.8.1
Merge 4.8.0 into 4.8.1
2024-01-04 14:43:37 -03:00
Gonzalo Acuña
9ec37b42d1
Merge pull request #1181 from wazuh/merge-4.7.2-into-4.8.0
Merge 4.7.2 into 4.8.0
2024-01-04 14:37:59 -03:00
Gonzalo Acuña
673914ffa8
Merge branch '4.8.0' into merge-4.7.2-into-4.8.0 2024-01-04 14:34:09 -03:00
Gonzalo Acuña
7e6cc0098f
Merge pull request #1177 from wazuh/bump-4.8.2
Bump to 4.8.2
2024-01-04 10:06:41 -03:00
Gonzalo Acuña
acc2d6c812
Bump to 4.8.2 2024-01-04 10:01:08 -03:00
Victor Ereñú
9fdaac9a26
Merge pull request #1172 from wazuh/bump-revision
Bump revision
2023-12-22 18:58:35 +10:00
vcerenu
f9fecc8adf
bump revision 2023-12-22 05:43:12 -03:00
Gonzalo Acuña
7a69eecc29
Merge pull request #1170 from wazuh/merge-4.8.1-into-master
Merge 4.8.1 into master
2023-12-20 15:13:17 -03:00
David Correa Rodríguez
7451cf6f2d
Merge branch '4.8.1' into merge-4.8.1-into-master 2023-12-20 19:02:22 +01:00
Gonzalo Acuña
90cbd7c519
Merge pull request #1169 from wazuh/merge-4.8.0-into-4.8.1
Merge 4.8.0 into 4.8.1
2023-12-20 15:01:21 -03:00
David Correa Rodríguez
d4703d2615
Merge branch '4.8.0' into merge-4.8.0-into-4.8.1 2023-12-20 18:38:18 +01:00
Gonzalo Acuña
a10380836c
Merge pull request #1168 from wazuh/merge-4.7.2-into-4.8.0
Merge 4.7.2 into 4.8.0
2023-12-20 14:29:29 -03:00
David Correa Rodríguez
5a25f1c625
Merge branch '4.7.2' into merge-4.7.2-into-4.8.0 2023-12-20 18:21:30 +01:00
Gonzalo Acuña
d7079aa379
Merge pull request #1167 from wazuh/merge-4.7.1-into-4.7.2
Merge 4.7.1 into 4.7.2
2023-12-20 14:12:54 -03:00
David Correa Rodríguez
69fb21dd69
Merge branch '4.7.1' into merge-4.7.1-into-4.7.2 2023-12-20 17:36:48 +01:00
Gonzalo Acuña
2821f87a69
Merge pull request #1162 from wazuh/1159-update-configuration-to-new-vulnerability-detector-and-indexer
Updated configuration to new VD and indexer
2023-12-19 11:52:05 -03:00
David Correa Rodríguez
f08c8930de
Fixed manager template in VD config 2023-12-19 15:00:35 +01:00
Gonzalo Acuña
853ea751a6
Merge pull request #1163 from wazuh/change/599-resource-description-adapt-the-devops-repositories-to-use-the-new-filebeat-module
Updated Filebeat module version to 0.4
2023-12-19 08:20:54 -03:00
David Correa Rodríguez
bac757cb69
Fixed Filebeat node list 2023-12-18 19:07:07 +01:00