Fix tags for coredns/envoyproxy (#19134)

andrewkroh · web-flow · commit b48c38802136 · 2020-06-12T13:52:02.000-04:00
When {{ .tags }} is evaluated in the module config it not written in the correct format. This fixes that issue and also conditionally enables `publisher_pipeline.disable_host` based on whether tags contains `forwarded` to be consistent with every other module that allows for `var.tags` to be set (relates: #13920). For example (https://play.golang.org/p/LUr-X94msd1): var.tags: [foo, bar] will be written into the config as tags: [foo bar] which is a single value array containing the string "foo bar" rather than two tags.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -45,6 +45,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 * Netflow {pull}19087[19087]
 * Zeek {pull}19113[19113] (`forwarded` tag is not included by default)
 * Suricata {pull}19107[19107] (`forwarded` tag is not included by default)
+* CoreDNS {pull}19134[19134] (`forwarded` tag is not included by default)
+* Envoy Proxy {pull}19134[19134] (`forwarded` tag is not included by default)
 - Preserve case of http.request.method.  ECS prior to 1.6 specified normalizing to lowercase, which lost information. Affects filesets: apache/access, elasticsearch/audit, iis/access, iis/error, nginx/access, nginx/ingress_controller, aws/elb, suricata/eve, zeek/http. {issue}18154[18154] {pull}18359[18359]
 - Adds check on `<no value>` config option value for the azure input `resource_manager_endpoint`. {pull}18890[18890]
 - Okta module now requires objects instead of JSON strings for the `http_headers`, `http_request_body`, `pagination`, `rate_limit`, and `ssl` variables. {pull}18953[18953]
diff --git a/x-pack/filebeat/module/coredns/log/config/coredns.yml b/x-pack/filebeat/module/coredns/log/config/coredns.yml
@@ -3,7 +3,8 @@ paths:
 {{ range $i, $path := .paths }}
   - {{$path}}
 {{ end }}
-tags: {{.tags}}
+tags: {{.tags | tojson}}
+publisher_pipeline.disable_host: {{ inList .tags "forwarded" }}
 processors:
   - add_fields:
       target: ''
diff --git a/x-pack/filebeat/module/envoyproxy/log/config/envoyproxy.yml b/x-pack/filebeat/module/envoyproxy/log/config/envoyproxy.yml
@@ -3,7 +3,8 @@ paths:
 {{ range $i, $path := .paths }}
   - {{$path}}
 {{ end }}
-tags: {{.tags}}
+tags: {{.tags | tojson}}
+publisher_pipeline.disable_host: {{ inList .tags "forwarded" }}
 processors:
   - add_fields:
       target: ''
