Merge branch 'master' into dependabot/pip/pywin32-301

.github/dependabot.yml

@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
+    target-branch: "4.3"

CHANGELOG.md

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

README.md

@@ -15,8 +15,9 @@ These playbooks install and configure Wazuh agent, manager and Elastic Stack.
 
 | Wazuh version | Elastic | ODFE   |
 |---------------|---------|--------|
-| v4.4.0        | 7.10.2  | 1.13.2 |
+| v4.4.0        |         |        |
-| v4.3.0        | 7.10.2  | 1.13.2 |
+| v4.3.0        |         |        |
+| v4.2.6        | 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 |

poetry.lock

@@ -238,7 +238,7 @@ python-versions = "*"
 
 [[package]]
 name = "docker"
-version = "4.2.2"
+version = "4.3.1"
 description = "A Python library for the Docker Engine API."
 category = "dev"
 optional = false
@@ -511,7 +511,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "pygments"
-version = "2.7.2"
+version = "2.7.4"
 description = "Pygments is a syntax highlighting package written in Python."
 category = "dev"
 optional = false
@@ -1124,8 +1124,8 @@ pyflakes = [
     {file = "pyflakes-2.2.0.tar.gz", hash = "sha256:35b2d75ee967ea93b55750aa9edbbf72813e06a66ba54438df2cfac9e3c27fc8"},
 ]
 pygments = [
-    {file = "Pygments-2.7.2-py3-none-any.whl", hash = "sha256:88a0bbcd659fcb9573703957c6b9cff9fab7295e6e76db54c9d00ae42df32773"},
+    {file = "Pygments-2.7.4-py3-none-any.whl", hash = "sha256:bc9591213a8f0e0ca1a5e68a479b4887fdc3e75d0774e5c71c31920c427de435"},
-    {file = "Pygments-2.7.2.tar.gz", hash = "sha256:381985fcc551eb9d37c52088a32914e00517e57f4a21609f48141ba08e193fa0"},
+    {file = "Pygments-2.7.4.tar.gz", hash = "sha256:df49d09b498e83c1a73128295860250b0b7edd4c723a32e9bc0d295c7c2ec337"},
 ]
 pynacl = [
     {file = "PyNaCl-1.4.0-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:ea6841bc3a76fa4942ce00f3bda7d436fda21e2d91602b9e21b7ca9ecab8f3ff"},

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")

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

roles/opendistro/opendistro-kibana/tasks/security_actions.yml

@@ -11,4 +11,3 @@
       - "{{ kibana_node_name }}_http.pem"
   tags:
   - security
-  when: install.changed

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

@@ -3,7 +3,6 @@ filebeat_version: 7.10.2
 
 wazuh_template_branch: v4.4.0
 
-
 filebeat_create_config: true
 
 filebeat_node_name: node-1

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

@@ -1,5 +1,4 @@
 ---
-
 wazuh_agent_version: 4.4.0-1
 
 # Custom packages installation

roles/wazuh/ansible-wazuh-agent/templates/var-ossec-etc-ossec-agent.conf.j2

@@ -233,13 +233,13 @@
     <skip_nfs>yes</skip_nfs>
   {% endif %}
   {% if wazuh_agent_config.sca.day | length > 0 %}
-    <day>yes</day>
+    <day>{{ wazuh_agent_config.sca.day }}</day>
   {% endif %}
   {% if wazuh_agent_config.sca.wday | length > 0 %}
-    <wday>yes</wday>
+    <wday>{{ wazuh_agent_config.sca.wday }}</wday>
   {% endif %}
   {% if wazuh_agent_config.sca.time | length > 0 %}
-    <time>yes</time>
+    <time>{{ wazuh_agent_config.sca.time }}</time>
   {% endif %}
   </sca>
 

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

@@ -1,5 +1,4 @@
 ---
-
 wazuh_manager_version: 4.4.0-1
 
 wazuh_manager_fqdn: "wazuh-server"
@@ -72,8 +71,8 @@ wazuh_manager_globals:
   - '^localhost.localdomain$'
   - '127.0.0.53'
 
-wazuh_manager_agent_disconnection_time: '10m'
+wazuh_manager_agent_disconnection_time: '20s'
-wazuh_manager_agents_disconnection_alert_time: '0'
+wazuh_manager_agents_disconnection_alert_time: '100s'
 
 ## Alerts
 wazuh_manager_log_level: 3

roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2

@@ -248,13 +248,13 @@
     <skip_nfs>yes</skip_nfs>
   {% endif %}
   {% if wazuh_manager_config.sca.day | length > 0 %}
-    <day>yes</day>
+    <day>{{ wazuh_manager_config.sca.day }}</day>
   {% endif %}
   {% if wazuh_manager_config.sca.wday | length > 0 %}
-    <wday>yes</wday>
+    <wday>{{ wazuh_manager_config.sca.wday }}</wday>
   {% endif %}
   {% if wazuh_manager_config.sca.time | length > 0 %}
-    <time>yes</time>
+    <time>{{ wazuh_manager_config.sca.time }}</time>
   {% endif %}
   </sca>
 
@@ -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 %}