Commit Graph

2344 Commits

Author SHA1 Message Date
David Correa Rodríguez
77e44c105b
Merge branch '4.7.0' into merge-4.7.0-into-4.7.1 2023-10-23 10:19:19 +02:00
David Correa Rodríguez
6ea684136d
Merge pull request #1090 from wazuh/merge-4.6.0-into-4.7.0
Merge 4.6.0 into 4.7.0
2023-10-23 10:16:34 +02:00
David Correa Rodríguez
2fb6172cfa
Merge branch '4.6.0' into merge-4.6.0-into-4.7.0 2023-10-23 10:10:59 +02:00
David Correa Rodríguez
4b8d5f3c3b
Merge pull request #1089 from wazuh/merge-4.5.4-into-4.6.0
Merge 4.5.4 into 4.6.0
2023-10-23 10:09:39 +02:00
David Correa Rodríguez
740789c737
Merge branch '4.5.4' into merge-4.5.4-into-4.6.0 2023-10-23 10:01:18 +02:00
David Correa Rodríguez
9bffdbe93c
Added v4.5.4 to CHANGELOG.md 2023-10-23 09:52:38 +02:00
c-bordon
6ed9efa05f
Fixed Wazuh dashboard node commentary 2023-10-20 12:02:36 -03:00
c-bordon
bd49c1f33d
Removed reference for Wazuh indexer and dashboard mixed node from Readme file 2023-10-20 12:01:06 -03:00
David Correa Rodríguez
1a39f6dce6
Merge pull request #1085 from wazuh/bump-revision-40510
Bump revision to 40510
2023-10-19 11:59:52 +02:00
David Correa Rodríguez
3b9e567acc
Bump revision to 40510 2023-10-19 11:46:24 +02:00
David Correa Rodríguez
066ef35db9
Merge pull request #1082 from wazuh/bump-version-4.5.4
Bump version to 4.5.4
2023-10-17 12:09:51 +02:00
David Correa Rodríguez
e28067bdaf
Bump version to 4.5.4 2023-10-17 10:10:55 +02:00
David Correa Rodríguez
4c9e9e02e2
Merge pull request #1079 from wazuh/bump-revision-40701
Bump revision to 40701
2023-10-13 11:42:29 +02:00
David Correa Rodríguez
640a8b87b6
Bump revision to 40701 2023-10-13 10:25:38 +02:00
David Correa Rodríguez
ce6d014a84
Merge pull request #1074 from wazuh/merge-4.7.0-into-4.7.1
Merge 4.7.0 into 4.7.1
2023-10-11 10:53:20 +02:00
David Correa Rodríguez
c3fbbc7e13
Merge branch '4.7.0' into merge-4.7.0-into-4.7.1 2023-10-11 10:45:21 +02:00
David Correa Rodríguez
05e7f19ad9
Merge pull request #1073 from wazuh/merge-4.6.0-into-4.7.0
Merge 4.6.0 into 4.7.0
2023-10-11 10:44:19 +02:00
David Correa Rodríguez
cfc17a7a45
Merge branch '4.6.0' into merge-4.6.0-into-4.7.0 2023-10-11 10:37:13 +02:00
David Correa Rodríguez
01bcc00861
Merge pull request #1072 from wazuh/merge-4.5.3-into-4.6.0
Merge 4.5.3 into 4.6.0
2023-10-11 10:34:34 +02:00
David Correa Rodríguez
38da255b7a
Bump 4.5.3 branch to 4.6.0 branch 2023-10-11 10:16:06 +02:00
Gonzalo Acuña
3522ae9771
Merge pull request #1070 from wazuh/bug/1059-apt-error-while-installing-the-wazuh-agent-in-ubuntu-to4.7.1
Added apt update to Debian
2023-10-10 13:13:33 -03:00
c-bordon
df3aae7380
Reorder apt update 2023-10-10 12:31:47 -03:00
c-bordon
0465d10b5d
Added apt update to Debian 2023-10-10 09:28:18 -03:00
Gonzalo Acuña
e12f745991
Merge pull request #1067 from wazuh/bug/Update-create-user-py-to4.6.0
Fixed create user py script
2023-10-09 10:13:16 -03:00
Victor Ereñú
77bc6df962
Merge pull request #1064 from wazuh/merge-4.7.0-into-4.7.1
Merge 4.7.0 into 4.7.1
2023-10-09 06:04:32 -03:00
David Correa Rodríguez
3ee126247e
Merge branch '4.7.0' into merge-4.7.0-into-4.7.1 2023-10-09 10:50:11 +02:00
Victor Ereñú
b3019d294f
Merge pull request #1063 from wazuh/merge-4.6.0-into-4.7.0
Merge 4.6.0 into 4.7.0
2023-10-09 05:34:06 -03:00
David Correa Rodríguez
2c72529f7f
Merge 4.6.0 into 4.7.0 2023-10-09 09:41:25 +02:00
c-bordon
3c9afa2936
Fixed create user py script 2023-10-06 10:31:37 -03:00
Gonzalo Acuña
b0ae50aeda
Merge pull request #1061 from wazuh/bump-revision-4.6.0
Bump revision to 40602
2023-10-06 09:15:06 -03:00
David Correa Rodríguez
97a307a5ed
Bump revision to 40602 2023-10-06 14:11:05 +02:00
Gonzalo Acuña
0b222bbbf9
Merge pull request #1056 from wazuh/bump-4.5.3-revision
Bump 4.5.3 revision
2023-10-05 11:45:57 -03:00
Gonzalo Acuña
3c191ede71
Bump 4.5.3 revision 2023-10-05 11:41:33 -03:00
Gonzalo Acuña
01cebe1c96
Merge pull request #1048 from wazuh/change/1039-bump-revision-4.5.3-rc2
Bump revision to 40507
2023-09-28 08:24:41 -03:00
David Correa Rodríguez
838d81f146
Bump revision to 40507 2023-09-28 12:10:56 +02:00
Gonzalo Acuña
676fce7ab8
Merge pull request #1045 from wazuh/bump-4.6.0-revision
Revision bump
2023-09-22 14:58:53 -03:00
Gonzalo Acuña
6b6f6e19d3
Revision bump 2023-09-22 14:53:30 -03:00
Gonzalo Acuña
36450e726d
Merge pull request #1042 from wazuh/merge-4.7.0-into-4.7.1
Merge 4.7.0 into 4.7.1
2023-09-22 07:20:46 -03:00
David Correa Rodríguez
8a6d1a4e8d
Updated wazuh_template_branch variable 2023-09-22 12:12:19 +02:00
David Correa Rodríguez
caca90e597
Merge remote-tracking branch 'origin/4.7.0' into merge-4.7.0-into-4.7.1 2023-09-22 12:11:37 +02:00
David Correa Rodríguez
0f773bee06
Merge remote-tracking branch 'origin/4.7.0' into merge-4.7.0-into-4.7.1 2023-09-22 12:10:13 +02:00
Gonzalo Acuña
f4e946892d
Merge pull request #1041 from wazuh/merge-4.6.0-into-4.7.0
Merge 4.6.0 into 4.7.0
2023-09-22 06:49:12 -03:00
David Correa Rodríguez
3bb70029d0
Merge remote-tracking branch 'origin/4.6.0' into merge-4.6.0-into-4.7.0 2023-09-22 11:46:51 +02:00
Gonzalo Acuña
2489001bf7
Merge pull request #1018 from wazuh/17617-vdt-alas2023-support
Add Amazon Linux 2023 VDT default configuration
2023-09-21 11:01:08 -03:00
Gonzalo Acuña
53ec242bd3
Merge pull request #1036 from wazuh/bump-version-4.7.1
Bump version to 4.7.1
2023-09-20 08:15:11 -03:00
David Correa Rodríguez
035bf984c8
Bump version to 4.7.1 2023-09-20 11:08:28 +02:00
Leonardo Quiceno
75c124f471
Add Amazon Linux 2023 VDT support 2023-09-18 11:30:52 -05:00
Gonzalo Acuña
3022a80c68
Merge pull request #1033 from wazuh/bug/1030-fix-wazuh-template-config-file
Fixed `wazuh_template_branch` and `config.yml` template name for `4.6.0`
2023-09-11 15:08:34 -03:00
Gonzalo Acuña
ca4ce70d6c
Merge pull request #1029 from wazuh/merge-4.6.0-into-4.7.0
Merge `4.6.0` into `4.7.0`
2023-09-07 10:42:28 -03:00
David Correa Rodríguez
aeff17a189
Merge branch '4.6.0' into merge-4.6.0-into-4.7.0 2023-09-07 14:41:11 +02:00