Fix extra fields for Beats (#297)

fixes #296 --------- Co-authored-by: Tobias Bauriedel <tobias.bauriedel@netways.de>
NETWAYS · Jan 17, 2024 · 870f268 · 870f268
1 parent 0305dfa
commit 870f268
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/molecule/beats_peculiar/converge.yml b/molecule/beats_peculiar/converge.yml
@@ -18,6 +18,9 @@
           pattern: '^[[:space:]]+(at|\.{3})[[:space:]]+\b|^Caused by:'
           negate: false
           match: after
+        fields:
+          testfield: thisisatest
+          testfield2: thisisanothertest
     elasticsearch_jna_workaround: true
     elasticsearch_disable_systemcallfilterchecks: true
     elasticstack_full_stack: false

diff --git a/molecule/beats_peculiar/verify.yml b/molecule/beats_peculiar/verify.yml
@@ -26,3 +26,11 @@
       when:
         - beats_filebeat_version.stdout.find('8.4.1') == -1
         - elasticstack_release == 8
+
+    - name: Ensure field is set correctly
+      ansible.builtin.lineinfile:
+        dest: /etc/filebeat/filebeat.yml
+        line: "    testfield: thisisatest"
+      check_mode: true
+      register: _field
+      failed_when: _field.changed
diff --git a/molecule/elasticstack_default/verify.yml b/molecule/elasticstack_default/verify.yml
@@ -135,3 +135,4 @@
         success_msg: "'{{ item }}' was found in nodes.content"
       with_inventory_hostnames: all
       when: groups['elasticsearch'] | length > 1
+
diff --git a/roles/beats/templates/filebeat.yml.j2 b/roles/beats/templates/filebeat.yml.j2
@@ -17,7 +17,7 @@ filebeat.inputs:
 {% endif %}
 {% if beats_filebeat_log_inputs[input].fields is defined %}
 {% for field in beats_filebeat_log_inputs[input].fields %}
-    {{ field }}
+    {{ field }}: {{ beats_filebeat_log_inputs[input].fields[field] }}
 {% endfor %}
 {% endif %}
 {% endif %}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -135,3 +135,4 @@
		success_msg: "'{{ item }}' was found in nodes.content"
		with_inventory_hostnames: all
		when: groups['elasticsearch'] \| length > 1

Check warning on line 138 in molecule/elasticstack_default/verify.yml View workflow job for this annotation GitHub Actions / lint_full / lint `138:1 [empty-lines] too many blank lines (1 > 0)` Check warning on line 138 in molecule/elasticstack_default/verify.yml View workflow job for this annotation GitHub Actions / lint_full / lint `138:1 [empty-lines] too many blank lines (1 > 0)` Check warning on line 138 in molecule/elasticstack_default/verify.yml View workflow job for this annotation GitHub Actions / lint_full / lint `138:1 [empty-lines] too many blank lines (1 > 0)` Check warning on line 138 in molecule/elasticstack_default/verify.yml View workflow job for this annotation GitHub Actions / lint_full / lint `138:1 [empty-lines] too many blank lines (1 > 0)` Check warning on line 138 in molecule/elasticstack_default/verify.yml View workflow job for this annotation GitHub Actions / lint_full / lint `138:1 [empty-lines] too many blank lines (1 > 0)` Check warning on line 138 in molecule/elasticstack_default/verify.yml View workflow job for this annotation GitHub Actions / lint_full / lint `138:1 [empty-lines] too many blank lines (1 > 0)` Check warning on line 138 in molecule/elasticstack_default/verify.yml View workflow job for this annotation GitHub Actions / lint_full / lint `138:1 [empty-lines] too many blank lines (1 > 0)` Check warning on line 138 in molecule/elasticstack_default/verify.yml View workflow job for this annotation GitHub Actions / lint_full / lint `138:1 [empty-lines] too many blank lines (1 > 0)` Check warning on line 138 in molecule/elasticstack_default/verify.yml View workflow job for this annotation GitHub Actions / lint_full / lint `138:1 [empty-lines] too many blank lines (1 > 0)` Check warning on line 138 in molecule/elasticstack_default/verify.yml View workflow job for this annotation GitHub Actions / lint_full / lint `138:1 [empty-lines] too many blank lines (1 > 0)` Check warning on line 138 in molecule/elasticstack_default/verify.yml View workflow job for this annotation GitHub Actions / lint_full / lint `138:1 [empty-lines] too many blank lines (1 > 0)` Check warning on line 138 in molecule/elasticstack_default/verify.yml View workflow job for this annotation GitHub Actions / lint_full / lint `138:1 [empty-lines] too many blank lines (1 > 0)` Check warning on line 138 in molecule/elasticstack_default/verify.yml View workflow job for this annotation GitHub Actions / lint_full / lint `138:1 [empty-lines] too many blank lines (1 > 0)` Check warning on line 138 in molecule/elasticstack_default/verify.yml View workflow job for this annotation GitHub Actions / lint_full / lint `138:1 [empty-lines] too many blank lines (1 > 0)` Check warning on line 138 in molecule/elasticstack_default/verify.yml View workflow job for this annotation GitHub Actions / lint_full / lint `138:1 [empty-lines] too many blank lines (1 > 0)` Check warning on line 138 in molecule/elasticstack_default/verify.yml View workflow job for this annotation GitHub Actions / lint_full / lint `138:1 [empty-lines] too many blank lines (1 > 0)`