Commit Graph

2135 Commits

Author SHA1 Message Date
Nicolas Lastra
4b774dfeb3
merge de 4.2 a master 2021-10-01 12:24:53 -03:00
Alberto Rodríguez
17a0d96fbb
Merge pull request #631 from wazuh/629-prerelease-4.2.2
Ansible Release 4.2.2
2021-09-17 08:58:34 +02:00
Nicolas Lastra
b0df88cb43
4.2.2 tag update ansible version 2021-09-16 15:53:19 -03:00
Nicolas Lastra
f55390c527
4.2.2 tag update 2021-09-14 15:56:49 -03:00
Alberto Rodríguez
ef91fbe232
Merge pull request #627 from wazuh/4.2.1
4.2.1 tag update
2021-09-10 16:15:53 +02:00
Nicolas Lastra
29e84158a9
4.2.1 tag update 2021-09-09 15:13:25 -03:00
Alberto Rodríguez
691be0ec0f
Merge pull request #624 from wazuh/Add-changes-to-4.2
Add changes to 4.2
2021-08-26 15:07:08 +02:00
dfolcha
0c665f5536
Use root to install agent and fix problem with kibana user 2021-08-26 14:12:09 +02:00
dfolcha
5f238f4185
Update manager conf 2021-08-26 10:50:30 +02:00
José Fernández Aguilera
193649bcf3
Merge pull request #615 from wazuh/603-fix-remo-removal
Changed APT repository removal variable
2021-08-06 13:37:20 +02:00
José Fernández
f424be98e1
Changed APT repository removal variable 2021-08-06 13:29:46 +02:00
José Fernández Aguilera
8582b0954e
Improved removal of performance-analyzer plugin 2021-07-29 14:14:41 +02:00
Alberto Rodríguez
da2ec57e1c
Merge pull request #611 from HagasSaan/add-acl-package-for-debian-ubuntu
adding acl to debian/ubuntu installation
2021-07-16 18:39:31 +02:00
hagassaan
79fbb2a457 adding acl to debian/ubuntu installation 2021-07-15 14:29:46 +07:00
Alberto Rodríguez
d607de0474
Merge pull request #607 from wazuh/fix-tenant-master
Fix multi-tenant and performance analyzer
2021-06-24 08:42:21 +02:00
Alberto Rodríguez
78698c2e4f
Merge pull request #606 from wazuh/fix-tenant
Fixed multi tenant and performance analyzer
2021-06-24 08:41:39 +02:00
José Fernández
5215a429ae
Fix multi-tenant and performance analyzer 2021-06-23 11:10:25 +02:00
José Fernández
4ffb2e0790
Fixed multi tenant and performance analyzer 2021-06-22 17:48:46 +02:00
Alberto Rodríguez
72e194205b
Merge pull request #600 from wazuh/add-branch-info
Add branch information to README master branch
2021-05-25 13:13:53 +02:00
dfolcha
15c061f1b4
Add branch info to README 2021-05-25 12:55:35 +02:00
Alberto Rodríguez
3573406adf
Merge pull request #597 from wazuh/change-OD-version-master
Update OD version from 1.12.0 to 1.13.2 master
2021-05-25 12:24:27 +02:00
Alberto Rodríguez
1f2af13c9b
Merge pull request #599 from wazuh/change-OD-version-4.2
Fix compatibility matrix
2021-05-24 16:45:09 +02:00
dfolcha
1195f1e442
Fix compatibility matrix 2021-05-24 16:39:50 +02:00
Alberto Rodríguez
0bf4198dd9
Merge pull request #598 from wazuh/change-OD-version-4.2
Update OD version from 1.12.0 to 1.13.2 4.2
2021-05-24 16:27:43 +02:00
dfolcha
a8b9ae1b77
Fix compatibility matrix 2021-05-24 16:25:20 +02:00
dfolcha
33a47974ba
Fix compatibility matrix 2021-05-24 16:24:48 +02:00
dfolcha
6e38123d15
Change OD version 2021-05-24 15:49:37 +02:00
dfolcha
0094d56919
Change OD version to 1.13.2 2021-05-24 15:46:59 +02:00
Alberto Rodríguez
ff4e8fdc1d
Merge pull request #587 from wazuh/4.2-d-malko
Use localhost for elasticsearch and filebeat on single node setup
2021-04-27 15:11:55 +02:00
VictorMorenoJimenez
656c963438
Use localhost for elasticsearch and filebeat on single node setup 2021-04-27 11:23:39 +02:00
Alberto Rodríguez
6b99aed8d6
Merge pull request #560 from d-malko/master
Use localhost for elasticsearch and filebeat on single node setup.
2021-04-27 11:19:03 +02:00
Alberto Rodríguez
dfa2aa4ed7
Merge branch 'master' into master 2021-04-27 11:18:46 +02:00
Alberto Rodríguez
88db3f4a66
Merge pull request #582 from wazuh/514-kibana-config
Fix WinRMError in win_template module
2021-04-22 17:02:49 +02:00
VictorMorenoJimenez
3232b6802b
Change win_template to template, due to permission WinRMError 2021-04-22 16:55:41 +02:00
Alberto Rodríguez
a3737f6712
Merge pull request #580 from wazuh/514-kibana-config
Fix error in Kibana config
2021-04-22 16:48:10 +02:00
Alberto Rodríguez
1c6c235c5d
Merge pull request #579 from wazuh/4.3
Merge 4.3 branch in master
2021-04-22 16:46:51 +02:00
VictorMorenoJimenez
a8b4136387
#514. Remove conditional from task certs were not copied to kibana folder 2021-04-22 13:05:01 +02:00
VictorMorenoJimenez
1b447e1bff
#514. Remove conditional from task, config file is not being removed 2021-04-22 10:28:53 +02:00
Víctor Moreno Jiménez
151d508671
Merge branch 'master' into 4.3 2021-04-21 08:17:44 +02:00
Víctor Moreno Jiménez
1216fc3e7b
Merge branch '4.1' into master 2021-04-21 08:15:24 +02:00
Alberto Rodríguez
66fc02f232
Merge pull request #575 from wazuh/574-firewall-drop
Change firewall-drop.sh according to new active-response
2021-04-20 17:24:21 +02:00
Alberto Rodríguez
b87dca129e
Merge pull request #576 from wazuh/574-firewall-drop-43
Change firewall-drop.sh according to new active-response changes
2021-04-20 17:24:08 +02:00
VictorMorenoJimenez
74e96ba8a9
#497. Change firewall-drop.sh according to new active-response changes. Now script is a C binary instead 2021-04-20 17:12:50 +02:00
VictorMorenoJimenez
ab3d36f5cd
#497. Change firewall-drop.sh according to new active-response changes. Now script is a C binary instead 2021-04-20 15:59:12 +02:00
Alberto Rodríguez
9c224216b4
Merge pull request #572 from wazuh/570-windows-agent-rename-4.3
Rename Windows agent from OssecSvc to WazuhSvc
2021-04-19 16:09:58 +02:00
Alberto Rodríguez
3f03744f18
Merge pull request #571 from wazuh/570-windows-agent-rename
Rename Windows agent from OssecSvc to WazuhSvc
2021-04-19 16:09:40 +02:00
VictorMorenoJimenez
7eff9179a2
#570. Rename Windows agent from OssecSvc to WazuhSvc 2021-04-19 09:43:15 +02:00
VictorMorenoJimenez
85682c5e73
#570. Rename Windows agent from OssecSvc to WazuhSvc 2021-04-19 09:42:09 +02:00
Alberto Rodríguez
ced9a40d64
Merge pull request #565 from wazuh/546-wazuh-users-groups
Rename users and group according to Wazuh standard
2021-04-14 15:10:38 +02:00
Victor Moreno Jimenez
f1f137a9d2
Working in #546. Rename users and group according to Wazuh standard 2021-04-14 08:10:15 +02:00