enable module fields overrides from custom beats #10060
Merged
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
houndci-bot
reviewed
Jan 14, 2019
|
Is this expected to change the fields.go files? Shouldn't the output stay the same? |
|
the order of the fields changed, was: libbeat, custom, modules now: libbeat, modules, custom |
ruflin
approved these changes
Jan 16, 2019
| libbeatModulesPath := filepath.Join(esBeatsPath, "libbeat/processors") | ||
| libbeatFieldFiles, err = CollectModuleFiles(libbeatModulesPath) | ||
| if err != nil { | ||
| func makeYml(indent int, paths ...string) ([]*YmlFile, error) { |
Conflicts: packetbeat/include/fields.go
ruflin
approved these changes
Jan 16, 2019
|
jenkins, retest this please |
5 similar comments
|
jenkins, retest this please |
|
jenkins, retest this please |
|
jenkins, retest this please |
|
jenkins, retest this please |
|
jenkins, retest this please |
|
jenkins, retest this please |
Conflicts: auditbeat/include/fields.go filebeat/include/fields.go heartbeat/include/fields.go journalbeat/include/fields.go metricbeat/include/fields/fields.go packetbeat/include/fields.go winlogbeat/include/fields.go x-pack/functionbeat/include/fields.go
|
jenkins, retest this please |
|
@graphaelli Taking into account our current situation with CI I'm also happy with Travis only green. |
Conflicts: filebeat/include/fields.go journalbeat/include/fields.go
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.
follow up on #9188 where I unintentionally missed this originally - previously only libbeat fields could be overridden.