Commit Graph

2594 Commits

Author SHA1 Message Date
David Correa Rodríguez
10f0758f61
Merge pull request #1249 from wazuh/merge-4.8.2-into-4.9.0
Merge 4.8.2 into 4.9.0
2024-04-01 11:05:43 +02:00
David Correa Rodríguez
d1198aa0da
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
8bb64037b5
Merge pull request #1248 from wazuh/merge-4.8.1-into-4.8.2
Merge 4.8.1 into 4.8.2
2024-04-01 10:56:53 +02:00
David Correa Rodríguez
c3a08f97c8
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
42121c3055
Merge pull request #1247 from wazuh/merge-4.8.0-into-4.8.1
Merge 4.8.0 into 4.8.1
2024-04-01 10:47:21 +02:00
David Correa Rodríguez
6f85b7db91
Merge branch '4.8.0' into merge-4.8.0-into-4.8.1 2024-04-01 10:03:20 +02:00
Gonzalo Acuña
11e74b1d53
Merge pull request #1244 from wazuh/513-auxiliary-scripts-are-being-permanently-installed-on-wazuh-manager-by-docker-and-ansible-deployments
Delete create_user.py script
2024-03-26 07:37:33 -03:00
vcerenu
ffddd179d8
delete create_user.py script after use 2024-03-25 09:45:01 -03:00
David Correa Rodríguez
50eb82f512
Merge pull request #1242 from wazuh/bump-version-40806
Bumped version to 40806
2024-03-12 11:06:58 +01:00
David Correa Rodríguez
99e83d2a87
Bumped version to 40806 2024-03-12 11:01:41 +01:00
Gonzalo Acuña
4365350fff
Merge pull request #1239 from wazuh/bug/1201-update-permissions-manager
Updated manager permissions files from `640` to `660`
2024-03-06 12:17:48 -03:00
David Correa Rodríguez
e689f73530
Updated manager permissions files from 640 to 660 2024-03-06 12:30:00 +01:00
Gonzalo Acuña
9df188adb1
Merge pull request #1238 from wazuh/merge-4.9.0-into-master
Merge 4.9.0 into master
2024-03-04 13:47:33 -03:00
David Correa Rodríguez
6111145045
Merge branch '4.9.0' into merge-4.9.0-into-master 2024-03-04 17:44:19 +01:00
Gonzalo Acuña
e6b71e1ff7
Merge pull request #1237 from wazuh/merge-4.8.2-into-4.9.0
Merge 4.8.2 into 4.9.0
2024-03-04 13:43:26 -03:00
David Correa Rodríguez
e6f0889756
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
9971d116a7
Merge pull request #1236 from wazuh/merge-4.8.1-into-4.8.2
Merge 4.8.1 into 4.8.2
2024-03-04 13:38:26 -03:00
David Correa Rodríguez
1804a0cf1b
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
d307fe862c
Merge pull request #1235 from wazuh/merge-4.8.0-into-4.8.1
Merge 4.8.0 into 4.8.1
2024-03-04 13:29:17 -03:00
David Correa Rodríguez
a671950053
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
7211490b1d
Merge pull request #1232 from wazuh/merge-4.9.0-into-master
Merge 4.9.0 into master
2024-03-01 15:55:18 -03:00
Gonzalo Acuña
8a455224bb
Merge pull request #1231 from wazuh/merge-4.8.2-into-4.9.0
Merge 4.8.2 into 4.9.0
2024-03-01 15:41:49 -03:00
Gonzalo Acuña
0e426dcaae
Merge pull request #1230 from wazuh/merge-4.8.1-into-4.8.2
Merge 4.8.1 into 4.8.2
2024-03-01 14:43:42 -03:00
Gonzalo Acuña
89ed81c80a
Merge pull request #1229 from wazuh/1226-bump-revision
Bump revision `4.8.0-beta3`
2024-03-01 10:20:23 -03:00
Gonzalo Acuña
cc6342235f
Revision bump (4.8.0-beta3) 2024-03-01 10:11:44 -03:00
Gonzalo Acuña
5fc2e32900
Merge pull request #1228 from wazuh/merge-4.8.0-into-4.8.1
Merge 4.8.0 into 4.8.1
2024-03-01 08:41:31 -03:00
David Correa Rodríguez
1ead1ec354
Merge branch '4.8.0' into merge-4.8.0-into-4.8.1 2024-03-01 12:31:37 +01:00
Gonzalo Acuña
85ef35136c
Merge pull request #1225 from wazuh/merge-4.7.3-into-4.8.0
Merge 4.7.3 into 4.8.0
2024-03-01 08:22:49 -03:00
David Correa Rodríguez
24c0ec0e6e
Merge branch '4.7.3' into merge-4.7.3-into-4.8.0 2024-03-01 12:14:19 +01:00
David Correa Rodríguez
d0e2610d83
Merge pull request #1223 from wazuh/bump-revision-40713
Bump revision to 40713
2024-02-29 11:09:31 +01:00
David Correa Rodríguez
fa96d0172e
Bump revision to 40713 2024-02-29 10:47:34 +01:00
Gonzalo Acuña
80837ef982
Merge pull request #1221 from wazuh/bump-revision
Bump revision to 40804
2024-02-23 11:57:50 -03:00
David Correa Rodríguez
9cd32e65e4
Bump revision to 40804 2024-02-23 15:50:57 +01:00
Julia Magán
ad29d984f4
Merge pull request #1218 from wazuh/merge-4.7.3-into-4.8.0
Merge 4.7.3 into 4.8.0
2024-02-23 11:10:18 +01:00
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