Merge branch '3.7' into Issue_95-default_configuration

CHANGELOG.md

@@ -1,25 +1,32 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## v3.7.0-37xx
+## [v3.7.2]
+
+
+
+## [v3.7.1]
 
 ### Added
 
- - include template local_internal_options.conf ([#87](https://github.com/wazuh/wazuh-ansible/pull/87))
+ - include template local_internal_options.conf. ([#87](https://github.com/wazuh/wazuh-ansible/pull/87))
- - Add multiple Elasticsearch IPs for Logstash reports.([#92](https://github.com/wazuh/wazuh-ansible/pull/92))
+ - Add multiple Elasticsearch IPs for Logstash reports. ([#92](https://github.com/wazuh/wazuh-ansible/pull/92))
 
 ### Changed
 
- - Changed windows agent version ([#89](https://github.com/wazuh/wazuh-ansible/pull/89))
+ - Changed windows agent version. ([#89](https://github.com/wazuh/wazuh-ansible/pull/89))
+ - Updating to Elastic Stack to 6.5.3 and Wazuh 3.7.1. ([#108](https://github.com/wazuh/wazuh-ansible/pull/108))
  
 ### Fixed
 
-- Solve the conflict betwwen tha agent configuration and the shared master configuration. Also include monitoring for `/var/log/auth.log` ([#90](https://github.com/wazuh/wazuh-ansible/pull/90))
+- Solve the conflict betwwen tha agent configuration and the shared master configuration. Also include monitoring for `/var/log/auth.log`. ([#90](https://github.com/wazuh/wazuh-ansible/pull/90))
-- Moved custom_ruleset files ([#98](https://github.com/wazuh/wazuh-ansible/pull/98))
+- Moved custom_ruleset files. ([#98](https://github.com/wazuh/wazuh-ansible/pull/98))
+- Add authlog fix to localfile. ([#99](https://github.com/wazuh/wazuh-ansible/pull/99))
+- Exceptions reload systemd. ([#114](https://github.com/wazuh/wazuh-ansible/pull/114))
 
 ### Removed
 
-- clean old code for windows agent ([#86](https://github.com/wazuh/wazuh-ansible/pull/86))
+- clean old code for windows agent. ([#86](https://github.com/wazuh/wazuh-ansible/pull/86))
 
 ## v3.7.0-3701
 

VERSION

@@ -1,2 +1,2 @@
-WAZUH-ANSIBLE_VERSION="v3.7.0"
+WAZUH-ANSIBLE_VERSION="v3.7.1"
-REVISION="3708"
+REVISION="3711"

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

@@ -71,7 +71,10 @@
 - name: Reload systemd
   systemd: daemon_reload=yes
   ignore_errors: yes
-  when: not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA")
+  when: 
+    - not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA")
+    - not (ansible_distribution == "Ubuntu" and ansible_distribution_version is version('15.04', '<'))
+    - not (ansible_distribution == "Debian" and ansible_distribution_version is version('8', '<'))
 
 - name: Ensure Elasticsearch started and enabled
   service:

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

@@ -5,3 +5,4 @@ kibana_server_host: "0.0.0.0"
 kibana_server_port: "5601"
 elastic_stack_version: 6.5.4
 wazuh_version: 3.7.2
+

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

@@ -12,7 +12,10 @@
 - name: Reload systemd
   systemd: daemon_reload=yes
   ignore_errors: yes
-  when: not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA")
+  when:
+    - not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA")
+    - not (ansible_distribution == "Ubuntu" and ansible_distribution_version is version('15.04', '<'))
+    - not (ansible_distribution == "Debian" and ansible_distribution_version is version('8', '<'))
 
 - name: Kibana configuration
   template:

roles/elastic-stack/ansible-logstash/tasks/main.yml

@@ -11,7 +11,10 @@
 - name: Reload systemd
   systemd: daemon_reload=yes
   ignore_errors: yes
-  when: not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA")
+  when:
+    - not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA")
+    - not (ansible_distribution == "Ubuntu" and ansible_distribution_version is version('15.04', '<'))
+    - not (ansible_distribution == "Debian" and ansible_distribution_version is version('8', '<'))
 
 - name: Amazon Linux create service
   shell: /usr/share/logstash/bin/system-install /etc/logstash/startup.options

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

@@ -16,7 +16,10 @@
 - name: Reload systemd
   systemd: daemon_reload=yes
   ignore_errors: yes
-  when: not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA")
+  when:
+    - not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA")
+    - not (ansible_distribution == "Ubuntu" and ansible_distribution_version is version('15.04', '<'))
+    - not (ansible_distribution == "Debian" and ansible_distribution_version is version('8', '<'))
 
 - name: Ensure Filebeat is started and enabled at boot.
   service: