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.

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

Include tsdb tool in builds #6085

Merged
merged 1 commit into from
Oct 2, 2019
Merged

Include tsdb tool in builds #6085

merged 1 commit into from
Oct 2, 2019

Conversation

SuperQ
Copy link
Member

@SuperQ SuperQ commented Oct 1, 2019

Add the tsdb tool to promu so that it's included in the release
tarballs.

Fixes: #5870

Signed-off-by: Ben Kochie superq@gmail.com

Add the tsdb tool to promu so that it's included in the release
tarballs.

Signed-off-by: Ben Kochie <superq@gmail.com>
@krasi-georgiev
Copy link
Contributor

LGTM

@SuperQ SuperQ merged commit 0fbc8c1 into master Oct 2, 2019
@SuperQ SuperQ deleted the bjk/promu_tsdb_tool branch October 2, 2019 08:28
SuperQ added a commit that referenced this pull request Oct 2, 2019
Add the tsdb tool to promu so that it's included in the release
tarballs.

Signed-off-by: Ben Kochie <superq@gmail.com>
krasi-georgiev pushed a commit that referenced this pull request Oct 4, 2019
Add the tsdb tool to promu so that it's included in the release
tarballs.

Signed-off-by: Ben Kochie <superq@gmail.com>
@krasi-georgiev krasi-georgiev mentioned this pull request Oct 4, 2019
@bandesz
Copy link

bandesz commented Oct 8, 2019

I'm not sure if this is the cause, but make build fails for me with the following message:

/go/src/github.com/prometheus/prometheus # make build
curl -s -L https://github.com/prometheus/promu/releases/download/v0.5.0/promu-0.5.0.linux-amd64.tar.gz | tar -xvzf - -C /tmp/tmp.KEkIjP
promu-0.5.0.linux-amd64/
promu-0.5.0.linux-amd64/promu
promu-0.5.0.linux-amd64/NOTICE
promu-0.5.0.linux-amd64/LICENSE
mkdir -p /go/bin
cp /tmp/tmp.KEkIjP/promu-0.5.0.linux-amd64/promu /go/bin/promu
rm -r /tmp/tmp.KEkIjP
>> building binaries
GO111MODULE=on /go/bin/promu build --prefix /go/src/github.com/prometheus/prometheus
 >   prometheus
 >   promtool
 >   tsdb
go build github.com/prometheus/prometheus/tsdb/cmd/tsdb: build output "/go/src/github.com/prometheus/prometheus/tsdb" already exists and is a directory
!! command failed: build -o /go/src/github.com/prometheus/prometheus/tsdb -ldflags -X github.com/prometheus/common/version.Version=2.13.0-rc.0 -X github.com/prometheus/common/version.Revision=fc945c4e8a2f43f4ed40c9e9e6861e85fee8a561 -X github.com/prometheus/common/version.Branch=master -X github.com/prometheus/common/version.BuildUser=root@3a5247de0a64 -X github.com/prometheus/common/version.BuildDate=20191008-09:34:52  -extldflags '-static' -mod=vendor -a -tags netgo github.com/prometheus/prometheus/tsdb/cmd/tsdb: exit status 1
make: *** [Makefile.common:204: common-build] Error 1

See #6112.

@bandesz
Copy link

bandesz commented Oct 8, 2019

Nevermind, the build works using Go 1.13.

krasi-georgiev pushed a commit that referenced this pull request Oct 17, 2019
* Include tsdb tool in builds (#6085) (#6089)

Add the tsdb tool to promu so that it's included in the release
tarballs.

Signed-off-by: Ben Kochie <superq@gmail.com>

* web/ui: fix for CVE-2019-10215 (#6098)

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* cut 2.13 release (#6099)

Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com>

* Fix panic in ARM builds of Prometheus (#6110)

An extra sync.Pool was added during a refactor which caused some 64 bit,
atomically accessed variables to no longer be 64 bit aligned. By moving
all atomically accessed variables to the beginning of the struct they
are guaranteed to be 64 bit aligned.

Signed-off-by: Chris Marchbanks <csmarchbanks@gmail.com>

* promql: fix potential panic in the query logger (#6094)

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

* Cut release 2.13.1 (#6145)

Signed-off-by: Krasi Georgiev <8903888+krasi-georgiev@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Auto build the tsdb cli tool with every release.
3 participants