Merge pull request #667 from wazuh/665-tag4.2.5-to-master

Merge 4.2 into master (release v4.2.5)

CHANGELOG.md

@@ -7,6 +7,12 @@ All notable changes to this project will be documented in this file.
 
 - Update to [Wazuh v4.3.0](https://github.com/wazuh/wazuh/blob/v4.3.0/CHANGELOG.md#v430)
 
+## [v4.2.5]
+
+### Added
+
+- Update to [Wazuh v4.2.5](https://github.com/wazuh/wazuh/blob/v4.2.5/CHANGELOG.md#v425)
+
 ## [v4.2.4]
 
 ### Added

README.md

@@ -16,6 +16,8 @@ These playbooks install and configure Wazuh agent, manager and Elastic Stack.
 | Wazuh version | Elastic | ODFE   |
 |---------------|---------|--------|
 | v4.3.0        | 7.10.2  | 1.13.2 |
+| v4.2.5        | 7.10.2  | 1.13.2 |
+| v4.2.4        | 7.10.2  | 1.13.2 |
 | v4.2.3        | 7.10.2  | 1.13.2 |
 | v4.2.2        | 7.10.2  | 1.13.2 |
 | v4.2.1        | 7.10.2  | 1.13.2 |

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

@@ -7,6 +7,7 @@ elasticsearch_jvm_xms: null
 elastic_stack_version: 7.10.2
 elasticsearch_lower_disk_requirements: false
 elasticsearch_path_repo: []
+elasticsearch_start_timeout: 90
 
 elasticrepo:
   apt: 'https://artifacts.elastic.co/packages/7.x/apt'

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

@@ -107,6 +107,14 @@
     - ansible_distribution == "Ubuntu"
     - ansible_distribution_major_version | int == 14
 
+- name: Ensure extra time for Elasticsearch to start on reboots
+  lineinfile:
+    path: /usr/lib/systemd/system/elasticsearch.service
+    regexp: '^TimeoutStartSec='
+    line: "TimeoutStartSec={{ elasticsearch_start_timeout }}"
+  become: yes
+  tags: configure
+
 - name: Ensure Elasticsearch started and enabled
   service:
     name: elasticsearch
@@ -160,3 +168,9 @@
   failed_when: http_response.status != 200
   when:
     - elasticsearch_xpack_users is defined
+
+- name: Reload systemd configuration
+  systemd:
+    daemon_reload: true
+  become: yes
+  notify: restart elasticsearch

roles/opendistro/opendistro-elasticsearch/defaults/main.yml

@@ -10,6 +10,7 @@ elasticsearch_network_host: '0.0.0.0'
 elasticsearch_node_master: true
 elasticsearch_node_data: true
 elasticsearch_node_ingest: true
+elasticsearch_start_timeout: 90
 
 elasticsearch_lower_disk_requirements: false
 elasticsearch_cluster_nodes:

roles/opendistro/opendistro-elasticsearch/tasks/main.yml

@@ -55,6 +55,14 @@
       notify: restart elasticsearch
       tags: install
 
+    - name: Ensure extra time for Elasticsearch to start on reboots
+      lineinfile:
+        path: /usr/lib/systemd/system/elasticsearch.service
+        regexp: '^TimeoutStartSec='
+        line: "TimeoutStartSec={{ elasticsearch_start_timeout }}"
+      become: yes
+      tags: configure
+
     - name: Ensure Elasticsearch started and enabled
       service:
         name: elasticsearch
@@ -101,4 +109,10 @@
 
     - import_tasks: "RMRedHat.yml"
       when: ansible_os_family == "RedHat"
+
+    - name: Reload systemd configuration
+      systemd:
+        daemon_reload: true
+      become: yes
+      notify: restart elasticsearch
   when: perform_installation