Add condition to the config file template for add_kubernetes_metadata #14056
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: chrismark <chrismarkou92@gmail.com>
ChrsMark
added
Team:Integrations
exekias
reviewed
Oct 15, 2019
libbeat/_meta/config.yml.tmpl
Outdated
| - add_host_metadata: ~ | ||
| - add_cloud_metadata: ~ | ||
| - add_docker_metadata: ~ | ||
| {{end}} |
There was a problem hiding this comment.
could this change be just adding the kubernetes processor within the existing list? Something like:
processors:
- add_host_metadata: ~
- add_cloud_metadata: ~
- add_docker_metadata: ~
{{if .UseKubernetesMetadataProcessor}}
- add_kubernetes_metadata: ~
{{end}}
There was a problem hiding this comment.
That was what I tried first, however this adds extra blank lines because of the template conditionals like:
processors:
- add_host_metadata: ~
- add_cloud_metadata: ~
- add_docker_metadata: ~
- add_kubernetes_metadata: ~
If this is ok, I can change it.
There was a problem hiding this comment.
gotcha, try with {{- if ... -}}!
exekias
reviewed
Oct 15, 2019
Signed-off-by: chrismark <chrismarkou92@gmail.com>
Signed-off-by: chrismark <chrismarkou92@gmail.com>
jsoriano
approved these changes
Oct 15, 2019
Signed-off-by: chrismark <chrismarkou92@gmail.com>
…n_add_kubernetes_metadata
|
CI failures seem to be irrelevant. Merging this. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This will make
add_kubernetes_metadataprocessor to be only added by default to the configurations of beats with default indexers and matchers.Closes #13713.
cc: @jsoriano , @exekias @odacremolbap