Skip to content

Commit

Permalink
Merge pull request #237 from wazuh/3.10_7.3.2-release
Browse files Browse the repository at this point in the history
Wazuh Release 3.10 7.3.2
  • Loading branch information
Manuel J. Bernal committed Sep 18, 2019
2 parents 39bb001 + 61740eb commit c7c15f6
Show file tree
Hide file tree
Showing 17 changed files with 2,172 additions and 2,334 deletions.
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,26 @@
# Change Log
All notable changes to this project will be documented in this file.

## [v3.10.0_7.3.2]

### Added

- Update to Wazuh v3.10.0

### Changed

- Updated Kibana [@jm404](https://github.com/jm404) [#237](https://github.com/wazuh/wazuh-ansible/pull/237)
- Updated agent.conf template [@moodymob](https://github.com/moodymob) [#222](https://github.com/wazuh/wazuh-ansible/pull/222)
- Improved molecule tests [@rshad](https://github.com/rshad) [#223](https://github.com/wazuh/wazuh-ansible/pull/223/files)
- Moved "run_cluster_mode.sh" script to molecule folder [@jm404](https://github.com/jm404) [#a9d2c52](https://github.com/wazuh/wazuh-ansible/commit/a9d2c5201047c273c2c4fead5a54e576111da455)

### Fixed

- Fixed typo in the `agent.conf` template [@joey1a2b3c](https://github.com/joey1a2b3c) [#227](https://github.com/wazuh/wazuh-ansible/pull/227)
- Updated conditionals in tasks to fix Amazon Linux installation [@jm404](https://github.com/jm404) [#229](https://github.com/wazuh/wazuh-ansible/pull/229)
- Fixed Kibana installation in Amazon Linux [@jm404](https://github.com/jm404) [#232](https://github.com/wazuh/wazuh-ansible/pull/232)
- Fixed Windows Agent installation and configuration [@jm404](https://github.com/jm404) [#234](https://github.com/wazuh/wazuh-ansible/pull/234)

## [v3.9.5_7.2.1]

### Added
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="v3.9.5"
REVISION="3950"
WAZUH-ANSIBLE_VERSION="v3.10.0"
REVISION="31000"
4 changes: 2 additions & 2 deletions molecule/default/tests/test_default.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

def get_wazuh_version():
"""This return the version of Wazuh."""
return "3.9.5"
return "3.10.0"


def test_wazuh_packages_are_installed(host):
Expand Down Expand Up @@ -86,4 +86,4 @@ def test_filebeat_is_installed(host):
"""Test if the elasticsearch package is installed."""
filebeat = host.package("filebeat")
assert filebeat.is_installed
assert filebeat.version.startswith('7.2.1')
assert filebeat.version.startswith('7.3.2')
2 changes: 1 addition & 1 deletion molecule/elasticsearch/tests/test_default.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def test_elasticsearch_is_installed(host):
"""Test if the elasticsearch package is installed."""
elasticsearch = host.package("elasticsearch")
assert elasticsearch.is_installed
assert elasticsearch.version.startswith('7.2.1')
assert elasticsearch.version.startswith('7.3.2')


def test_elasticsearch_is_running(host):
Expand Down
2 changes: 1 addition & 1 deletion molecule/kibana/tests/test_default.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def test_port_kibana_is_open(host):
def test_find_correct_elasticsearch_version(host):
"""Test if we find the kibana/elasticsearch version in package.json"""
kibana = host.file("/usr/share/kibana/plugins/wazuh/package.json")
assert kibana.contains("7.2.1")
assert kibana.contains("7.3.2")


def test_wazuh_plugin_installed(host):
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion molecule/wazuh-agent/tests/test_agents.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

def get_wazuh_version():
"""This return the version of Wazuh."""
return "3.9.5"
return "3.10.0"


def test_ossec_package_installed(Package):
Expand Down
4 changes: 2 additions & 2 deletions molecule/worker/tests/test_default.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

def get_wazuh_version():
"""This return the version of Wazuh."""
return "3.9.5"
return "3.10.0"


def test_wazuh_packages_are_installed(host):
Expand Down Expand Up @@ -82,4 +82,4 @@ def test_filebeat_is_installed(host):
"""Test if the elasticsearch package is installed."""
filebeat = host.package("filebeat")
assert filebeat.is_installed
assert filebeat.version.startswith('7.2.1')
assert filebeat.version.startswith('7.3.2')
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ elasticsearch_node_name: node-1
elasticsearch_http_port: 9200
elasticsearch_network_host: 127.0.0.1
elasticsearch_jvm_xms: null
elastic_stack_version: 7.2.1
elastic_stack_version: 7.3.2
single_node: true
elasticsearch_bootstrap_node: false
elasticsearch_master_candidate: false
Expand Down
Loading

0 comments on commit c7c15f6

Please sign in to comment.