Commit Graph

2476 Commits

Author SHA1 Message Date
vcerenu
f72ca43ce9
merge v4.4.1 into master 2023-04-17 13:43:41 -03:00
Gonzalo Acuña
d802d8820b
Merge pull request #903 from wazuh/4.4-bump-4.4.1
Bump `4.4` to `4.4.1`
2023-03-31 11:02:45 -03:00
Gonzalo Acuña
0e15256486
Bumped to 4.4.1 2023-03-31 10:25:55 -03:00
Gonzalo Acuña
fdf8286f47
Merge pull request #901 from wazuh/merge-4-4-to-4-5
Merge 4.4 into 4.5 branch
2023-03-31 06:29:09 -03:00
Gonzalo Acuña
3f5d43477f
Merge pull request #902 from wazuh/merge-4-4-to-master
Merge 4.4 into master branch
2023-03-31 06:27:38 -03:00
vcerenu
eadfa4a2db
resolving conflicts for merge 2023-03-30 16:45:04 -03:00
vcerenu
0a03928d8b
resolving conflicts for merge 2023-03-30 16:44:14 -03:00
Gonzalo Acuña
cd5772ca51
Merge pull request #898 from wazuh/4.4-revision
4.4 Revision and Windows Agent MD5 update
2023-03-28 10:03:14 -03:00
Gonzalo Acuña
5e467b103d
Win agent MD5 update 2023-03-28 09:32:02 -03:00
Gonzalo Acuña
e317b2a0fc
Revision update 2023-03-28 09:24:24 -03:00
Gonzalo Acuña
970263ae2e
Merge pull request #888 from wazuh/bump-master-46
Bump master to 4.6
2023-02-01 11:30:11 -03:00
Gonzalo Acuña
5186a00993
Merge pull request #887 from wazuh/master
Merge master into 4.5
2023-02-01 11:17:21 -03:00
Gonzalo Acuña
2d0aa679f2
Bump master to 4.6 2023-02-01 11:16:47 -03:00
Gonzalo Acuña
1317a9a753
Old workflow files deleted 2023-02-01 11:12:03 -03:00
Gonzalo Acuña
4cddcac8c9
Merge pull request #886 from wazuh/merge-44-master
Merge 4.4 into master
2023-02-01 11:01:33 -03:00
Gonzalo Acuña
6952a17eca
Conflicts resolved 2023-02-01 10:47:03 -03:00
Gonzalo Acuña
16b9078a18
Merge pull request #881 from wazuh/873-github-actions
GitHub actions remake
2023-02-01 10:03:52 -03:00
Gonzalo Acuña
8053f0db69
Termination date updated for workflow EC2 instances 2023-02-01 09:44:36 -03:00
Gonzalo Acuña
01d73de423
Old workflow files deleted 2023-02-01 09:33:02 -03:00
Gonzalo Acuña
99fb2c02b3
Merge pull request #884 from wazuh/merge-43-44
Merge 4.3 into 4.4
2023-02-01 09:30:22 -03:00
Gonzalo Acuña
49d1205e7f
Conflicts resolved 2023-02-01 09:08:19 -03:00
Gonzalo Acuña
8ab137fed2
Merge pull request #882 from wazuh/829-wazuh-cluster-playbook-440
Wazuh cluster playbook added
2023-01-26 12:42:45 -03:00
Gonzalo Acuña
ea9b073973
Comments removed 2023-01-26 10:56:56 -03:00
Gonzalo Acuña
ff4c843883
Readme update 2023-01-25 16:19:31 -03:00
Gonzalo Acuña
904f7be4a0
Wazuh cluster playbook added 2023-01-25 16:04:48 -03:00
Gonzalo Acuña
bc12f410de
Remove backup yaml 2023-01-25 12:42:39 -03:00
Gonzalo Acuña
31daf3168c
Push actions removed from workflows 2023-01-25 11:56:24 -03:00
Gonzalo Acuña
a5da15b337
AL2 removed some steps 2023-01-25 11:42:09 -03:00
Gonzalo Acuña
88d97b88f7
AL2 workflows added 2023-01-25 11:19:03 -03:00
Gonzalo Acuña
68b522faec
Workflow names updated 2023-01-25 09:25:50 -03:00
Gonzalo Acuña
fe82b8b558
Old workflows removed 2023-01-25 09:24:20 -03:00
Gonzalo Acuña
94fe0f303a
Ubuntu workflows added 2023-01-25 09:22:37 -03:00
Gonzalo Acuña
99f6fb41f4
GH Actions tags added to EC2 runners 2023-01-24 15:11:45 -03:00
Gonzalo Acuña
552b63cf66
Workflow updates 2023-01-24 12:24:09 -03:00
Gonzalo Acuña
e7f5c3175b
AIO playbook vars fixed 2023-01-24 10:57:28 -03:00
Gonzalo Acuña
789886d6d3
AIO playbook instance type modified 2023-01-24 10:47:51 -03:00
Gonzalo Acuña
fab8ec23f1
AIO playbook single_node variable added 2023-01-24 10:45:44 -03:00
Gonzalo Acuña
7fe5d56505
AIO playbook variables added 2023-01-24 10:36:35 -03:00
Gonzalo Acuña
1032908b11
AIO playbook fixed 2023-01-24 10:23:23 -03:00
Gonzalo Acuña
e263ffa0d1
AIO playbook fixed 2023-01-24 10:19:13 -03:00
Gonzalo Acuña
b6130cf972
GH Actions AIO added 2023-01-24 10:16:20 -03:00
Gonzalo Acuña
ff0fc511f2
GH Actions env vars added 2023-01-24 09:12:27 -03:00
Gonzalo Acuña
6dd11834ef
GH Actions playbook step added 2023-01-24 09:02:31 -03:00
Gonzalo Acuña
0cd0f4a419
GH Actions steps added 2023-01-24 08:42:39 -03:00
Gonzalo Acuña
d9e7114df3
EC2 config for tests updated 2023-01-23 14:06:36 -03:00
Gonzalo Acuña
612d074144
EC2 config for tests updated 2023-01-23 13:55:55 -03:00
Gonzalo Acuña
9b141583a6
Run tests on EC2 2023-01-23 13:28:57 -03:00
Alberto Rodríguez
4efcad9869
Merge pull request #872 from wazuh/869-no-port-should-be-specified-at-wazuh-manager-ossyml-for-filebeat-configuration
Delete port configuration
2023-01-10 17:23:34 +01:00
vcerenu
5bcf91e63b
delete port into filebeat configuration 2022-12-30 12:19:15 -03:00
Alberto Rodríguez
da919f6d1c
Merge pull request #860 from wazuh/bump-4-3-10
Bump 4.3 to 4.3.10
2022-11-11 16:22:15 +01:00