Merge branch 'master' into devel

This commit is contained in:
Jose M 2020-05-04 12:23:44 +02:00
commit acc7b10cba
No known key found for this signature in database
GPG Key ID: 790179D6924E10FF
5 changed files with 22 additions and 14 deletions

View File

@ -1,6 +1,19 @@
# Change Log # Change Log
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## [v3.12.3_7.6.2]
### Added
- Update to Wazuh v3.12.2
- AWS S3 block to template ([@limitup](https://github.com/limitup)) [PR#404](https://github.com/wazuh/wazuh-ansible/pull/413)
### Changed
- Update Kibana optimize task parameters and command ([@jm404](https://github.com/jm404)) [PR#404](https://github.com/wazuh/wazuh-ansible/pull/412)
- Update Kibana optimize folder and owner ([@jm404](https://github.com/jm404)) [PR#404](https://github.com/wazuh/wazuh-ansible/pull/410)
## [v3.12.2_7.6.2] ## [v3.12.2_7.6.2]
### Added ### Added

View File

@ -6,7 +6,7 @@ elasticsearch_network_host: "127.0.0.1"
kibana_server_host: "0.0.0.0" kibana_server_host: "0.0.0.0"
kibana_server_port: "5601" kibana_server_port: "5601"
elastic_stack_version: 7.6.2 elastic_stack_version: 7.6.2
wazuh_version: 3.12.2 wazuh_version: 3.12.3
wazuh_app_url: https://packages.wazuh.com/wazuhapp/wazuhapp wazuh_app_url: https://packages.wazuh.com/wazuhapp/wazuhapp
elasticrepo: elasticrepo:

View File

@ -1,5 +1,5 @@
--- ---
wazuh_agent_version: 3.12.2-1 wazuh_agent_version: 3.12.3-1
# Custom packages installation # Custom packages installation
@ -12,7 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: ""
wazuh_agent_sources_installation: wazuh_agent_sources_installation:
enabled: false enabled: false
branch: "v3.12.2" branch: "v3.12.3"
user_language: "y" user_language: "y"
user_no_stop: "y" user_no_stop: "y"
user_install_type: "agent" user_install_type: "agent"
@ -63,9 +63,9 @@ wazuh_winagent_config:
# Adding quotes to auth_path_x86 since win_shell outputs error otherwise # Adding quotes to auth_path_x86 since win_shell outputs error otherwise
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: dc64c8bee53df0430e9e03e578ba334d md5: 4ae4e930d3ae9d572b07cd9e7207d783
wazuh_winagent_config_url: https://packages.wazuh.com/3.x/windows/wazuh-agent-3.12.2-1.msi wazuh_winagent_config_url: https://packages.wazuh.com/3.x/windows/wazuh-agent-3.12.3-1.msi
wazuh_winagent_package_name: wazuh-agent-3.12.2-1.msi wazuh_winagent_package_name: wazuh-agent-3.12.3-1.msi
wazuh_agent_config: wazuh_agent_config:
repo: repo:
apt: 'deb https://packages.wazuh.com/3.x/apt/ stable main' apt: 'deb https://packages.wazuh.com/3.x/apt/ stable main'
@ -86,7 +86,6 @@ wazuh_agent_config:
frequency: 43200 frequency: 43200
scan_on_start: 'yes' scan_on_start: 'yes'
auto_ignore: 'no' auto_ignore: 'no'
alert_new_files: 'yes'
win_audit_interval: 60 win_audit_interval: 60
skip_nfs: 'yes' skip_nfs: 'yes'
skip_dev: 'yes' skip_dev: 'yes'

View File

@ -201,7 +201,6 @@
{% if wazuh_agent_config.syscheck is defined %} {% if wazuh_agent_config.syscheck is defined %}
<syscheck> <syscheck>
<disabled>no</disabled> <disabled>no</disabled>
<!-- <alert_new_files>{{ wazuh_agent_config.syscheck.alert_new_files }}</alert_new_files> -->
<frequency>{{ wazuh_agent_config.syscheck.frequency }}</frequency> <frequency>{{ wazuh_agent_config.syscheck.frequency }}</frequency>
{% if ansible_system == "Linux" %} {% if ansible_system == "Linux" %}
<scan_on_start>{{ wazuh_agent_config.syscheck.scan_on_start }}</scan_on_start> <scan_on_start>{{ wazuh_agent_config.syscheck.scan_on_start }}</scan_on_start>

View File

@ -1,5 +1,5 @@
--- ---
wazuh_manager_version: 3.12.2-1 wazuh_manager_version: 3.12.3-1
wazuh_manager_fqdn: "wazuh-server" wazuh_manager_fqdn: "wazuh-server"
wazuh_manager_package_state: present wazuh_manager_package_state: present
@ -15,7 +15,7 @@ wazuh_custom_packages_installation_api_rpm_url: "https://s3-us-west-1.amazonaws.
# Sources installation # Sources installation
wazuh_manager_sources_installation: wazuh_manager_sources_installation:
enabled: false enabled: false
branch: "v3.12.2" branch: "v3.12.3"
user_language: "en" user_language: "en"
user_no_stop: "y" user_no_stop: "y"
user_install_type: "server" user_install_type: "server"
@ -40,7 +40,7 @@ wazuh_manager_sources_installation:
wazuh_api_sources_installation: wazuh_api_sources_installation:
enabled: false enabled: false
branch: "v3.12.2" branch: "v3.12.3"
update: "y" update: "y"
remove: "y" remove: "y"
directory: null directory: null
@ -152,7 +152,6 @@ wazuh_manager_config:
frequency: 43200 frequency: 43200
scan_on_start: 'yes' scan_on_start: 'yes'
auto_ignore: 'no' auto_ignore: 'no'
alert_new_files: 'yes'
ignore: ignore:
- /etc/mtab - /etc/mtab
- /etc/hosts.deny - /etc/hosts.deny
@ -389,7 +388,6 @@ wazuh_manager_config:
# syscheck: # syscheck:
# frequency: 43200 # frequency: 43200
# scan_on_start: 'yes' # scan_on_start: 'yes'
# alert_new_files: 'yes'
# ignore: # ignore:
# - /etc/mtab # - /etc/mtab
# - /etc/mnttab # - /etc/mnttab
@ -420,7 +418,6 @@ wazuh_manager_config:
# frequency: 43200 # frequency: 43200
# scan_on_start: 'yes' # scan_on_start: 'yes'
# auto_ignore: 'no' # auto_ignore: 'no'
# alert_new_files: 'yes'
# windows_registry: # windows_registry:
# - key: 'HKEY_LOCAL_MACHINE\Software\Classes\batfile' # - key: 'HKEY_LOCAL_MACHINE\Software\Classes\batfile'
# arch: 'both' # arch: 'both'