github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,852 Commits
252 Branches
442 Tags
628 MiB
Commit Graph

68 Commits (b0e1ea7c6c27f0a0c5cdfab01225f9d5e6eb589b)

Author SHA1 Message Date
Fabian Reinartz 11aa049b05 Merge branch 'release-1.6' into merge16 2017-05-11 15:00:51 +02:00
Fabian Reinartz ddbbd2b712 Merge branch 'release-1.5' into cut162 2017-05-11 14:29:49 +02:00
Fabian Reinartz 2ff8855ae6 discovery/k8s: update client library 2017-05-11 13:53:12 +02:00
Tom Wilkie 4d9b917d11 Instrument Prometheus with OpenTracing (#2554) 
* Use request.Context() instead of a global map of contexts.

* Add some basic opentracing instrumentation on the query path.

* Remove tracehandler endpoint.
 2017-05-02 18:49:29 -05:00
Conor Broderick 314b81062d Updated vendoring for log level reporting issue (#2660) 2017-04-27 14:25:13 +01:00
beorn7 1ae50b1d1b vendoring: Update client_golang/prometheus 
This is mostly required to enable summaries without quantiles
 2017-04-11 12:58:24 +02:00
beorn7 92d4cf7663 vendoring: Remove unused packages 2017-04-11 12:58:24 +02:00
Julius Volz 111841a230 Vendor new InfluxDB client library 2017-04-03 12:38:05 +02:00
Julius Volz a6d81a9f88 Update vendoring for github.com/prometheus/common/model 2017-02-20 13:23:12 +01:00
beorn7 b4ce5ca925 vendoring: Do not ignore appengine build tags 
For weird reasons, this excluded github.com/miekg/dns/udp_other.go
from vendoring.
 2017-02-14 18:32:07 +01:00
James Hartig e7ce10d4e5 vendoring: Update github.com/miekg/dns 
This is needed to get the NameList function to get query names
 2017-02-13 15:40:45 -05:00
beorn7 86ec87b78f vendoring: Update prometheus/common to pull in bug fixes 
In particular the one for https://github.com/prometheus/common/issues/72.
 2017-01-09 12:25:17 +01:00
beorn7 906c3a2237 Update vendoring for Azure 
Also, actually record the vendored version in vendor.json.
 2016-12-13 14:21:16 +01:00
Fabian Reinartz ec66082749 Merge branch 'ec2_sd_profile_support' of https://github.com/Ticketmaster/prometheus into Ticketmaster-ec2_sd_profile_support 2016-11-21 11:49:23 +01:00
beorn7 92c0ef1a92 Merge branch 'release-1.2' into beorn7/release 2016-11-03 22:48:39 +01:00
Kraig Amador ba3fcceaa5 vendoring: updated aws-sdk-go to v1.5.1 2016-11-03 08:37:56 -07:00
beorn7 9a63ff0c32 Update vendoring github.com/miekg/dns 
This is to pull in bug fixes. However, it also requires code changes,
see next commit.
 2016-11-03 14:40:30 +01:00
beorn7 5b16d6bd6e Merge branch 'release-1.2' 2016-10-31 00:06:23 +01:00
beorn7 b216e91b61 Revert "Update github.com/miekg/dns to pull in bug fixes." 
This reverts commit 590446434f.

Sadly, there's a problem with truncated messages:
WARN[0684] resolving all.telemetry.pm.prod.bazooka.dd.srv.int.s-cloud.net failed: dns: failed to unpack truncated message  source=dns.go:187

We have to revisit the SRV DNS part later.
 2016-10-30 16:37:32 +01:00
beorn7 d2f1ace31d vendoring: re-add snappy/*_other.go files 
For some reason, govendor doesn't add these files (but it works for
platform dependent files elsewhere).
 2016-10-28 16:03:10 +02:00
beorn7 0cc51a5c5d vendoring: Vendor packages not vendored so far 2016-10-28 15:34:39 +02:00
beorn7 43cddad30b vendor: Update consul client 
We were so much behind...
 2016-10-28 15:27:00 +02:00
beorn7 5754f5237e vendoring: Clean up files accidentally left behind 2016-10-28 15:23:59 +02:00
beorn7 56c9e024cb Update goleveldb vendoring to pick up many bug fixes 
Including data races and shutdown fixes.
Might be the reason for some reported problems.
 2016-10-28 14:58:36 +02:00
beorn7 13c1086f18 Update vendoring of our own Prometheus packages. 
This most notably updates to v0.8.0 of client_golang.
Also, it unifies the commit of different packages from the same repo.
 2016-10-28 14:54:47 +02:00
beorn7 590446434f Update github.com/miekg/dns to pull in bug fixes. 
Most notable a race condition.
 2016-10-28 14:42:36 +02:00
beorn7 98e6e4fbee Update github.com/golang/protobuf/proto vendoring 
This fixes a memory leak in Unmarshal code
 2016-10-28 14:33:45 +02:00
Frederic Branczyk e6dc9b05d5 vendor: update govalidator package (#2125) 
Fixes #2025
 2016-10-28 14:16:36 +02:00
Frederic Branczyk 04dfd2fab3 vendor: update govalidator package (#2125) 
Fixes #2025
 2016-10-27 09:55:42 +01:00
Fabian Reinartz 1df905ea42 vendor: add testing require dependencies 2016-10-17 11:04:52 +02:00
Fabian Reinartz 7c439a9060 kubernetes: use and vendor 1.5 client 2016-10-17 10:32:10 +02:00
Julius Volz 4f79072fd1 Update common/route vendoring for contextFn errors 2016-10-02 23:04:03 +02:00
Julius Volz c0889fd92e Merge pull request #2032 from prometheus/separate-chunk-package 
storage: separate chunk package, publish more names
 2016-10-02 20:48:08 +02:00
Julius Volz 50b5837a63 Update github.com/prometheus/common/model vendoring 2016-09-28 23:42:45 +02:00
Julius Volz 0c64ad1a3d Merge pull request #2012 from prometheus/context-consolidation 
api: Consolidate web API contexts
 2016-09-28 14:38:39 +02:00
Fabian Reinartz 57b358b82a vendor: update govalidator (#2023) 
Fixes #2022
 2016-09-23 01:06:51 +02:00
Julius Volz 766074568e Update vendoring of github.com/prometheus/common/route 2016-09-21 03:22:14 +02:00
Julius Volz d8ce6e5849 Update vendoring. 2016-08-30 17:19:18 +02:00
Brian Brazil 72475cfa84 Update vendoring 2016-08-30 17:19:18 +02:00
beorn7 25385aafcb Explicitly add logging flags to our custom flag set 
In https://github.com/prometheus/prometheus/pull/1782 , we moved to a
custom flag set to avoid getting test flags into the main prometheus
binary. However, that removed the logging flags, too. This commit
updates the vendoring to a version of the log package that allows
adding the log flags to our flag set explicitly.
 2016-07-20 17:27:39 +02:00
Fabian Reinartz 7d441abd7b vendor: update prometheus org dependencies 2016-07-04 11:09:06 +02:00
Fabian Reinartz e4e8479716 vendor: add missing liencse/patent notices 2016-07-04 11:06:26 +02:00
Fabian Reinartz bc506ce959 vendor: update goleveldb dependencies 2016-07-04 10:08:49 +02:00
Fabian Reinartz e2bc30585f vendor: update common/expfmt 
Update the exposition library to drop the JSON format decoding.
 2016-06-23 17:21:06 +02:00
Ali Reza 5e2b197a00 Update vendoring for github.com/prometheus/common/log 2016-05-27 00:20:54 +07:00
beorn7 8032763db1 Update vendoring of github.com/prometheus/common/... 2016-05-20 13:44:37 +02:00
Steve Durrheimer 399d5c6375
Make version informations consistent between prometheus components 2016-05-05 22:33:18 +02:00
Fabian Reinartz 838c74ee9f vendor: update govalidator 2016-04-24 10:13:39 +02:00
Seth Miller 79fe798e67 Add vendoring for Azure discovery 2016-04-06 22:48:01 -05:00
Brian Brazil da5311a35f Update common dependency to pick up label fix for #1489 2016-03-24 12:46:53 +00:00