Skip to content

Commit

Permalink
use beats provided fields target
Browse files Browse the repository at this point in the history
per elastic/beats#6911 set FIELDS_FILE_PATH accordingly.
  • Loading branch information
graphaelli committed Jun 4, 2018
1 parent 8e369b0 commit da3fda4
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ LICENSE_FILE=licenses/APACHE-LICENSE-2.0.txt
ELASTIC_LICENSE_FILE=licenses/ELASTIC-LICENSE.txt
NOW=$(shell date -u '+%Y-%m-%dT%H:%M:%S')
GOBUILD_FLAGS=-i -ldflags "-s -X $(BEAT_PATH)/vendor/github.com/elastic/beats/libbeat/version.buildTime=$(NOW) -X $(BEAT_PATH)/vendor/github.com/elastic/beats/libbeat/version.commit=$(COMMIT_ID)"
FIELDS_FILE_PATH=processor

# Path to the libbeat Makefile
-include $(ES_BEATS)/libbeat/scripts/Makefile
Expand All @@ -39,18 +40,7 @@ before-build:

# Collects all dependencies and then calls update
.PHONY: collect
collect: imports fields go-generate create-docs notice

# Generates imports for all modules and metricsets
.PHONY: imports
imports:
@mkdir -p include
@mkdir -p processor

.PHONY: fields
fields:
@cat _meta/fields.common.yml > _meta/fields.generated.yml
@cat processor/*/_meta/fields.yml >> _meta/fields.generated.yml
collect: fields go-generate create-docs notice

.PHONY: go-generate
go-generate:
Expand Down

0 comments on commit da3fda4

Please sign in to comment.