github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,366 Commits
255 Branches
442 Tags
625 MiB
Commit Graph

5366 Commits (c6399296dcc059bbc496f40e31aa2c7b7a341951)

Author SHA1 Message Date
Frederic Branczyk 3287b9a4b8
Merge pull request #4579 from bwplotka/ensure-genproto-works 
proto: Allow reproducible proto generation.
 2018-11-06 15:46:56 +01:00
Bryan Boreham cf37e1feb4 Add __meta_kubernetes_pod_phase label in discovery (#4824) 
This lets you add a relabel rule to drop scrapes for pods which are
not running.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2018-11-06 14:40:24 +00:00
Silvio Gissi 6100f160ad EC2 Platform meta label (#4663) 
Set __meta_ec2_platform label with the instance platform string. Set to 'windows' on Windows servers and absent otherwise.


Signed-off-by: Silvio Gissi <silvio@gissilabs.com>
 2018-11-06 14:39:48 +00:00
Mucahit Kurt 4a6c329d71 add alert template expanding failure metric (#4747) 
Signed-off-by: Mucahit Kurt <mucahitkurt@gmail.com>
 2018-11-06 14:39:06 +00:00
Frederic Branczyk c2f32c99cf
Merge pull request #4826 from brancz/cut-2.5.0 
*: Cut v2.5.0
 2018-11-06 11:34:27 +01:00
Frederic Branczyk 98e4d8f6e4
*: Cut v2.5.0 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2018-11-06 09:20:09 +01:00
Frederic Branczyk 4d4b5c9d12
Merge pull request #4809 from brancz/cut-2.5.0-rc.2 
*: Cut v2.5.0-rc.2
 2018-10-31 11:14:47 +01:00
Frederic Branczyk b76dd3513b
*: Cut v2.5.0-rc.2 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2018-10-31 09:52:34 +01:00
Frederic Branczyk dbe8acce94
Merge pull request #4806 from simonpasquier/fix-targets-page 
web: display job label in targets page
 2018-10-31 08:34:09 +01:00
Simon Pasquier 147f2061d5 web: display job label in targets page 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-30 16:20:43 +01:00
Simon Pasquier 4fc6e22067 Set GO111MODULE when running staticcheck 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:43 +01:00
Simon Pasquier 5bd9010196 More updates for libraries 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:43 +01:00
Simon Pasquier be68fb0f30 Update Makefile.common to support libraries 
Specifically tsdb and client_golang that don't use vendoring.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:43 +01:00
Simon Pasquier 790876da60 go get honnef.co/go/tools/cmd/staticcheck in a temp dir 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:43 +01:00
Simon Pasquier f6f2778528 add comment for honnef.co/go/tools 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:43 +01:00
Simon Pasquier 1a0a570c91 run 'go generate' with proper options 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:43 +01:00
Simon Pasquier 71e0ec7512 improve unused recipe for go modules 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:43 +01:00
Simon Pasquier 79e0fb5a3d Tidy up Makefile.common 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:43 +01:00
Simon Pasquier ac16ef8f0e Add missing tools.go 
Also rearrange the code to be more consistent.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:43 +01:00
Simon Pasquier b9f824e617 try go install honnef.co/tools/cmd/staticcheck 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:43 +01:00
Simon Pasquier ea18ea66b1 GOOS= and GOARCH= 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:43 +01:00
Simon Pasquier cc1b953394 go list -m honnef.co/go/tools 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:43 +01:00
Simon Pasquier ea55bd61d0 Revert "fix go.sum" 
This reverts commit bbc2810f312d90b372f64eb3612499d020c7353b.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:43 +01:00
Simon Pasquier ea62a5274d fix go.sum 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:43 +01:00
Simon Pasquier c141833d45 *: use staticcheck@next to support Go modules 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:43 +01:00
Simon Pasquier 80de93b6af *: support for Go modules 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:43 +01:00
Simon Pasquier c706b416bd vendor: run 'go mod vendor' from scratch 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:43 +01:00
Simon Pasquier a77b4512da update go.sum 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier 089f5b173c pin gopkg.in/yaml.v2 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier e4b3ea99ca pin golang.org/x/text 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier a6dc7ea8b1 pin golang.org/x/sys 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier 4b12a87daa pin golang.org/x/net 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier 6aa77dfaaa pin github.com/golang/protobuf 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier a516bc2160 *: add go.mod and go.sum files 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier f02c64fe5e vendor: commit vendor/ after running govendor sync 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier 7a35325d4e vendor: remove unused packages from vendor.json 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier ae47fc2aca vendor: fix revision for gopkg.in/inf.v0 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier 2fc8b37807 vendor: fix revision for github.com/sasha-s/go-deadlock 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier b718d25fee vendor: fix revision for github.com/pmezard/go-difflib/difflib 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier 79b5203a78 vendor: fix revision for github.com/google/gofuzz 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier 9a88ec93af vendor: fix revision for github.com/golang/glog 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier ddcf94881e vendor: fix revision for github.com/ghodss/yaml 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier 8c754c88fd vendor: fix revision for github.com/davecgh/go-spew/spew 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier 9ee6aa6fc4 vendor: fix revision for github.com/petermattis/goid 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier c21f9c0200 vendor: fix revision for google.golang.org/genproto/googleapis/rpc/status 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Simon Pasquier 79a4269f73 vendor: fix revision for google.golang.org/grpc packages 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
 2018-10-29 17:25:42 +01:00
Frederic Branczyk f34b2602e1
Merge pull request #4794 from brancz/cut-2.5.0-rc.1 
*: Cut v2.5.0-rc.1
 2018-10-29 17:20:23 +01:00
Frederic Branczyk d04148ab86
*: Cut v2.5.0-rc.1 
Signed-off-by: Frederic Branczyk <fbranczyk@gmail.com>
 2018-10-29 16:21:10 +01:00
nilsocket fe0f0da6b3 docs: add missing word (time) (#4797) 
Signed-off-by: nilsocket <nilsocket@gmail.com>
 2018-10-28 07:36:09 +00:00
Frederic Branczyk 4800401eec
Merge pull request #4785 from ti-mo/master 
Add documentation for new marathon-sd functionality
 2018-10-26 17:30:23 +02:00