Commit Graph

2477 Commits

Author SHA1 Message Date
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
David Correa Rodríguez
4193cb0850
Changed names in the default configuration 2023-12-18 18:28:09 +01:00
David Correa Rodríguez
b47c140333
Updated Filebeat module version to 0.4 2023-12-18 15:20:09 +01:00
David Correa Rodríguez
57c70de47f
Added spaces between variable 2023-12-18 14:55:13 +01:00
David Correa Rodríguez
29b78076e5
Modify indexer variables 2023-12-18 12:47:20 +01:00
David Correa Rodríguez
56d627aacf
Indexer and VD must coincide in config 2023-12-18 11:28:00 +01:00
Gonzalo Acuña
4c6ff72585
Merge pull request #1161 from wazuh/Bump-4.7.1-RC3
Bump 4.7.1 to RC3 revision
2023-12-15 14:01:07 -03:00
c-bordon
008abe9568
Bump 4.7.1 to RC3 revision 2023-12-15 13:42:37 -03:00
David Correa Rodríguez
cffba0df19
Changed configuration to new VD and indexer 2023-12-15 16:38:58 +01:00
Gonzalo Acuña
47f914518b
Merge pull request #1158 from wazuh/deploy-4.8.0
Agent ossec.conf template fix
2023-12-12 08:43:42 -03:00
Gonzalo Acuña
4b6d43339f
Merge pull request #1157 from wazuh/bump-4.7.1-rc2-revision
Bump 4.7.1 RC2 revision
2023-12-07 15:27:59 -03:00
Gonzalo Acuña
1fea1df301
Bump 4.7.1 RC2 revision 2023-12-07 15:24:08 -03:00
David Correa Rodríguez
58c2734362
Removed endif tag 2023-12-07 18:32:43 +01:00
Gonzalo Acuña
c7ccfa361a
Endif added 2023-12-07 13:26:38 -03:00
Victor Ereñú
514715c6c2
Merge pull request #1152 from wazuh/bump-revision
Support new Wazuh version 4.7.2 in wazuh-ansible repository
2023-11-30 19:21:07 +10:00
vcerenu
6d027e895c
bump revision number 2023-11-30 06:07:31 -03:00
vcerenu
f591e37104
bump revision number 2023-11-30 05:58:24 -03:00
Gonzalo Acuña
54c240a768
Merge pull request #1148 from wazuh/merge-4.8.1-into-master
Merge 4.8.1 into master
2023-11-27 14:25:24 -03:00
David Correa Rodríguez
20c03c32f4
Merge branch '4.8.1' into merge-4.8.1-into-master 2023-11-27 18:18:42 +01:00
Gonzalo Acuña
db59983bd8
Merge pull request #1147 from wazuh/merge-4.8.0-into-4.8.1
Merge 4.8.0 into 4.8.1
2023-11-27 14:04:13 -03:00
David Correa Rodríguez
2ac672ccb7
Merge branch '4.8.0' into merge-4.8.0-into-4.8.1 2023-11-27 17:56:51 +01:00
Gonzalo Acuña
78c903a850
Merge pull request #1146 from wazuh/merge-4.7.1-into-4.8.0
Merge 4.7.1 into 4.8.0
2023-11-27 13:45:34 -03:00
David Correa Rodríguez
6f7cf17c3d
Merge branch '4.7.1' into merge-4.7.1-into-4.8.0 2023-11-27 17:01:49 +01:00
Gonzalo Acuña
7997563849
Merge pull request #1145 from wazuh/bump_revision_number
bump revision number
2023-11-27 09:44:32 -03:00
vcerenu
ec1787ceb6
bump revision number 2023-11-27 09:24:07 -03:00
Gonzalo Acuña
0f549ec2e9
Merge pull request #1140 from wazuh/idr-501-staging
Staging variables added
2023-11-23 12:25:15 -03:00
Gonzalo Acuña
588aced313
Staging variables added 2023-11-23 12:11:28 -03:00
Gonzalo Acuña
3a15816271
Merge pull request #1139 from wazuh/merge-4.7.1-into-4.8.0
Merge 4.7.1 into 4.8.0
2023-11-23 11:56:21 -03:00
Gonzalo Acuña
dbc36e20a9
Merge pull request #1138 from wazuh/merge-4.7.0-into-4.7.1
Merge 4.7.0 into 4.7.1
2023-11-23 11:43:52 -03:00
Gonzalo Acuña
4f25935861
Merge branch '4.7.1' into merge-4.7.0-into-4.7.1 2023-11-23 11:38:39 -03:00
David Correa Rodríguez
7bbed79307
Merge pull request #1137 from wazuh/enhancement/bump-revision-40704
Bump revision to 40704
2023-11-23 12:12:51 +01:00
David Correa Rodríguez
6161578840
Bump revision to 40704 2023-11-23 11:56:18 +01:00
Gonzalo Acuña
c71a90590e
Merge pull request #1133 from wazuh/idr-492-report-dependencies
Reporting dependencies removed
2023-11-22 08:59:48 -03:00
Gonzalo Acuña
be0afd6851
Merge pull request #1135 from wazuh/enhancement/bump-version-4.8.1
Bump version to 4.8.1
2023-11-22 08:37:51 -03:00