Commit Graph

1148 Commits

Author SHA1 Message Date
Jochen Schneider
b9b2663b3d made elasticrepo configurable 2020-01-16 13:26:34 +01:00
Jochen Schneider
d328609f29 repo param not needed any longer 2020-01-16 13:06:40 +01:00
Jochen Schneider
c3cc763a5e added key ID for download only when required 2020-01-16 11:58:05 +01:00
Jochen Schneider
6c4740a401 Merge remote-tracking branch 'upstream/master' 2020-01-16 11:13:23 +01:00
Jose M
e9c05e8b19 Merge branch 'master' into devel 2020-01-13 11:55:57 +01:00
Rshad Zhran
5aa0f2e6c4 Define config_profile for CentOS and Ubuntu 2020-01-10 13:36:12 +01:00
Rshad Zhran
8ba493ed24 Change config. tags order 2020-01-10 13:35:41 +01:00
Rshad Zhran
50a093d071 Change default email_to 2020-01-10 13:35:11 +01:00
Rshad Zhran
cb2ded0e49 Define cdb_lists in wzuh-manger default variables 2020-01-10 11:16:15 +01:00
Rshad Zhran
144067763b Remove cdb related tasks and config 2020-01-09 19:15:14 +01:00
Rshad Zhran
285cbc26fc Adapt agent to 3.11.1 - detailed changes 2020-01-09 19:14:59 +01:00
Rshad Zhran
a35c7bceb1 Fix rootkit files & trojans paths for manager 2020-01-09 18:05:41 +01:00
Manuel J. Bernal
7d98fc5275
Merge pull request #344 from wazuh/bugfix-296-templates-python3-compatibility
Update templates for Python 3 compatibility
2020-01-09 15:12:23 +01:00
Manuel Gutierrez
99f5403d50 Update templates for Python 3 compatibility 2020-01-09 11:10:41 +01:00
Jose M. Garcia
8f8c32cf59
Merge pull request #343 from wazuh/wazuh-release-v3.11.1_7.5.1
Wazuh release v3.11.1 7.5.1
2020-01-09 10:08:16 +01:00
Manuel Gutierrez
3954c0d317 Remove wazuh-qa submodule 2020-01-08 17:39:03 +01:00
Manuel Gutierrez
78a08db91c Merge branch 'devel' into wazuh-release-v3.11.1_7.5.1 2020-01-08 17:20:56 +01:00
Jose M. Garcia
5c7590d632
Merge pull request #335 from wazuh/feature-332-default-installation
Changes to make `ossec.conf` equivalent to the default version
2020-01-08 17:18:12 +01:00
Jose M
16495e9b91 Restore Wazuh version 3.11.0_7.5.1 2020-01-08 17:16:38 +01:00
Manuel Gutierrez
a708328028 Merge branch 'master' into wazuh-release-v3.11.1_7.5.1 2020-01-08 16:24:44 +01:00
Jose M
b050291a23 Update CHANGELOG.md 2020-01-08 14:23:14 +01:00
Jose M
d2615ef646 Update Windows MD5 hash of Wazuh Agent 3.11.0 2020-01-08 14:22:07 +01:00
Manuel Gutierrez
0428fb3180 Remove whitespace 2020-01-07 18:14:15 +01:00
Rshad Zhran
09fd2ac4fe Update revision to 31110 2020-01-07 18:09:49 +01:00
Rshad Zhran
bfc39c1572 Merge branch 'devel' into feature-332-default-installation 2020-01-07 17:59:46 +01:00
Manuel Gutierrez
1348f1acc2 Remove whitespace 2020-01-07 17:47:39 +01:00
Manuel Gutierrez
0d23ca8b01 Update CHANGELOG.md 2020-01-07 17:08:56 +01:00
Manuel Gutierrez
cf37169f1d Update Windows package MD5 hash 2020-01-07 17:08:56 +01:00
Manuel Gutierrez
812fb81b81 Bump to version 3.11.1_7.5.1 2020-01-07 17:08:56 +01:00
Jose M. Garcia
4739841494
Merge pull request #342 from wazuh/feature-339-new-api-behavior
Set new API configuration behavior
2020-01-07 16:50:53 +01:00
Manuel Gutierrez
5b895233d4 Fix missing bump 2020-01-07 16:29:20 +01:00
Manuel Gutierrez
71e52de80f Do not ignore errors on index removal 2020-01-07 16:21:47 +01:00
Manuel Gutierrez
2d91a5c126 Rename task 2020-01-07 16:10:04 +01:00
Manuel Gutierrez
c7ca41169e Rename API variables 2020-01-07 16:06:08 +01:00
Manuel Gutierrez
58c5005bed Set new API configuration behavior 2020-01-07 15:52:14 +01:00
Rshad Zhran
d3f73a5e58 Set source installation mode to false 2020-01-07 14:03:44 +01:00
Rshad Zhran
e5643b33cc Bump version - Wazuh = 3.11.1_7.5.1 2020-01-07 13:57:47 +01:00
Jose M. Garcia
32c5cf41b3
Merge pull request #340 from wazuh/bugfix-279-openscap-template
Fix openscap block rendering for CentOS 8
2019-12-31 09:15:26 +01:00
Manuel Gutierrez
6eebfa4f2c Fix openscap block rendering for CentOS 8 2019-12-30 17:37:07 +01:00
Jose M. Garcia
c5a36f58d0
Merge pull request #337 from wazuh/devel
Wazuh Release 3.11.0_7.5.1
2019-12-26 14:54:06 +01:00
Jose M
bfe86ed1d3 Update CHANGELOG.md 2019-12-26 13:13:32 +01:00
Jose M
879c2782b0 Bump version to 3.11.0_7.5.1 2019-12-26 11:58:01 +01:00
Jose M
c6e0209a98 Merge branch 'master' into devel 2019-12-26 11:56:43 +01:00
Rshad Zhran
efc5ad1b07 Remove empty lines from template 2019-12-19 13:28:18 +01:00
Rshad Zhran
fe1fc854a4 Quote vulnerabilit-detector providers names 2019-12-19 11:17:09 +01:00
Rshad Zhran
39e514d515 Fix vulnerability-detector variables structure 2019-12-19 11:02:27 +01:00
Rshad Zhran
9a42faebdf Rename and Reorder <vulnerability_detector> vars. 2019-12-18 17:48:58 +01:00
Rshad Zhran
d64d26d5a5 Fix variable name in <vulnerability_detector> 2019-12-18 17:48:09 +01:00
Rshad Zhran
e7e3a39df7 Adapt agent (windows) to 3.11 2019-12-18 17:14:07 +01:00
Rshad Zhran
dc96d210e5 Fix conditional check for null variables
cherry pick: 7df74182f4
2019-12-17 14:20:26 +01:00