Merge branch '4.14.4' into merge-4.14.3-into-4.14.4

CHANGELOG.md

@@ -1,6 +1,25 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [4.14.4]
+
+### Added
+
+- None
+
+### Changed
+
+- Remove meta yamls that prevent indexer and agent role installation from PR #1806 ([#1921](https://github.com/wazuh/wazuh-ansible/pull/1921))
+- Ensure boolean condition evaluations - from community PR #1897 ([#1916](https://github.com/wazuh/wazuh-ansible/pull/1916))
+
+### Fixed
+
+- None
+
+### Deleted
+
+- None
+
 ## [4.14.3]
 
 ### Added

VERSION.json

@@ -1,4 +1,4 @@
 {
-    "version": "4.14.3",
+    "version": "4.14.4",
-    "stage": "rc2"
+    "stage": "rc1"
 }

meta/main.yml

@@ -1,7 +1,7 @@
 ---
 galaxy_info:
   author: Wazuh
-  description: Installing, deploying and configuring Wazuh Agent.
+  description: Installing, deploying and configuring Wazuh using Ansible.
   company: wazuh.com
   license: license (GPLv3)
   min_ansible_version: 2.0

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

@@ -7,7 +7,7 @@ kibana_server_host: "0.0.0.0"
 kibana_server_port: "5601"
 kibana_conf_path: /etc/kibana
 elastic_stack_version: 7.10.2
-wazuh_version: 4.14.3
+wazuh_version: 4.14.4
 wazuh_app_url: https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana
 
 elasticrepo:

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

@@ -1,7 +1,7 @@
 ---
 filebeat_version: 7.10.2
 
-wazuh_template_branch: v4.14.3
+wazuh_template_branch: v4.14.4
 
 filebeat_node_name: node-1
 

roles/wazuh/ansible-filebeat-oss/meta/main.yml

@@ -1,29 +0,0 @@
----
-dependencies: []
-
-galaxy_info:
-  author: Wazuh
-  description: Installing and maintaining Filebeat-oss.
-  company: wazuh.com
-  license: license (GPLv3)
-  min_ansible_version: 2.0
-  platforms:
-    - name: EL
-      versions:
-        - 6
-        - 7
-    - name: Fedora
-      versions:
-        - all
-    - name: Debian
-      versions:
-        - jessie
-    - name: Ubuntu
-      versions:
-        - precise
-        - trusty
-        - xenial
-  galaxy_tags:
-    - web
-    - system
-    - monitoring

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

@@ -1,5 +1,5 @@
 ---
-wazuh_agent_version: 4.14.3
+wazuh_agent_version: 4.14.4
 
 # Custom packages installation
 

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

@@ -1,5 +1,5 @@
 ---
-wazuh_manager_version: 4.14.3
+wazuh_manager_version: 4.14.4
 
 wazuh_manager_fqdn: "wazuh-server"
 wazuh_manager_package_state: present

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

@@ -1,23 +0,0 @@
----
-galaxy_info:
-  author: Wazuh
-  description: Installing, deploying and configuring Wazuh Manager.
-  company: wazuh.com
-  license: license (GPLv3)
-  min_ansible_version: 2.0
-  platforms:
-    - name: EL
-      versions:
-        - all
-    - name: Ubuntu
-      versions:
-        - all
-    - name: Debian
-      versions:
-        - all
-    - name: Fedora
-      versions:
-        - all
-  galaxy_tags:
-    - monitoring
-dependencies: []

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

@@ -242,7 +242,7 @@
   notify: restart wazuh-manager
   when:
     - csyslog_enabled.stdout == '0' or "skipped" in csyslog_enabled.stdout
-    - syslog_output is defined and syslog_output
+    - syslog_output is defined and (syslog_output | bool)
   tags:
     - config
 

roles/wazuh/check-packages/defaults/main.yml

@@ -1,2 +1,2 @@
 ---
-wazuh_version: 4.14.3
+wazuh_version: 4.14.4

roles/wazuh/wazuh-dashboard/defaults/main.yml

@@ -8,12 +8,12 @@ dashboard_node_name: node-1
 dashboard_server_host: "0.0.0.0"
 dashboard_server_port: "443"
 dashboard_server_name: "dashboard"
-wazuh_version: 4.14.3
+wazuh_version: 4.14.4
 indexer_cluster_nodes:
   - 127.0.0.1
 
 # The Wazuh dashboard package repository
-dashboard_version: "4.14.3"
+dashboard_version: "4.14.4"
 
 # API credentials
 wazuh_api_credentials:

roles/wazuh/wazuh-dashboard/vars/debian.yml

@@ -1,2 +1,2 @@
 ---
-dashboard_version: 4.14.3
+dashboard_version: 4.14.4

roles/wazuh/wazuh-indexer/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 # Cluster Settings
-indexer_version: 4.14.3
+indexer_version: 4.14.4
 
 single_node: false
 indexer_node_name: node-1

roles/wazuh/wazuh-indexer/meta/main.yml

@@ -1,24 +0,0 @@
----
-galaxy_info:
-  author: Wazuh
-  description: Installing and maintaining Wazuh indexer.
-  company: wazuh.com
-  license: license (GPLv3)
-  min_ansible_version: 2.0
-  platforms:
-    - name: EL
-      versions:
-        - all
-    - name: Ubuntu
-      versions:
-        - all
-    - name: Debian
-      versions:
-        - all
-    - name: Fedora
-      versions:
-        - all
-  galaxy_tags:
-    - web
-    - system
-    - monitoring

roles/wazuh/wazuh-indexer/tasks/main.yml

@@ -108,7 +108,8 @@
       delay: 5
       tags: debug
       when:
-        - hostvars[inventory_hostname]['private_ip'] is not defined or not hostvars[inventory_hostname]['private_ip']
+        - hostvars[inventory_hostname]['private_ip'] is not defined or
+          (hostvars[inventory_hostname]['private_ip'] | length) == 0
 
     - name: Wait for Wazuh indexer API (Private IP)
       uri:
@@ -127,7 +128,8 @@
       delay: 5
       tags: debug
       when:
-        - hostvars[inventory_hostname]['private_ip'] is defined and hostvars[inventory_hostname]['private_ip']
+        - hostvars[inventory_hostname]['private_ip'] is defined and
+          (hostvars[inventory_hostname]['private_ip'] | length) > 0
 
     - import_tasks: "RMRedHat.yml"
       when: ansible_os_family == "RedHat"

roles/wazuh/wazuh-indexer/tasks/security_actions.yml

@@ -114,5 +114,5 @@
   register: result
   until: result.status in [200,201,401]
   when:
-    - indexer_custom_user is defined and indexer_custom_user
+    - indexer_custom_user | default('') | trim | length > 0
     - inventory_hostname == ansible_play_hosts[0]