Skip to content

Commit

Permalink
Merge branch '4.10.0' into merge-4.9.2-into-4.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
teddytpc1 authored Nov 4, 2024
2 parents 4c0931c + df3864a commit b465a0a
Show file tree
Hide file tree
Showing 13 changed files with 20 additions and 13 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.10.0]

### Added

- Update to [Wazuh v4.10.0](https://github.com/wazuh/wazuh/blob/v4.10.0/CHANGELOG.md#v4100)

## [v4.9.2]

### 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.10.0 | | |
| v4.9.2 | | |
| v4.9.1 | | |
| v4.9.0 | | |
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.9.2"
REVISION="40921"
WAZUH-ANSIBLE_VERSION="v4.10.0"
REVISION="41003"
2 changes: 1 addition & 1 deletion roles/wazuh/ansible-filebeat-oss/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
filebeat_version: 7.10.2

wazuh_template_branch: v4.9.2
wazuh_template_branch: v4.10.0

filebeat_node_name: node-1

Expand Down
2 changes: 1 addition & 1 deletion 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.9.2
wazuh_agent_version: 4.10.0

# Custom packages installation

Expand Down
2 changes: 1 addition & 1 deletion 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.9.2
wazuh_manager_version: 4.10.0

wazuh_manager_fqdn: "wazuh-server"
wazuh_manager_package_state: present
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.9.2
wazuh_version: 4.10.0
2 changes: 1 addition & 1 deletion roles/wazuh/vars/repo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ wazuh_macos_arm_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.arm64.pkg
wazuh_macos_intel_package_url: "https://packages.wazuh.com/4.x/macos/{{ wazuh_macos_intel_package_name }}"
wazuh_macos_arm_package_url: "https://packages.wazuh.com/4.x/macos/{{ wazuh_macos_arm_package_name }}"

certs_gen_tool_version: 4.9
certs_gen_tool_version: "4.10"

# Url of certificates generator tool
certs_gen_tool_url: "https://packages.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh"
2 changes: 1 addition & 1 deletion roles/wazuh/vars/repo_pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ wazuh_macos_arm_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.arm64.pkg
wazuh_macos_intel_package_url: "https://packages-dev.wazuh.com/pre-release/{{ wazuh_macos_intel_package_name }}"
wazuh_macos_arm_package_url: "https://packages-dev.wazuh.com/pre-release/macos/{{ wazuh_macos_arm_package_name }}"

certs_gen_tool_version: 4.9
certs_gen_tool_version: "4.10"

# Url of certificates generator tool
certs_gen_tool_url: "https://packages-dev.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh"
2 changes: 1 addition & 1 deletion roles/wazuh/vars/repo_staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ wazuh_macos_arm_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.arm64.pkg
wazuh_macos_intel_package_url: "https://packages-dev.wazuh.com/staging/macos/{{ wazuh_macos_intel_package_name }}"
wazuh_macos_arm_package_url: "https://packages-dev.wazuh.com/staging/macos/{{ wazuh_macos_arm_package_name }}"

certs_gen_tool_version: 4.9
certs_gen_tool_version: "4.10"

# Url of certificates generator tool
certs_gen_tool_url: "https://packages-dev.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh"
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.9.2
wazuh_version: 4.10.0
indexer_cluster_nodes:
- 127.0.0.1

# The Wazuh dashboard package repository
dashboard_version: "4.9.2"
dashboard_version: "4.10.0"

# API credentials
wazuh_api_credentials:
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.9.1
dashboard_version: 4.10.0
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.9.2
indexer_version: 4.10.0

single_node: false
indexer_node_name: node-1
Expand Down

0 comments on commit b465a0a

Please sign in to comment.