645-tag4.2.4-to-master

CHANGELOG.md

@@ -7,11 +7,17 @@ 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.4]
+
+### Added
+
+- Update to [Wazuh v4.2.4](https://github.com/wazuh/wazuh/blob/v4.2.4/CHANGELOG.md#v424)
+
 ## [v4.2.3]
 
 ### Added
 
-- Update to [Wazuh v4.2.3](https://github.com/wazuh/wazuh/blob/v4.2.3/CHANGELOG.md#v420)
+- Update to [Wazuh v4.2.3](https://github.com/wazuh/wazuh/blob/v4.2.3/CHANGELOG.md#v423)
 
 ## [v4.2.2]
 

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

@@ -1,20 +1,33 @@
 
 ---
 
-#- name: Install OpenDistro dependencies
-#  apt:
-#    name: [
-#      'unzip', 'wget', 'curl',
-#      'apt-transport-https', software-properties-common
-#    ]
-#    state: present
+- name: Update cache
+  apt:
+    update_cache: yes
+  when: (ansible_facts['distribution'] == "Debian" and ansible_facts['distribution_major_version'] == "9")
 
-- name: Add openjdk repository
+- name: Debian 9 (Stretch)
+  when: (ansible_facts['distribution'] == "Debian" and ansible_facts['distribution_major_version'] == "9")
+  block:
+  
+    - name: Install OpenDistro dependencies
+      apt:
+        name: [
+          'unzip', 'wget', 'curl', 'apt-transport-https', software-properties-common
+        ]
+        state: present
+
+    - name: Add the repository key for Debian's Stretch Backports repository
+      ansible.builtin.apt_key:
+        keyserver: keyserver.ubuntu.com
+        id: 648ACFD622F3D138
+    
+    - name: Add openjdk repository
       apt_repository:
         repo: "{{ package_repos.apt.openjdk.baseurl }}"
         state: present
         update_cache: yes
-  when: (ansible_facts['distribution'] == "Debian" and ansible_facts['distribution_major_version'] == "9")
+        filename: 'wazuh-openjdk'
 
 - name: Install openjdk-11-jdk
   apt:
@@ -34,6 +47,7 @@
       apt_repository:
         repo: "{{ package_repos.apt.opendistro.baseurl }}"
         state: present
+        filename: 'wazuh-opendistro'
         update_cache: yes
 
 - name: Install OpenDistro

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

@@ -17,6 +17,11 @@
       ignore_errors: true
       args:
         chdir: /usr/share/elasticsearch/bin/
+      register: remove_elasticsearch_performance_analyzer
+      failed_when:
+        - remove_elasticsearch_performance_analyzer.rc != 0
+        - '"not found" not in remove_elasticsearch_performance_analyzer.stderr'
+      changed_when: "remove_elasticsearch_performance_analyzer.rc == 0"
 
     - name: Remove elasticsearch configuration file
       file:

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

@@ -1,4 +1,8 @@
 ---
+<<<<<<< HEAD
+=======
+wazuh_agent_version: 4.2.4-1
+>>>>>>> 4.2
 
 wazuh_agent_version: 4.3.0-1
 
@@ -12,7 +16,11 @@ wazuh_custom_packages_installation_agent_rpm_url: ""
 
 wazuh_agent_sources_installation:
   enabled: false
+<<<<<<< HEAD
   branch: "v4.3.0"
+=======
+  branch: "v4.2.4"
+>>>>>>> 4.2
   user_language: "y"
   user_no_stop: "y"
   user_install_type: "agent"