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

Build xpack #1645

Merged
merged 4 commits into from Dec 14, 2018
Merged

Build xpack #1645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4933edc
Vendor libbeat's x-pack
jalvz Dec 6, 2018
1be5ccd
Update beats framework to 1793955
jalvz Dec 12, 2018
21ee7d9
Build real x-pack binaries
jalvz Dec 11, 2018
020f044
update changelog
jalvz Dec 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Expand Up @@ -20,3 +20,5 @@
/vendor/github.com/elastic/beats/libbeat/fields.yml
/docs/elastic/
html_docs
/x-pack/apm-server/apm-server
/x-pack/apm-server/build
24 changes: 23 additions & 1 deletion Makefile
View file
Open in desktop
Expand Up @@ -28,12 +28,34 @@ update-beats:
@govendor fetch github.com/elastic/beats/libbeat/outputs/transport/transptest@$(BEATS_VERSION)
@govendor fetch github.com/elastic/beats/libbeat/scripts/cmd/global_fields@$(BEATS_VERSION)
@govendor fetch github.com/elastic/beats/licenses@$(BEATS_VERSION)

@govendor fetch github.com/elastic/beats/x-pack/libbeat/cmd@$(BEATS_VERSION)
@BEATS_VERSION=$(BEATS_VERSION) script/update_beats.sh
@$(MAKE) update
@echo --- Use this commit message: Update beats framework to `cat vendor/vendor.json | python -c 'import sys, json; print([p["revision"] for p in json.load(sys.stdin)["package"] if p["path"] == "github.com/elastic/beats/libbeat/beat"][0][:7])'`


.PHONY: ${BEAT_NAME}.x-pack
${BEAT_NAME}.x-pack: $(GOFILES_ALL) ## @build build the x-pack enabled version
go build -o ./x-pack/${BEAT_NAME}/${BEAT_NAME} $(GOBUILD_FLAGS) ./x-pack/${BEAT_NAME}


.PHONY: check-headers
graphaelli marked this conversation as resolved.
Show resolved Hide resolved
check-headers:
ifndef CHECK_HEADERS_DISABLED
@go get -u github.com/elastic/go-licenser
@go-licenser -d -exclude x-pack
@go-licenser -d -license Elastic x-pack
endif

.PHONY: add-headers
add-headers:
ifndef CHECK_HEADERS_DISABLED
@go get github.com/elastic/go-licenser
@go-licenser -exclude x-pack
@go-licenser -license Elastic x-pack
endif

graphaelli marked this conversation as resolved.
Show resolved Hide resolved

.PHONY: is-beats-updated
is-beats-updated: python-env
@$(PYTHON_ENV)/bin/python ./script/is_beats_updated.py ${BEATS_VERSION}
Expand Down
2 changes: 1 addition & 1 deletion NOTICE.txt
View file
Open in desktop
Expand Up @@ -264,7 +264,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--------------------------------------------------------------------
Dependency: github.com/elastic/beats
Version: master
Revision: a4b06ae0f035889416ceb0df0b552ec3c573ca1a
Revision: 17939559496bb2bf0424bc5de84105e6040eaa9e
License type (autodetected): Apache-2.0
./vendor/github.com/elastic/beats/LICENSE.txt:
--------------------------------------------------------------------
Expand Down