Commit Graph
896 Commits
Author SHA1 Message Date
vcerenu c33cb0d274 Merge 4.2 into master 2021-09-30 16:54:29 -03:00
vcerenu 503db33dde Merge 4.2 into master 2021-09-30 16:50:34 -03:00
vcerenu 61b44c37cc Merge 4.2 into master 2021-09-30 16:33:20 -03:00
Alberto Rodríguez f34b7d0465 Merge pull request #522 from wazuh/512-make-utils-persistent
Make utils.py file persistent when using volumes
2021-09-29 10:27:50 +02:00
fhielpos 96dfa2a8d8 Add utils.py to persistent_data 2021-09-24 11:39:56 -03:00
Alberto Rodríguez e99ba259e0 Added util.py to permanent data 2021-09-23 20:00:03 +02:00
vcerenu c46b8c5cd3 Merge pull request #519 from wazuh/Fix-log-rotation
Change tail argument to prevent log rotation issues
2021-09-23 13:00:48 -03:00
fhielpos 3aad1aecd5 Change tail argument to prevent log rotation issues 2021-09-23 11:40:46 -03:00
Alberto Rodríguez f00245007d Merge pull request #516 from wazuh/4.2.2
Release v4.2.2
v4.2.2
2021-09-15 16:50:12 +02:00
vcerenu 084407f9c9 Update 4.2.2 2021-09-15 10:55:43 -03:00
vcerenu f0ebabad89 Update 4.2.2 2021-09-15 10:51:19 -03:00
Alberto Rodríguez afd70ff5f9 Merge pull request #513 from wazuh/4.2.1
Release v4.2.1
v4.2.1
2021-09-14 15:12:06 +02:00
vcerenu 61f3e080a3 Update 4.2.1 2021-09-14 10:08:48 -03:00
vcerenu 2dd9fdfa99 Update 4.2.1 2021-09-14 10:03:16 -03:00
vcerenu daaac09c9c Update 4.2.1 2021-09-13 15:21:53 -03:00
vcerenu 8d0dd5baeb Update 4.2.1 2021-09-09 11:13:04 -03:00
vcerenu 9e9de07322 Update 4.2.1 2021-09-09 09:23:36 -03:00
José Fernández Aguilera 6ed79996af Merge pull request #509 from wazuh/fix-4.2-upgrade
Fix 4.2 upgrade
v4.2.0
2021-09-03 11:37:17 +02:00
dfolcha 413dd71d44 Remove -r flag 2021-09-03 09:16:20 +02:00
dfolcha 68bc08f78f Add function to rename files and directories 2021-09-02 17:05:23 +02:00
dfolcha 6da1b19698 Exclude queue/ossec from volume 2021-09-02 15:12:33 +02:00
José Fernández Aguilera 750fe5ffe8 Merge pull request #504 from wazuh/update-4.2
Update AR files
2021-08-27 12:18:23 +02:00
dfolcha 137f0ba88f Update goss tests 2021-08-27 12:11:00 +02:00
dfolcha 25cb1fa872 Fix wrong OD version 2021-08-27 12:01:58 +02:00
dfolcha 8a01495968 Update AR files 2021-08-27 10:47:45 +02:00
Alberto Rodríguez 1ed0bc8e01 Merge pull request #503 from wazuh/update-4.2
Update 4.2
2021-08-26 16:17:13 +02:00
dfolcha 0699c8fe21 Add admin key pair to production development 2021-08-26 15:08:18 +02:00
Alberto R 64c61bcdbf Fixed mode Kibana settings 2021-06-28 23:35:30 +02:00
Alberto Rodríguez 4b75a6679b Merge pull request #483 from wazuh/orsifacundo-production_cluster-changes
Add admin keypair to production deployment
2021-06-10 08:06:35 +02:00
CuFa 3f3a688d4a Update elasticsearch-node3.yml 2021-06-09 16:41:32 -03:00
CuFa 64bac44507 Update elasticsearch-node2.yml 2021-06-09 16:41:19 -03:00
CuFa 4ae07e1d77 Update elasticsearch-node1.yml 2021-06-09 16:41:09 -03:00
CuFa 04309afada Update production-cluster.yml 2021-06-09 16:40:39 -03:00
CuFa b947487325 Update certs.yml 2021-06-09 16:39:39 -03:00
Alberto Rodríguez 5074eb0b44 Merge pull request #479 from wazuh/476-update-4.2
Bump ODFE 3.13.2 on Wazuh 4.2.0
2021-05-24 14:03:33 +02:00
José Fernández c8b8e8b134 Bump to ODFE 1.13.2 2021-05-24 13:01:47 +02:00
Alberto Rodríguez 7b56e2425b Merge pull request #478 from wazuh/476-update-master
Bump to ODFE 1.13.2
2021-05-24 12:56:32 +02:00
José Fernández 0e0160121b Bump to ODFE 1.13.2 2021-05-24 12:53:06 +02:00
José Fernández fc54288a0d Update README 2021-05-24 11:45:07 +02:00
José Fernández c0d243471e Update README 2021-05-24 11:44:35 +02:00
Alberto Rodríguez 5f84a7eac2 Merge pull request #467 from wazuh/4.3
Merge 4.3 in master
2021-05-24 09:34:27 +02:00
José Fernández 6869fbacfc Merge conflicts with master branch 2021-05-24 09:31:30 +02:00
Alberto Rodríguez 2eb9b7c8fc Merge pull request #447 from npdgm/master
fix: missing directory for tasks manager db
2021-05-11 09:27:45 +02:00
Alberto Rodríguez 09731ec148 Merge pull request #473 from wazuh/457-nginx-conf-readme-4.2
457: Broken link fix and removed deprecated information at README
2021-04-29 14:35:31 +02:00
jcruzlp 2b9e1a6f89 Removed unussed basic auth 2021-04-27 13:39:14 +02:00
jcruzlp 5550edb4ae Fixed broken link 2021-04-27 13:39:13 +02:00
Alberto Rodríguez dfa4ed7d00 Merge pull request #472 from wazuh/4.1
Merge 4.1 in master
2021-04-23 19:59:31 +02:00
Alberto Rodríguez 81f46b908a Merge pull request #470 from wazuh/bump-4.1.5
Bumped to 4.1.5
2021-04-22 18:56:52 +02:00
Alberto RodríguezandVíctor Moreno Jiménez 53bbddd754 Update VERSION
Co-authored-by: Víctor Moreno Jiménez <victor.moreno@wazuh.com>
2021-04-22 18:06:12 +02:00
Alberto R 7c3384f9a3 Bumped to 4.1.5 2021-04-22 17:43:49 +02:00