Cherry-pick #7713 to 6.4: Simplify fields.yml generator #7777
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
kvch
force-pushed
the
backport_7713_6.4
branch
from
08f4af0
to
0336e51
Compare
jsoriano
approved these changes
Sep 25, 2018
|
Failures in tests are fixed by #8425 |
This PR simplifies the process of generating a new `fields.yml` file for a Beat. * `libbeat/fields.yml` is not a dependency anymore * only `fields.yml` is written to disk Changes in the asset files are due to different number of newlines in generated `fields.yml` files. ### Interface changes of generator tools Both `dev-tools/cmd/asset/asset.go` and `libbeat/scripts/cmd/global_fields/main.go` is changed. The first one has two new flags: `-in`, and `-out`. By default it reads from stdin and writes to stdout. Using the flags it's possible to read and write from other files. The second one has one new flag `-out` which specifies the output file. If it's not set, the output is written to stdout. This makes it possible to generate asset files for Metricbeat without writing `libbeat/fields.yml` to disk. It will be useful in the future when more Beats have modular assets. Closes elastic#7671 (cherry picked from commit 5797005)
kvch
force-pushed
the
backport_7713_6.4
branch
from
0336e51
to
dce6a0d
Compare
|
Rebased to include all fixes. |
leweafan
pushed a commit
to leweafan/beats
that referenced
this pull request
Apr 28, 2023
…ic#7777) * Simplify fields.yml generator (elastic#7713) This PR simplifies the process of generating a new `fields.yml` file for a Beat. * `libbeat/fields.yml` is not a dependency anymore * only `fields.yml` is written to disk Changes in the asset files are due to different number of newlines in generated `fields.yml` files. ### Interface changes of generator tools Both `dev-tools/cmd/asset/asset.go` and `libbeat/scripts/cmd/global_fields/main.go` is changed. The first one has two new flags: `-in`, and `-out`. By default it reads from stdin and writes to stdout. Using the flags it's possible to read and write from other files. The second one has one new flag `-out` which specifies the output file. If it's not set, the output is written to stdout. This makes it possible to generate asset files for Metricbeat without writing `libbeat/fields.yml` to disk. It will be useful in the future when more Beats have modular assets. Closes elastic#7671 (cherry picked from commit ec2e022) * update fields of Packetbeat
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.
Cherry-pick of PR #7713 to 6.4 branch. Original message:
This PR simplifies the process of generating a new
fields.ymlfile for a Beat.libbeat/fields.ymlis not a dependency anymorefields.ymlis written to diskChanges in the asset files are due to different number of newlines in generated
fields.ymlfiles.Interface changes of generator tools
Both
dev-tools/cmd/asset/asset.goandlibbeat/scripts/cmd/global_fields/main.gois changed. The first one has two new flags:-in, and-out. By default it reads from stdin and writes to stdout. Using the flags it's possible to read and write from other files. The second one has one new flag-outwhich specifies the output file. If it's not set, the output is written to stdout.This makes it possible to generate asset files for Metricbeat without writing
libbeat/fields.ymlto disk. It will be useful in the future when more Beats have modular assets.Closes #7671