Merge pull request wazuh#756 from wazuh/802-fix-windows-errors

Fixed duplicated entries in Windows agent conf wazuh#804
perryk · Apr 28, 2022 · ab62e61 · ab62e61
2 parents a6093ae + d1b80eb
commit ab62e61
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 36 deletions.
diff --git a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 filebeat_version: 7.10.2
 
-wazuh_template_branch: v4.3.0
+wazuh_template_branch: 4.3
 
 filebeat_node_name: node-1
 

diff --git a/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-shared-agent.conf.j2 b/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-shared-agent.conf.j2
@@ -43,41 +43,43 @@
   </syscheck>
   {% endif %}
 
-  {% for localfile in agent_config.localfiles %}
-    <localfile>
-       <log_format>{{ localfile.format }}</log_format>
-       {% if localfile.format == 'command' or localfile.format == 'full_command' %}
-       <command>{{ localfile.command }}</command>
-       {% if localfile.alias is defined %}
-       <alias>{{ localfile.alias }}</alias>
-       {% endif %}
-       {% if localfile.frequency is defined %}
-       <frequency>{{ localfile.frequency }}</frequency>
-       {% endif %}
-       {% else %}
-       <location>{{ localfile.location }}</location>
-       {% if localfile.format == 'eventchannel' %}
-       {% if localfile.only_future_events is defined %}
-       <only-future-events>{{ localfile.only_future_events }}</only_future_events>
-       {% endif %}
-       {% if localfile.query is defined %}
-       <query>{{ localfile.query }}</query>
-       {% endif %}
-       {% endif %}
-       {% endif %}
-       {% if localfile.format == 'json' and localfile.labels is defined %}
-       {% for item in localfile.labels %}
-       <label key="{{ item.key }}">{{ item.value }}</label>
-       {% endfor %}
-       {% endif %}
-       {% if localfile.target is defined %}
-       <target>{{ localfile.target }}</target>
-       {% endif %}
-       {% if localfile.out_format is defined %}
-       <out_format>{{ localfile.out_format }}</out_format>
-       {% endif %}
-    </localfile>
-  {% endfor %}
+  {% if agent_config.localfiles is defined %}
+    {% for localfile in agent_config.localfiles %}
+      <localfile>
+         <log_format>{{ localfile.format }}</log_format>
+         {% if localfile.format == 'command' or localfile.format == 'full_command' %}
+         <command>{{ localfile.command }}</command>
+         {% if localfile.alias is defined %}
+         <alias>{{ localfile.alias }}</alias>
+         {% endif %}
+         {% if localfile.frequency is defined %}
+         <frequency>{{ localfile.frequency }}</frequency>
+         {% endif %}
+         {% else %}
+         <location>{{ localfile.location }}</location>
+         {% if localfile.format == 'eventchannel' %}
+         {% if localfile.only_future_events is defined %}
+         <only-future-events>{{ localfile.only_future_events }}</only_future_events>
+         {% endif %}
+         {% if localfile.query is defined %}
+         <query>{{ localfile.query }}</query>
+         {% endif %}
+         {% endif %}
+         {% endif %}
+         {% if localfile.format == 'json' and localfile.labels is defined %}
+         {% for item in localfile.labels %}
+         <label key="{{ item.key }}">{{ item.value }}</label>
+         {% endfor %}
+         {% endif %}
+         {% if localfile.target is defined %}
+         <target>{{ localfile.target }}</target>
+         {% endif %}
+         {% if localfile.out_format is defined %}
+         <out_format>{{ localfile.out_format }}</out_format>
+         {% endif %}
+      </localfile>
+    {% endfor %}
+  {% endif %}
 
   {% if agent_config.rootcheck is defined %}
   <rootcheck>