Merge branch '3.9.5_7.2.1'

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [v3.9.5_7.2.1]
+
+### Added 
+
+- Update to Wazuh v3.9.5
+- Update to Elastic Stack to v7.2.1
+
 ## [v3.9.4_7.2.0]
 
 ### Added 

VERSION

@@ -1,2 +1,2 @@
-WAZUH-ANSIBLE_VERSION="v3.9.4"
+WAZUH-ANSIBLE_VERSION="v3.9.5"
-REVISION="3940"
+REVISION="3950"

molecule/default/molecule.yml

@@ -57,7 +57,7 @@ scenario:
     - create
     - prepare
     - converge
-    # - idempotence
+    - idempotence
     - side_effect
     - verify
     - cleanup

molecule/default/tests/test_default.py

@@ -9,7 +9,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
 
 def get_wazuh_version():
     """This return the version of Wazuh."""
-    return "3.9.4"
+    return "3.9.5"
 
 
 def test_wazuh_packages_are_installed(host):

molecule/elasticsearch/molecule.yml

@@ -9,20 +9,20 @@ lint:
     config-data:
       ignore: .virtualenv
 platforms:
-  - name: bionic
+  #- name: bionic
-    image: solita/ubuntu-systemd:bionic
+  #  image: solita/ubuntu-systemd:bionic
-    command: /sbin/init
+  #  command: /sbin/init
-    ulimits:
+  #  ulimits:
-      - nofile:262144:262144
+  #    - nofile:262144:262144
-    privileged: true
+  #  privileged: true
-    memory_reservation: 2048m
+  #  memory_reservation: 2048m
-  - name: xenial
+  #- name: xenial
-    image: solita/ubuntu-systemd:xenial
+  #  image: solita/ubuntu-systemd:xenial
-    privileged: true
+  #  privileged: true
-    memory_reservation: 2048m
+  #  memory_reservation: 2048m
-    command: /sbin/init
+  #  command: /sbin/init
-    ulimits:
+  #  ulimits:
-      - nofile:262144:262144
+  #    - nofile:262144:262144
   #- name: trusty
   #image: ubuntu:trusty
   #privileged: true

molecule/elasticsearch/tests/test_default.py

@@ -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.0')
+    assert elasticsearch.version.startswith('7.2.1')
 
 
 def test_elasticsearch_is_running(host):

molecule/filebeat/tests/test_default.py

@@ -10,4 +10,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.0')
+    assert filebeat.version.startswith('7.2.1')

molecule/kibana/tests/test_default.py

@@ -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.0")
+    assert kibana.contains("7.2.1")
 
 
 def test_wazuh_plugin_installed(host):

molecule/wazuh-agent/tests/test_agents.py

@@ -9,7 +9,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
 
 def get_wazuh_version():
     """This return the version of Wazuh."""
-    return "3.9.4"
+    return "3.9.5"
 
 
 def test_ossec_package_installed(Package):

roles/elastic-stack/ansible-elasticsearch/defaults/main.yml

@@ -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.0
+elastic_stack_version: 7.2.1
 single_node: true
 elasticsearch_bootstrap_node: false
 elasticsearch_master_candidate: false

roles/elastic-stack/ansible-kibana/defaults/main.yml

@@ -5,8 +5,8 @@ elasticsearch_http_port: "9200"
 elasticsearch_network_host: "127.0.0.1"
 kibana_server_host: "0.0.0.0"
 kibana_server_port: "5601"
-elastic_stack_version: 7.2.0
+elastic_stack_version: 7.2.1
-wazuh_version: 3.9.4
+wazuh_version: 3.9.5
 
 # Xpack Security
 kibana_xpack_security: false

roles/wazuh/ansible-filebeat/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-filebeat_version: 7.2.0
+filebeat_version: 7.2.1
 
 filebeat_create_config: true
 

roles/wazuh/ansible-wazuh-agent/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-wazuh_agent_version: 3.9.4
+wazuh_agent_version: 3.9.5
 wazuh_managers:
   - address: 127.0.0.1
     port: 1514
@@ -24,7 +24,7 @@ wazuh_winagent_config:
   install_dir_x86: 'C:\Program Files (x86)\ossec-agent\'
   auth_path: C:\'Program Files'\ossec-agent\agent-auth.exe
   auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe
-  version: '3.9.4'
+  version: '3.9.5'
   revision: '1'
   repo: https://packages.wazuh.com/3.x/windows/
   md5: c3fdbd6c121ca371b8abcd477ed4e8a4

roles/wazuh/ansible-wazuh-manager/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-wazuh_manager_api_version: 3.9.4
+wazuh_manager_api_version: 3.9.5
 
 wazuh_manager_fqdn: "wazuh-server"
 wazuh_manager_package_state: latest