Skip to content

Commit

Permalink
Fix tags for coredns/envoyproxy (#19134) (#19299)
Browse files Browse the repository at this point in the history
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.

(cherry picked from commit b48c388)
  • Loading branch information
andrewkroh committed Jun 26, 2020
1 parent 18ee16d commit 3c2b052
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.next.asciidoc
Expand Up @@ -50,8 +50,10 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
* iptables {pull}18756[18756]
* Checkpoint {pull}18754[18754]
* Netflow {pull}19087[19087]
* Suricata {pull}19107[19107] (`forwarded` tag is not included by default)
* 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]
- With the default configuration the cloud modules (aws, azure, googlecloud, o365, okta)
will no longer send the `host` field that contains information about the host Filebeat is
Expand Down
3 changes: 2 additions & 1 deletion x-pack/filebeat/module/coredns/log/config/coredns.yml
Expand Up @@ -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: ''
Expand Down
3 changes: 2 additions & 1 deletion x-pack/filebeat/module/envoyproxy/log/config/envoyproxy.yml
Expand Up @@ -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: ''
Expand Down

0 comments on commit 3c2b052

Please sign in to comment.