From f031f0fbfb301d7269738aee06d2b5bd93275730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= <teddytpc1@gmail.com>
Date: Thu, 2 Dec 2021 10:09:43 -0300
Subject: [PATCH 1/3] Expect tag deleted

---
 .../templates/var-ossec-etc-ossec-server.conf.j2               | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2 b/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2
index c5c1a788..8b08f46b 100644
--- a/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2
+++ b/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2
@@ -369,9 +369,6 @@
   <command>
     <name>{{ command.name }}</name>
     <executable>{{ command.executable }}</executable>
-    {% if command.expect is defined %}
-        <expect>{{ command.expect }}</expect>
-    {% endif %}
     {% if command.timeout_allowed is defined %}
         <timeout_allowed>{{ command.timeout_allowed }}</timeout_allowed>
     {% endif %}

From 5b82bd37f73e9638d221ebb816f32bdd61accc75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= <teddytpc1@gmail.com>
Date: Thu, 2 Dec 2021 15:19:06 -0300
Subject: [PATCH 2/3] Fixes to include 4.2 changes

---
 roles/opendistro/opendistro-kibana/tasks/main.yml   | 1 -
 roles/wazuh/ansible-wazuh-manager/defaults/main.yml | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/roles/opendistro/opendistro-kibana/tasks/main.yml b/roles/opendistro/opendistro-kibana/tasks/main.yml
index 8a169664..acfd1f90 100755
--- a/roles/opendistro/opendistro-kibana/tasks/main.yml
+++ b/roles/opendistro/opendistro-kibana/tasks/main.yml
@@ -19,7 +19,6 @@
     # noqa 503
     path: "{{ kibana_conf_path }}/kibana.yml"
     state: absent
-  when: install.changed
   tags: install
 
 - import_tasks: security_actions.yml
diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
index 0085d40e..be39ec65 100644
--- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
+++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
@@ -72,8 +72,8 @@ wazuh_manager_globals:
   - '^localhost.localdomain$'
   - '127.0.0.53'
 
-wazuh_manager_agent_disconnection_time: '10m'
-wazuh_manager_agents_disconnection_alert_time: '0'
+wazuh_manager_agent_disconnection_time: '20s'
+wazuh_manager_agents_disconnection_alert_time: '100s'
 
 ## Alerts
 wazuh_manager_log_level: 3

From 8aab436b722a4c152d75e1c46290182bfd234c83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= <teddytpc1@gmail.com>
Date: Thu, 2 Dec 2021 15:28:06 -0300
Subject: [PATCH 3/3] Fixes to include 4.2 changes

---
 roles/opendistro/opendistro-elasticsearch/tasks/Debian.yml    | 1 -
 roles/opendistro/opendistro-kibana/tasks/security_actions.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/Debian.yml b/roles/opendistro/opendistro-elasticsearch/tasks/Debian.yml
index 45c68022..5b490844 100644
--- a/roles/opendistro/opendistro-elasticsearch/tasks/Debian.yml
+++ b/roles/opendistro/opendistro-elasticsearch/tasks/Debian.yml
@@ -4,7 +4,6 @@
 - name: Update cache
   apt:
     update_cache: yes
-  when: (ansible_facts['distribution'] == "Debian" and ansible_facts['distribution_major_version'] == "9")
 
 - name: Debian 9 (Stretch)
   when: (ansible_facts['distribution'] == "Debian" and ansible_facts['distribution_major_version'] == "9")
diff --git a/roles/opendistro/opendistro-kibana/tasks/security_actions.yml b/roles/opendistro/opendistro-kibana/tasks/security_actions.yml
index d7a20408..ee21f1c1 100644
--- a/roles/opendistro/opendistro-kibana/tasks/security_actions.yml
+++ b/roles/opendistro/opendistro-kibana/tasks/security_actions.yml
@@ -11,4 +11,3 @@
       - "{{ kibana_node_name }}_http.pem"
   tags:
   - security
-  when: install.changed