Skip to content

Commit

Permalink
Merge pull request wazuh#888 from wazuh/bump-master-46
Browse files Browse the repository at this point in the history
Bump master to 4.6
  • Loading branch information
teddytpc1 committed Feb 1, 2023
2 parents 1317a9a + 2d0aa67 commit 970263a
Show file tree
Hide file tree
Showing 11 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.6.0]

### Added

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

## [v4.5.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.6.0 | | |
| v4.5.0 | | |
| v4.4.0 | | |
| v4.3.10 | | |
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.5.0"
REVISION="40500"
WAZUH-ANSIBLE_VERSION="v4.6.0"
REVISION="40600"
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: 4.5
wazuh_template_branch: 4.6

filebeat_node_name: node-1

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.5.0
wazuh_agent_version: 4.6.0

# Custom packages installation

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

wazuh_agent_sources_installation:
enabled: false
branch: "v4.5.0"
branch: "v4.6.0"
user_language: "y"
user_no_stop: "y"
user_install_type: "agent"
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.5.0
wazuh_manager_version: 4.6.0

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.5.0"
branch: "v4.6.0"
user_language: "en"
user_no_stop: "y"
user_install_type: "server"
Expand Down
2 changes: 1 addition & 1 deletion roles/wazuh/vars/repo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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"

certs_gen_tool_version: 4.5
certs_gen_tool_version: 4.6

# 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 @@ -6,7 +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"

certs_gen_tool_version: 4.5
certs_gen_tool_version: 4.6

# 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.5.0
wazuh_version: 4.6.0
indexer_cluster_nodes:
- 127.0.0.1

# The Wazuh dashboard package repository
dashboard_version: "4.5.0"
dashboard_version: "4.6.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.5.0
dashboard_version: 4.6.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.5.0
indexer_version: 4.6.0

single_node: false
indexer_node_name: node-1
Expand Down

0 comments on commit 970263a

Please sign in to comment.