Merge pull request #790 from wazuh/merge-433-master
Merge v4.3.3 into master
This commit is contained in:
commit
ba7e1aa325
12
CHANGELOG.md
12
CHANGELOG.md
@ -13,6 +13,18 @@ All notable changes to this project will be documented in this file.
|
|||||||
|
|
||||||
- Update to [Wazuh v4.4.0](https://github.com/wazuh/wazuh/blob/v4.4.0/CHANGELOG.md#v440)
|
- Update to [Wazuh v4.4.0](https://github.com/wazuh/wazuh/blob/v4.4.0/CHANGELOG.md#v440)
|
||||||
|
|
||||||
|
## [v4.3.3]
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Update to [Wazuh v4.3.3](https://github.com/wazuh/wazuh/blob/v4.3.3/CHANGELOG.md#v433)
|
||||||
|
|
||||||
|
## [v4.3.2]
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Update to [Wazuh v4.3.2](https://github.com/wazuh/wazuh/blob/v4.3.2/CHANGELOG.md#v432)
|
||||||
|
|
||||||
## [v4.3.1]
|
## [v4.3.1]
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
2
LICENSE
2
LICENSE
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
Portions Copyright (C) 2021 Wazuh, Inc.
|
Portions Copyright (C) 2017, Wazuh, Inc.
|
||||||
Based on work Copyright (C) 2003 - 2013 Trend Micro, Inc.
|
Based on work Copyright (C) 2003 - 2013 Trend Micro, Inc.
|
||||||
|
|
||||||
This program is a free software; you can redistribute it and/or modify
|
This program is a free software; you can redistribute it and/or modify
|
||||||
|
|||||||
@ -17,6 +17,8 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb
|
|||||||
|---------------|---------|--------|
|
|---------------|---------|--------|
|
||||||
| v4.5.0 | | |
|
| v4.5.0 | | |
|
||||||
| v4.4.0 | | |
|
| v4.4.0 | | |
|
||||||
|
| v4.3.3 | | |
|
||||||
|
| v4.3.2 | | |
|
||||||
| v4.3.1 | | |
|
| v4.3.1 | | |
|
||||||
| v4.3.0 | | |
|
| v4.3.0 | | |
|
||||||
| v4.2.6 | 7.10.2 | 1.13.2 |
|
| v4.2.6 | 7.10.2 | 1.13.2 |
|
||||||
@ -405,7 +407,7 @@ https://github.com/dj-wasabi/ansible-ossec-server
|
|||||||
## License and copyright
|
## License and copyright
|
||||||
|
|
||||||
WAZUH
|
WAZUH
|
||||||
Copyright (C) 2016-2021 Wazuh Inc. (License GPLv2)
|
Copyright (C) 2016, Wazuh Inc. (License GPLv2)
|
||||||
|
|
||||||
## Web references
|
## Web references
|
||||||
|
|
||||||
|
|||||||
@ -27,7 +27,7 @@ Available variables are listed below, along with default values (see `defaults/m
|
|||||||
License and copyright
|
License and copyright
|
||||||
---------------------
|
---------------------
|
||||||
|
|
||||||
WAZUH Copyright (C) 2021 Wazuh Inc. (License GPLv3)
|
WAZUH Copyright (C) 2016, Wazuh Inc. (License GPLv3)
|
||||||
|
|
||||||
### Based on previous work from geerlingguy
|
### Based on previous work from geerlingguy
|
||||||
|
|
||||||
|
|||||||
@ -9,7 +9,7 @@ filebeat_output_indexer_hosts:
|
|||||||
- "localhost:9200"
|
- "localhost:9200"
|
||||||
|
|
||||||
filebeat_module_package_url: https://packages.wazuh.com/4.x/filebeat
|
filebeat_module_package_url: https://packages.wazuh.com/4.x/filebeat
|
||||||
filebeat_module_package_name: wazuh-filebeat-0.1.tar.gz
|
filebeat_module_package_name: wazuh-filebeat-0.2.tar.gz
|
||||||
filebeat_module_package_path: /tmp/
|
filebeat_module_package_path: /tmp/
|
||||||
filebeat_module_destination: /usr/share/filebeat/module
|
filebeat_module_destination: /usr/share/filebeat/module
|
||||||
filebeat_module_folder: /usr/share/filebeat/module/wazuh
|
filebeat_module_folder: /usr/share/filebeat/module/wazuh
|
||||||
|
|||||||
@ -47,7 +47,7 @@ The following is an example of how this role can be used:
|
|||||||
License and copyright
|
License and copyright
|
||||||
---------------------
|
---------------------
|
||||||
|
|
||||||
WAZUH Copyright (C) 2021 Wazuh Inc. (License GPLv3)
|
WAZUH Copyright (C) 2016, Wazuh Inc. (License GPLv3)
|
||||||
|
|
||||||
### Based on previous work from dj-wasabi
|
### Based on previous work from dj-wasabi
|
||||||
|
|
||||||
|
|||||||
@ -54,7 +54,6 @@ wazuh_winagent_config:
|
|||||||
auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe
|
auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe
|
||||||
check_md5: True
|
check_md5: True
|
||||||
md5: 8ffa75d13280f1aa6ffca54f4273df4d
|
md5: 8ffa75d13280f1aa6ffca54f4273df4d
|
||||||
wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.5.0-1.msi
|
|
||||||
wazuh_winagent_package_name: wazuh-agent-4.5.0-1.msi
|
wazuh_winagent_package_name: wazuh-agent-4.5.0-1.msi
|
||||||
|
|
||||||
wazuh_dir: "/var/ossec"
|
wazuh_dir: "/var/ossec"
|
||||||
|
|||||||
@ -218,7 +218,7 @@ Including an example of how to use your role (for instance, with variables passe
|
|||||||
License and copyright
|
License and copyright
|
||||||
---------------------
|
---------------------
|
||||||
|
|
||||||
WAZUH Copyright (C) 2021 Wazuh Inc. (License GPLv3)
|
WAZUH Copyright (C) 2016, Wazuh Inc. (License GPLv3)
|
||||||
|
|
||||||
### Based on previous work from dj-wasabi
|
### Based on previous work from dj-wasabi
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<!-- Local rules -->
|
<!-- Local rules -->
|
||||||
|
|
||||||
<!-- Modify it at your will. -->
|
<!-- Modify it at your will. -->
|
||||||
<!-- Copyright (C) 2015-2019, Wazuh Inc. -->
|
<!-- Copyright (C) 2016, Wazuh Inc. -->
|
||||||
|
|
||||||
<!-- Example -->
|
<!-- Example -->
|
||||||
<group name="local,syslog,sshd,">
|
<group name="local,syslog,sshd,">
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
---
|
---
|
||||||
#
|
#
|
||||||
# Wazuh app - App configuration file
|
# Wazuh app - App configuration file
|
||||||
# Copyright (C) 2015-2019 Wazuh, Inc.
|
# Copyright (C) 2016, Wazuh Inc.
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# This program is free software; you can redistribute it and/or modify
|
||||||
# it under the terms of the GNU General Public License as published by
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
---
|
---
|
||||||
|
|
||||||
dashboard_version: 4.5.0
|
dashboard_version: 4.5.0
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user