Commit Graph

1803 Commits

Author SHA1 Message Date
José Fernández Aguilera
b77f506d3a
Merge pull request #643 from wazuh/638-opendistro-documentation-from4.2
Fix Opendistro deployment issues in branch 4.2
2021-10-14 17:43:08 +02:00
Nicolas Lastra
ccc3aaca0e
routine optimization 2021-10-14 12:24:19 -03:00
Nicolas Lastra
d656c1d82f
routine optimization 2021-10-14 12:23:31 -03:00
Nicolas Lastra
e1bc568a55
routine optimization 2021-10-14 12:22:50 -03:00
Nicolas Lastra
a12908b667
fix task name 2021-10-13 15:08:06 -03:00
Nicolas Lastra
bef955f837
638-opendistro-documentation-from4.2 2021-10-13 15:02:06 -03:00
José Fernández Aguilera
3c9f52ad33
Merge pull request #642 from wazuh/637-merge-tag4.2-to-master
637 merge tag4.2 to master
2021-10-13 16:21:28 +02:00
Nicolas Lastra
bc63b757b4
Remove git conflict markers 2021-10-13 10:10:20 -03:00
Nicolas Lastra
b7e900245e
637-merge-tag4.2-to-master 2021-10-12 23:28:59 -03:00
Nicolas Lastra
3f29fa40cc
openjdk for Debian 9 2021-10-12 19:27:02 -03:00
Nicolas Lastra
b0864ea377
Check elasticsearch-plugin performance-analyzer is install 2021-10-12 18:42:06 -03:00
José Fernández Aguilera
1d7ee3af33
Merge pull request #639 from wazuh/636-bump-4.2.3-t0-4.2
Release v4.2.3
2021-10-08 12:49:39 +02:00
Nicolas Lastra
a4fce2bdb4
fix version 2021-10-07 14:49:19 -03:00
Nicolas Lastra
c829d67136
636-bump-4.2.3-t0-4.2 2021-10-06 12:28:45 -03:00
Alberto Rodríguez
8761d62a4d
Merge pull request #635 from wazuh/630-merge_4.2_to_master
Merge 4.2 into master
2021-10-04 14:40:22 +02:00
Nicolas Lastra
9ae766581d
fix VERSION 2021-10-01 17:21:24 -03:00
Nicolas Lastra
aeca71a6d3
fix VERSION 2021-10-01 17:16:43 -03:00
Nicolas Lastra
dfb1a8e9f9
fix url in changelog 2021-10-01 12:41:20 -03:00
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