Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Filebeat X-Pack Module Packaging #8615

Merged
merged 11 commits into from
Oct 17, 2018
Merged

Filebeat X-Pack Module Packaging #8615

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f7ba3fa
Filebeat X-Pack Module Packaging
andrewkroh Oct 14, 2018
389c71c
Compile different fields.yml assets for x-pack binaries
adriansr Oct 15, 2018
338838e
Inject x-pack-specific assets into non-oss build
adriansr Oct 15, 2018
a09a8ae
X-pack specific fields.go for filebeat
adriansr Oct 15, 2018
9c52af4
Correct license for autogenerated fields.go
adriansr Oct 16, 2018
de85bac
Update makefile to set Elastic license on x-pack fields.go
adriansr Oct 16, 2018
af07dce
Removed unnecessary fields.go in module
adriansr Oct 16, 2018
562ed8d
Build fields.go from mage instead of makefile
adriansr Oct 16, 2018
04a35e7
Remove reference to x-pack suricata package
adriansr Oct 16, 2018
620b377
Fix darwin tgz packaging for x-pack
adriansr Oct 17, 2018
27cafb6
Revert fields.yml generation changes
adriansr Oct 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions dev-tools/mage/fields.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,17 @@ func GenerateFieldsGo(fieldsYML, out string) error {
return err
}

licenseType := BeatLicense
if licenseType == "ASL 2.0" {
licenseType = "ASL2"
}

assetCmd := sh.RunCmd("go", "run",
filepath.Join(beatsDir, assetCmdPath),
"-pkg", "include",
"-in", fieldsYML,
"-out", createDir(out),
"-license", licenseType,
BeatName,
)

Expand Down
5 changes: 0 additions & 5 deletions libbeat/scripts/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,11 +331,6 @@ endif
ifneq ($(shell [[ $(BEAT_NAME) == libbeat || $(BEAT_NAME) == metricbeat ]] && echo true ),true)
mkdir -p include
go run ${ES_BEATS}/dev-tools/cmd/asset/asset.go -pkg include -in fields.yml -out include/fields.go $(BEAT_NAME)
ifeq ($(shell [[ -e ${ES_BEATS}/x-pack/$(BEAT_NAME)/fields.yml ]] && echo true ),true)
mkdir -p include
go run ${ES_BEATS}/dev-tools/cmd/asset/asset.go -pkg include -in ${ES_BEATS}/x-pack/$(BEAT_NAME)/fields.yml -out ${ES_BEATS}/x-pack/$(BEAT_NAME)/include/fields.go -name fields.yml -license Elastic $(BEAT_NAME)
endif

endif

ifneq ($(shell [[ $(BEAT_NAME) == libbeat ]] && echo true ),true)
Expand Down
Loading