Fix contains check for forwarded tag (elastic#1820)

build-security · Oct 5, 2021 · 742eda3 · 742eda3
1 parent f91774a
commit 742eda3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/packages/haproxy/changelog.yml b/packages/haproxy/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "0.6.1"
+  changes:
+    - description: Fix logic that checks for the 'forwarded' tag
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/1820
 - version: "0.6.0"
   changes:
     - description: Update to ECS 1.12.0

diff --git a/packages/haproxy/data_stream/log/agent/stream/log.yml.hbs b/packages/haproxy/data_stream/log/agent/stream/log.yml.hbs
@@ -9,7 +9,7 @@ tags:
 {{#each tags as |tag i|}}
   - {{tag}}
 {{/each}}
-{{#contains tags "forwarded"}}
+{{#contains "forwarded" tags}}
 publisher_pipeline.disable_host: true
 {{/contains}}
 exclude_files: [".gz$"]

diff --git a/packages/haproxy/data_stream/log/agent/stream/syslog.yml.hbs b/packages/haproxy/data_stream/log/agent/stream/syslog.yml.hbs
@@ -7,7 +7,7 @@ tags:
 {{#each tags as |tag i|}}
   - {{tag}}
 {{/each}}
-{{#contains tags "forwarded"}}
+{{#contains "forwarded" tags}}
 publisher_pipeline.disable_host: true
 {{/contains}}
 processors:

diff --git a/packages/haproxy/manifest.yml b/packages/haproxy/manifest.yml
@@ -1,6 +1,6 @@
 name: haproxy
 title: HAProxy
-version: 0.6.0
+version: 0.6.1
 description: This Elastic integration collects logs and metrics from HAProxy instances
 type: integration
 icons: