From 3b02cb63d31ac03d8df852f61d95db95574bfa38 Mon Sep 17 00:00:00 2001
From: Manuel Gutierrez <1380243+xr09@users.noreply.github.com>
Date: Fri, 8 Jan 2021 16:14:28 +0100
Subject: [PATCH 1/3] Update ossec.conf for Wazuh 4.1

---
 wazuh/wazuh_managers/wazuh_conf/master.conf | 11 ++++++++++-
 wazuh/wazuh_managers/wazuh_conf/worker.conf | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/wazuh/wazuh_managers/wazuh_conf/master.conf b/wazuh/wazuh_managers/wazuh_conf/master.conf
index 9693a9e9..ebf2e2e7 100644
--- a/wazuh/wazuh_managers/wazuh_conf/master.conf
+++ b/wazuh/wazuh_managers/wazuh_conf/master.conf
@@ -17,7 +17,10 @@
     <email_from>ossecm@example.wazuh.com</email_from>
     <email_to>recipient@example.wazuh.com</email_to>
     <email_maxperhour>12</email_maxperhour>
+    <email_log_source>alerts.log</email_log_source>
     <queue_size>131072</queue_size>
+    <agents_disconnection_time>20s</agents_disconnection_time>
+    <agents_disconnection_alert_time>100s</agents_disconnection_alert_time>
   </global>
 
   <alerts>
@@ -306,6 +309,13 @@
     <rule_dir>etc/rules</rule_dir>
   </ruleset>
 
+  <rule_test>
+	    <enabled>yes</enabled>
+	    <threads>1</threads>
+	    <max_sessions>64</max_sessions>
+	    <session_timeout>15m</session_timeout>
+  </rule_test>
+
   <!-- Configuration for ossec-authd
     To enable this service, run:
     ossec-control enable auth
@@ -318,7 +328,6 @@
     <force_time>0</force_time>
     <purge>no</purge>
     <use_password>yes</use_password>
-    <limit_maxagents>yes</limit_maxagents>
     <ciphers>HIGH:!ADH:!EXP:!MD5:!RC4:!3DES:!CAMELLIA:@STRENGTH</ciphers>
     <!-- <ssl_agent_ca></ssl_agent_ca> -->
     <ssl_verify_host>no</ssl_verify_host>
diff --git a/wazuh/wazuh_managers/wazuh_conf/worker.conf b/wazuh/wazuh_managers/wazuh_conf/worker.conf
index 2209ab39..5b050bd4 100644
--- a/wazuh/wazuh_managers/wazuh_conf/worker.conf
+++ b/wazuh/wazuh_managers/wazuh_conf/worker.conf
@@ -17,7 +17,10 @@
     <email_from>ossecm@example.wazuh.com</email_from>
     <email_to>recipient@example.wazuh.com</email_to>
     <email_maxperhour>12</email_maxperhour>
+    <email_log_source>alerts.log</email_log_source>
     <queue_size>131072</queue_size>
+    <agents_disconnection_time>20s</agents_disconnection_time>
+    <agents_disconnection_alert_time>100s</agents_disconnection_alert_time>
   </global>
 
   <alerts>
@@ -305,6 +308,13 @@
     <rule_dir>etc/rules</rule_dir>
   </ruleset>
 
+  <rule_test>
+	    <enabled>yes</enabled>
+	    <threads>1</threads>
+	    <max_sessions>64</max_sessions>
+	    <session_timeout>15m</session_timeout>
+  </rule_test>
+
   <!-- Configuration for ossec-authd
     To enable this service, run:
     ossec-control enable auth
@@ -317,7 +327,6 @@
     <force_time>0</force_time>
     <purge>no</purge>
     <use_password>no</use_password>
-    <limit_maxagents>yes</limit_maxagents>
     <ciphers>HIGH:!ADH:!EXP:!MD5:!RC4:!3DES:!CAMELLIA:@STRENGTH</ciphers>
     <!-- <ssl_agent_ca></ssl_agent_ca> -->
     <ssl_verify_host>no</ssl_verify_host>

From b48bed65a233e54f09cf6e608e7142e99cbc677b Mon Sep 17 00:00:00 2001
From: Manuel Gutierrez <1380243+xr09@users.noreply.github.com>
Date: Mon, 22 Feb 2021 15:35:16 +0100
Subject: [PATCH 2/3] Bump to v4.1.1

---
 VERSION                                       | 4 ++--
 wazuh/elastic_stack/kibana/kibana-deploy.yaml | 2 +-
 wazuh/wazuh_managers/wazuh-master-sts.yaml    | 2 +-
 wazuh/wazuh_managers/wazuh-worker-sts.yaml    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/VERSION b/VERSION
index 378fbbe8..173c1ba1 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-VERSION="4.1.0"
-REVISION="41000"
+VERSION="4.1.1"
+REVISION="41100"
diff --git a/wazuh/elastic_stack/kibana/kibana-deploy.yaml b/wazuh/elastic_stack/kibana/kibana-deploy.yaml
index 9dd174ef..a34ff20d 100644
--- a/wazuh/elastic_stack/kibana/kibana-deploy.yaml
+++ b/wazuh/elastic_stack/kibana/kibana-deploy.yaml
@@ -29,7 +29,7 @@ spec:
             secretName: kibana-certs
       containers:
         - name: wazuh-kibana
-          image: 'wazuh/wazuh-kibana-odfe:4.1.0'
+          image: 'wazuh/wazuh-kibana-odfe:4.1.1'
           resources:
             limits:
               cpu: 500m
diff --git a/wazuh/wazuh_managers/wazuh-master-sts.yaml b/wazuh/wazuh_managers/wazuh-master-sts.yaml
index f10f6324..0a5afab8 100644
--- a/wazuh/wazuh_managers/wazuh-master-sts.yaml
+++ b/wazuh/wazuh_managers/wazuh-master-sts.yaml
@@ -39,7 +39,7 @@ spec:
             secretName: wazuh-authd-pass
       containers:
         - name: wazuh-manager
-          image: 'wazuh/wazuh-odfe:4.1.0'
+          image: 'wazuh/wazuh-odfe:4.1.1'
           resources:
             limits:
               cpu: 400m
diff --git a/wazuh/wazuh_managers/wazuh-worker-sts.yaml b/wazuh/wazuh_managers/wazuh-worker-sts.yaml
index aa9bc6a8..33cff2be 100644
--- a/wazuh/wazuh_managers/wazuh-worker-sts.yaml
+++ b/wazuh/wazuh_managers/wazuh-worker-sts.yaml
@@ -42,7 +42,7 @@ spec:
             secretName: odfe-ssl-certs
       containers:
         - name: wazuh-manager
-          image: 'wazuh/wazuh-odfe:4.1.0'
+          image: 'wazuh/wazuh-odfe:4.1.1'
           resources:
             limits:
               cpu: 400m

From 92855f5a2997ac88f3f21478e3cac42f133370e5 Mon Sep 17 00:00:00 2001
From: Manuel Gutierrez <1380243+xr09@users.noreply.github.com>
Date: Mon, 22 Feb 2021 15:36:06 +0100
Subject: [PATCH 3/3] Update changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 173215f4..91ef352f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.1.1]
+
+### Added
+
+- Update to Wazuh version [4.1.1](https://github.com/wazuh/wazuh/blob/v4.1.1/CHANGELOG.md#v411)
+
 ## [4.1.0]
 
 ### Added