Skip to content

Commit

Permalink
Merge branch '4.7.1' into merge-4.7.0-into-4.7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
teddytpc1 authored Nov 23, 2023
2 parents 7bbed79 + c5fd54f commit 4f25935
Show file tree
Hide file tree
Showing 15 changed files with 36 additions and 14 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# Change Log
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]

### Added
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb

| Wazuh version | Elastic | ODFE |
|---------------|---------|--------|
| v4.7.1 | | |
| v4.7.0 | | |
| v4.6.0 | | |
| v4.5.4 | | |
Expand Down
4 changes: 2 additions & 2 deletions VERSION
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
WAZUH-ANSIBLE_VERSION="v4.7.0"
REVISION="40704"
WAZUH-ANSIBLE_VERSION="v4.7.1"
REVISION="40705"
3 changes: 1 addition & 2 deletions roles/wazuh/ansible-filebeat-oss/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
---
filebeat_version: 7.10.2

wazuh_template_branch: v4.7.0
wazuh_template_branch: v4.7.1

filebeat_node_name: node-1

filebeat_output_indexer_hosts:
- "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_path: /tmp/
filebeat_module_destination: /usr/share/filebeat/module
Expand Down
8 changes: 8 additions & 0 deletions roles/wazuh/ansible-filebeat-oss/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -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
when: ansible_os_family == 'RedHat'

Expand Down
4 changes: 2 additions & 2 deletions roles/wazuh/ansible-wazuh-agent/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
wazuh_agent_version: 4.7.0
wazuh_agent_version: 4.7.1

# Custom packages installation

Expand All @@ -11,7 +11,7 @@ wazuh_custom_packages_installation_agent_rpm_url: ""

wazuh_agent_sources_installation:
enabled: false
branch: "v4.7.0"
branch: "v4.7.1"
user_language: "y"
user_no_stop: "y"
user_install_type: "agent"
Expand Down
6 changes: 6 additions & 0 deletions roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml
Original file line number Diff line number Diff line change
@@ -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
apt:
name:
Expand Down
4 changes: 2 additions & 2 deletions roles/wazuh/ansible-wazuh-manager/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
wazuh_manager_version: 4.7.0
wazuh_manager_version: 4.7.1

wazuh_manager_fqdn: "wazuh-server"
wazuh_manager_package_state: present
Expand All @@ -12,7 +12,7 @@ wazuh_custom_packages_installation_manager_rpm_url: "https://s3-us-west-1.amazon
# Sources installation
wazuh_manager_sources_installation:
enabled: false
branch: "v4.7.0"
branch: "v4.7.1"
user_language: "en"
user_no_stop: "y"
user_install_type: "server"
Expand Down
2 changes: 1 addition & 1 deletion roles/wazuh/check-packages/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
wazuh_version: 4.7.0
wazuh_version: 4.7.1
1 change: 1 addition & 0 deletions roles/wazuh/vars/repo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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_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"
filebeat_module_package_url: https://packages.wazuh.com/4.x/filebeat

certs_gen_tool_version: 4.7

Expand Down
1 change: 1 addition & 0 deletions roles/wazuh/vars/repo_pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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_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"
filebeat_module_package_url: https://packages-dev.wazuh.com/pre-release/filebeat

certs_gen_tool_version: 4.7

Expand Down
4 changes: 2 additions & 2 deletions roles/wazuh/wazuh-dashboard/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ dashboard_node_name: node-1
dashboard_server_host: "0.0.0.0"
dashboard_server_port: "443"
dashboard_server_name: "dashboard"
wazuh_version: 4.7.0
wazuh_version: 4.7.1
indexer_cluster_nodes:
- 127.0.0.1

# The Wazuh dashboard package repository
dashboard_version: "4.7.0"
dashboard_version: "4.7.1"

# API credentials
wazuh_api_credentials:
Expand Down
2 changes: 1 addition & 1 deletion roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# https://documentation.wazuh.com/current/installation-guide/index.html
#
# Also, you can check our repository:
# https://github.com/wazuh/wazuh-dashboard
# https://github.com/wazuh/wazuh-dashboard-plugins
#
# ------------------------------- Index patterns -------------------------------
#
Expand Down
2 changes: 1 addition & 1 deletion roles/wazuh/wazuh-dashboard/vars/debian.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
dashboard_version: 4.7.0
dashboard_version: 4.7.1
2 changes: 1 addition & 1 deletion roles/wazuh/wazuh-indexer/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# Cluster Settings
indexer_version: 4.7.0
indexer_version: 4.7.1

single_node: false
indexer_node_name: node-1
Expand Down

0 comments on commit 4f25935

Please sign in to comment.