Fabian Reinartz
669075c6b9
Merge branch 'master' into dev-2.0
2017-06-06 09:36:51 +02:00
Christian Groschupp
8f781e411c
Openstack Service Discovery ( #2701 )
...
* Add openstack service discovery.
* Add gophercloud code for openstack service discovery.
* first changes for juliusv comments.
* add gophercloud code for floatingip.
* Add tests to openstack sd.
* Add testify suite vendor files.
* add copyright and make changes for code climate.
* Fixed typos in provider openstack.
* Renamed tenant to project in openstack sd.
* Change type of password to Secret in openstack sd.
2017-06-01 23:49:02 +02:00
Stephan Erb
14eee34da3
Update vendored go-zookeeper client ( #2778 )
...
It is likely this will fix #2758 .
2017-05-29 15:59:30 +02:00
Fabian Reinartz
4c31061251
Merge branch 'master' into dev-2.0
2017-05-24 15:36:17 +02:00
Fabian Reinartz
d289dc55c3
storage: update TSDB
2017-05-22 11:53:08 +02:00
Fazal Majid
0e05cccfbd
updated logrus so Prometheus can build on Solaris/Illumos ( #2733 )
2017-05-17 22:50:43 +02:00
Fabian Reinartz
06c2b76cd4
Merge branch 'master' into uptsdb
2017-05-16 16:48:37 +02:00
Fabian Reinartz
fbb22ddd8f
vendor: update prometheus/tsdb
2017-05-16 16:41:25 +02:00
jswitzer
713fef292a
vendor: upgrade govalidator to v6 ( #2714 )
...
* vendor: upgrade govalidator to v6
* Upgrade govalidator to latest in master.
* Run govalidator update through govendor
2017-05-15 14:35:57 +02:00
Fabian Reinartz
6e804b3497
Merge branch 'master' into dev-2.0
2017-05-12 13:29:58 +02:00
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
Fabian Reinartz
dae4a801cb
vendor: update tsdb
2017-05-09 12:53:33 +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
Fabian Reinartz
37deb21c45
vendor: remove unused dependency and last ref to fabxc/tsdb
2017-04-27 10:23:34 +02:00
Fabian Reinartz
73b8ff0ddc
Merge branch 'master' into dev-2.0
2017-04-27 10:19:55 +02: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
Fabian Reinartz
f2d610c1e5
vendor: update tsdb for fast equal matching
2017-04-10 13:00:27 +02:00
Fabian Reinartz
47b0b9f7b0
vendor: add tsdb support for windows
2017-04-04 16:55:30 +02:00
Fabian Reinartz
8ffc851147
Merge branch 'master' into dev-2.0
2017-04-04 15:17:56 +02:00
Fabian Reinartz
cfb2a7f1d5
vendor: sync organisation migration of tsdb
2017-04-04 11:33:51 +02:00
Julius Volz
111841a230
Vendor new InfluxDB client library
2017-04-03 12:38:05 +02:00
Fabian Reinartz
581f69d755
vendor: update tsdb and remove unused
2017-03-31 14:08:30 +02:00
Fabian Reinartz
a2e7b0b934
venodr: update tsdb and go-kit/log
2017-03-23 18:44:15 +01:00
Fabian Reinartz
fc2e56c13f
vendor: update tsdb
2017-03-20 14:07:25 +01:00
Fabian Reinartz
b586781283
*: update tsdb vendoring and add retention flag
2017-03-17 16:06:04 +01:00
Fabian Reinartz
b09b90a940
Correctly close querier on error, revendor tsdb
2017-03-09 15:40:52 +01:00
Fabian Reinartz
3abf54c660
Merge branch 'dev-2.0-compact' into dev-2.0
2017-03-08 17:01:32 +01:00
Fabian Reinartz
f160c4eb20
vendor: integrate various tsdb fixes
2017-03-08 16:54:48 +01:00
Fabian Reinartz
30727b1e71
Vendor compaction changes
2017-03-04 17:42:48 +01:00
Fabian Reinartz
710f3f418f
vendor: tsdb compaction changes
2017-03-03 10:06:45 +01:00
Fabian Reinartz
9304179ef7
Merge branch 'master' into dev-2.0
2017-03-02 08:16:58 +01:00
Fabian Reinartz
097a2c1e59
vendor: re-vendor storage
2017-02-28 09:34:30 +01:00
Tom Wilkie
1ab893c6ec
Limit 'discarding sample' logs to 1 every 10s ( #2446 )
...
* Limit 'discarding sample' logs to 1 every 10s
* Include the vendored library
* Review feedback
2017-02-23 19:20:39 +01:00
Julius Volz
a6d81a9f88
Update vendoring for github.com/prometheus/common/model
2017-02-20 13:23:12 +01:00
Fabian Reinartz
311e7b5069
storage/vendor: update to latest fabxc/tsdb
2017-02-20 11:11:44 +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
Fabian Reinartz
f6dae7a5ba
vendor: add fabx/tsdb
2017-02-07 03:42:02 -08:00
Fabian Reinartz
1d3cdd0d67
Merge branch 'master' into dev-2.0-rebase
2017-01-30 17:43:01 +01: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
Fabian Reinartz
89b6b3be9f
vendor: remove unused dependencies
2016-12-31 09:32:55 +01:00
Fabian Reinartz
313ab48b45
vendor: drop unused dependencies
2016-12-22 23:20:34 +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
Erdem Agaoglu
2260079c12
Vendor x/net/netutil
2016-12-06 12:52:29 +03: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