Merge branch '4.7.1' into merge-4.7.0-into-4.7.1
This commit is contained in:
commit
4f25935861
@ -1,6 +1,12 @@
|
|||||||
# 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.
|
||||||
|
|
||||||
|
## [v4.7.1]
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Update to [Wazuh v4.7.1](https://github.com/wazuh/wazuh/blob/v4.7.1/CHANGELOG.md#v471)
|
||||||
|
|
||||||
## [v4.7.0]
|
## [v4.7.0]
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
@ -16,6 +16,7 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb
|
|||||||
|
|
||||||
| Wazuh version | Elastic | ODFE |
|
| Wazuh version | Elastic | ODFE |
|
||||||
|---------------|---------|--------|
|
|---------------|---------|--------|
|
||||||
|
| v4.7.1 | | |
|
||||||
| v4.7.0 | | |
|
| v4.7.0 | | |
|
||||||
| v4.6.0 | | |
|
| v4.6.0 | | |
|
||||||
| v4.5.4 | | |
|
| v4.5.4 | | |
|
||||||
|
|||||||
4
VERSION
4
VERSION
@ -1,2 +1,2 @@
|
|||||||
WAZUH-ANSIBLE_VERSION="v4.7.0"
|
WAZUH-ANSIBLE_VERSION="v4.7.1"
|
||||||
REVISION="40704"
|
REVISION="40705"
|
||||||
|
|||||||
@ -1,14 +1,13 @@
|
|||||||
---
|
---
|
||||||
filebeat_version: 7.10.2
|
filebeat_version: 7.10.2
|
||||||
|
|
||||||
wazuh_template_branch: v4.7.0
|
wazuh_template_branch: v4.7.1
|
||||||
|
|
||||||
filebeat_node_name: node-1
|
filebeat_node_name: node-1
|
||||||
|
|
||||||
filebeat_output_indexer_hosts:
|
filebeat_output_indexer_hosts:
|
||||||
- "localhost:9200"
|
- "localhost:9200"
|
||||||
|
|
||||||
filebeat_module_package_url: https://packages.wazuh.com/4.x/filebeat
|
|
||||||
filebeat_module_package_name: wazuh-filebeat-0.3.tar.gz
|
filebeat_module_package_name: wazuh-filebeat-0.3.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
|
||||||
|
|||||||
@ -1,4 +1,12 @@
|
|||||||
---
|
---
|
||||||
|
- include_vars: ../../vars/repo_vars.yml
|
||||||
|
|
||||||
|
- include_vars: ../../vars/repo.yml
|
||||||
|
when: packages_repository == 'production'
|
||||||
|
|
||||||
|
- include_vars: ../../vars/repo_pre-release.yml
|
||||||
|
when: packages_repository == 'pre-release'
|
||||||
|
|
||||||
- include_tasks: RedHat.yml
|
- include_tasks: RedHat.yml
|
||||||
when: ansible_os_family == 'RedHat'
|
when: ansible_os_family == 'RedHat'
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
---
|
---
|
||||||
wazuh_agent_version: 4.7.0
|
wazuh_agent_version: 4.7.1
|
||||||
|
|
||||||
# Custom packages installation
|
# Custom packages installation
|
||||||
|
|
||||||
@ -11,7 +11,7 @@ wazuh_custom_packages_installation_agent_rpm_url: ""
|
|||||||
|
|
||||||
wazuh_agent_sources_installation:
|
wazuh_agent_sources_installation:
|
||||||
enabled: false
|
enabled: false
|
||||||
branch: "v4.7.0"
|
branch: "v4.7.1"
|
||||||
user_language: "y"
|
user_language: "y"
|
||||||
user_no_stop: "y"
|
user_no_stop: "y"
|
||||||
user_install_type: "agent"
|
user_install_type: "agent"
|
||||||
|
|||||||
@ -1,4 +1,10 @@
|
|||||||
---
|
---
|
||||||
|
- name: Update apt-get repo and cache
|
||||||
|
apt:
|
||||||
|
update_cache: yes
|
||||||
|
force_apt_get: yes
|
||||||
|
cache_valid_time: 3600
|
||||||
|
|
||||||
- name: Debian/Ubuntu | Install ca-certificates and gnupg
|
- name: Debian/Ubuntu | Install ca-certificates and gnupg
|
||||||
apt:
|
apt:
|
||||||
name:
|
name:
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
---
|
---
|
||||||
wazuh_manager_version: 4.7.0
|
wazuh_manager_version: 4.7.1
|
||||||
|
|
||||||
wazuh_manager_fqdn: "wazuh-server"
|
wazuh_manager_fqdn: "wazuh-server"
|
||||||
wazuh_manager_package_state: present
|
wazuh_manager_package_state: present
|
||||||
@ -12,7 +12,7 @@ wazuh_custom_packages_installation_manager_rpm_url: "https://s3-us-west-1.amazon
|
|||||||
# Sources installation
|
# Sources installation
|
||||||
wazuh_manager_sources_installation:
|
wazuh_manager_sources_installation:
|
||||||
enabled: false
|
enabled: false
|
||||||
branch: "v4.7.0"
|
branch: "v4.7.1"
|
||||||
user_language: "en"
|
user_language: "en"
|
||||||
user_no_stop: "y"
|
user_no_stop: "y"
|
||||||
user_install_type: "server"
|
user_install_type: "server"
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
---
|
---
|
||||||
wazuh_version: 4.7.0
|
wazuh_version: 4.7.1
|
||||||
|
|||||||
@ -6,6 +6,7 @@ wazuh_repo:
|
|||||||
wazuh_winagent_config_url: "https://packages.wazuh.com/4.x/windows/wazuh-agent-{{ wazuh_agent_version }}-1.msi"
|
wazuh_winagent_config_url: "https://packages.wazuh.com/4.x/windows/wazuh-agent-{{ wazuh_agent_version }}-1.msi"
|
||||||
wazuh_winagent_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.msi"
|
wazuh_winagent_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.msi"
|
||||||
wazuh_winagent_sha512_url: "https://packages.wazuh.com/4.x/checksums/wazuh/{{ wazuh_agent_version }}/wazuh-agent-{{ wazuh_agent_version }}-1.msi.sha512"
|
wazuh_winagent_sha512_url: "https://packages.wazuh.com/4.x/checksums/wazuh/{{ wazuh_agent_version }}/wazuh-agent-{{ wazuh_agent_version }}-1.msi.sha512"
|
||||||
|
filebeat_module_package_url: https://packages.wazuh.com/4.x/filebeat
|
||||||
|
|
||||||
certs_gen_tool_version: 4.7
|
certs_gen_tool_version: 4.7
|
||||||
|
|
||||||
|
|||||||
@ -6,6 +6,7 @@ wazuh_repo:
|
|||||||
wazuh_winagent_config_url: "https://packages-dev.wazuh.com/pre-release/windows/wazuh-agent-{{ wazuh_agent_version }}-1.msi"
|
wazuh_winagent_config_url: "https://packages-dev.wazuh.com/pre-release/windows/wazuh-agent-{{ wazuh_agent_version }}-1.msi"
|
||||||
wazuh_winagent_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.msi"
|
wazuh_winagent_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.msi"
|
||||||
wazuh_winagent_sha512_url: "https://packages-dev.wazuh.com/pre-release/checksums/wazuh/{{ wazuh_agent_version }}/wazuh-agent-{{ wazuh_agent_version }}-1.msi.sha512"
|
wazuh_winagent_sha512_url: "https://packages-dev.wazuh.com/pre-release/checksums/wazuh/{{ wazuh_agent_version }}/wazuh-agent-{{ wazuh_agent_version }}-1.msi.sha512"
|
||||||
|
filebeat_module_package_url: https://packages-dev.wazuh.com/pre-release/filebeat
|
||||||
|
|
||||||
certs_gen_tool_version: 4.7
|
certs_gen_tool_version: 4.7
|
||||||
|
|
||||||
|
|||||||
@ -8,12 +8,12 @@ dashboard_node_name: node-1
|
|||||||
dashboard_server_host: "0.0.0.0"
|
dashboard_server_host: "0.0.0.0"
|
||||||
dashboard_server_port: "443"
|
dashboard_server_port: "443"
|
||||||
dashboard_server_name: "dashboard"
|
dashboard_server_name: "dashboard"
|
||||||
wazuh_version: 4.7.0
|
wazuh_version: 4.7.1
|
||||||
indexer_cluster_nodes:
|
indexer_cluster_nodes:
|
||||||
- 127.0.0.1
|
- 127.0.0.1
|
||||||
|
|
||||||
# The Wazuh dashboard package repository
|
# The Wazuh dashboard package repository
|
||||||
dashboard_version: "4.7.0"
|
dashboard_version: "4.7.1"
|
||||||
|
|
||||||
# API credentials
|
# API credentials
|
||||||
wazuh_api_credentials:
|
wazuh_api_credentials:
|
||||||
|
|||||||
@ -16,7 +16,7 @@
|
|||||||
# https://documentation.wazuh.com/current/installation-guide/index.html
|
# https://documentation.wazuh.com/current/installation-guide/index.html
|
||||||
#
|
#
|
||||||
# Also, you can check our repository:
|
# Also, you can check our repository:
|
||||||
# https://github.com/wazuh/wazuh-dashboard
|
# https://github.com/wazuh/wazuh-dashboard-plugins
|
||||||
#
|
#
|
||||||
# ------------------------------- Index patterns -------------------------------
|
# ------------------------------- Index patterns -------------------------------
|
||||||
#
|
#
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
---
|
---
|
||||||
dashboard_version: 4.7.0
|
dashboard_version: 4.7.1
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
---
|
---
|
||||||
# Cluster Settings
|
# Cluster Settings
|
||||||
indexer_version: 4.7.0
|
indexer_version: 4.7.1
|
||||||
|
|
||||||
single_node: false
|
single_node: false
|
||||||
indexer_node_name: node-1
|
indexer_node_name: node-1
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user