Skip to content

Commit

Permalink
Merge pull request #627 from wazuh/4.2.1
Browse files Browse the repository at this point in the history
4.2.1 tag update
  • Loading branch information
alberpilot authored Sep 10, 2021
2 parents 691be0e + 29e8415 commit ef91fbe
Show file tree
Hide file tree
Showing 16 changed files with 31 additions and 24 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.2.1]

### Added

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

## [v4.2.0]

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

| Wazuh version | Elastic | ODFE |
|---------------|---------|--------|
| v4.2.1 | 7.10.2 | 1.13.2 |
| v4.2.0 | 7.10.2 | 1.13.2 |
| v4.1.5 | 7.10.2 | 1.13.2 |
| v4.1.4 | 7.10.0 | 1.12.0 |
Expand Down
2 changes: 1 addition & 1 deletion molecule/default/tests/test_default.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

def get_wazuh_version():
"""This return the version of Wazuh."""
return "4.2.0"
return "4.2.1"


def test_wazuh_packages_are_installed(host):
Expand Down
6 changes: 3 additions & 3 deletions molecule/distributed-wazuh-elk-xpack/group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ elastic_stack_version: 7.10.2
filebeat_version: 7.10.2

# Debian packages need the ${VERSION}-1
wazuh_manager_version: 4.2.0-1
wazuh_agent_version: 4.2.0-1
wazuh_manager_version: 4.2.1-1
wazuh_agent_version: 4.2.1-1

# Kibana role appends it automatically.
wazuh_version: 4.2.0
wazuh_version: 4.2.1


########################################################
Expand Down
2 changes: 1 addition & 1 deletion molecule/distributed-wazuh-elk-xpack/tests/test_default.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

def get_wazuh_version():
"""This return the version of Wazuh."""
return "4.2.0"
return "4.2.1"


def test_wazuh_packages_are_installed(host):
Expand Down
6 changes: 3 additions & 3 deletions molecule/distributed-wazuh-elk/group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ elastic_stack_version: 7.10.2
filebeat_version: 7.10.2

# Debian packages need the ${VERSION}-1
wazuh_manager_version: 4.2.0-1
wazuh_agent_version: 4.2.0-1
wazuh_manager_version: 4.2.1-1
wazuh_agent_version: 4.2.1-1

# Kibana role appends it automatically.
wazuh_version: 4.2.0
wazuh_version: 4.2.1
2 changes: 1 addition & 1 deletion molecule/distributed-wazuh-elk/tests/test_default.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

def get_wazuh_version():
"""This return the version of Wazuh."""
return "4.2.0"
return "4.2.1"


def test_wazuh_packages_are_installed(host):
Expand Down
6 changes: 3 additions & 3 deletions molecule/distributed-wazuh-odfe/group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ filebeat_version: 7.10.2
kibana_opendistro_version: 1.13.2-1

# Debian packages need the ${VERSION}-1
wazuh_manager_version: 4.2.0-1
wazuh_agent_version: 4.2.0-1
wazuh_manager_version: 4.2.1-1
wazuh_agent_version: 4.2.1-1

# Kibana role appends it automatically.
wazuh_version: 4.2.0
wazuh_version: 4.2.1
2 changes: 1 addition & 1 deletion molecule/distributed-wazuh-odfe/tests/test_default.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

def get_wazuh_version():
"""This return the version of Wazuh."""
return "4.2.0"
return "4.2.1"


def test_wazuh_packages_are_installed(host):
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "wazuh-ansible"
version = "4.2.0"
version = "4.2.1"
description = ""
authors = ["neonmei <[email protected]>"]

Expand Down
2 changes: 1 addition & 1 deletion roles/elastic-stack/ansible-kibana/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ kibana_server_host: "0.0.0.0"
kibana_server_port: "5601"
kibana_conf_path: /etc/kibana
elastic_stack_version: 7.10.2
wazuh_version: 4.2.0
wazuh_version: 4.2.1
wazuh_app_url: https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana

elasticrepo:
Expand Down
2 changes: 1 addition & 1 deletion roles/opendistro/opendistro-kibana/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ kibana_server_port: "5601"
kibana_server_name: "kibana"
kibana_max_payload_bytes: 1048576
elastic_stack_version: 7.10.2
wazuh_version: 4.2.0
wazuh_version: 4.2.1
wazuh_app_url: https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana

# The OpenDistro package repository
Expand Down
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.2.0
wazuh_template_branch: v4.2.1

filebeat_output_elasticsearch_hosts:
- "localhost:9200"
Expand Down
2 changes: 1 addition & 1 deletion roles/wazuh/ansible-filebeat/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.2.0
wazuh_template_branch: v4.2.1

filebeat_create_config: true

Expand Down
8 changes: 4 additions & 4 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.2.0-1
wazuh_agent_version: 4.2.1-1


# Custom packages installation
Expand All @@ -12,7 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: ""

wazuh_agent_sources_installation:
enabled: false
branch: "v4.2.0"
branch: "v4.2.1"
user_language: "y"
user_no_stop: "y"
user_install_type: "agent"
Expand Down Expand Up @@ -55,8 +55,8 @@ wazuh_winagent_config:
auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe
check_md5: True
md5: 8ffa75d13280f1aa6ffca54f4273df4d
wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.2.0-1.msi
wazuh_winagent_package_name: wazuh-agent-4.2.0-1.msi
wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.2.1-1.msi
wazuh_winagent_package_name: wazuh-agent-4.2.1-1.msi

wazuh_dir: "/var/ossec"

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.2.0-1
wazuh_manager_version: 4.2.1-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.2.0"
branch: "v4.2.1"
user_language: "en"
user_no_stop: "y"
user_install_type: "server"
Expand Down

0 comments on commit ef91fbe

Please sign in to comment.