mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-10 15:44:05 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
4267 commits 245 branches 436 tags 652 MiB
Commit graph

136 commits

Author SHA1 Message Date
Fabian Reinartz a007eb2e1e vendor: update prometheus/tsdb to single head mode 2017-09-07 14:14:33 +02:00
Fabian Reinartz 87918f3097 Merge branch 'master' into dev-2.0 2017-09-04 14:09:21 +02:00
Tobias Schmidt 29fff1eca4 Merge pull request #2966 from alkalinecoffee/consul-node-metadata 
Add support for consul's node metadata
 2017-09-02 18:43:25 +02:00
CuiHaozhi b1c18bf29b discovery openstack: support discovery hosts, add rule option. 
Signed-off-by: CuiHaozhi <cuihz@wise2c.com>
 2017-08-29 10:14:00 -04:00
Fabian Reinartz 24b246ac28 vendor: update prometheus/tsdb 2017-08-18 10:08:59 +02:00
Fabian Reinartz 146191a913 vendor: update prometheus/tsdb 2017-08-11 13:47:15 +02:00
Fabian Reinartz 2037778d14 vendor: update TSDB 2017-08-10 14:51:02 +02:00
Fabian Reinartz 4d3d8ee229 Merge pull request #2850 from tomwilkie/dev-2.0-remote 
Remote APIs for v2
 2017-08-03 13:39:09 +02:00
Fabian Reinartz 4acb1d2b21 vendor: update kingpin 2017-07-27 13:08:20 +02:00
Joe Martin 7f2402085a update consul api dependency 2017-07-18 16:46:08 -04:00
Fabian Reinartz 6aee36ac3b vendor: update prometheus/tsdb 2017-07-12 14:01:56 +02:00
Tom Wilkie 2dda5775e3 Initial port of remote storage to v2. 2017-07-12 12:27:57 +01:00
Fabian Reinartz dc15a6f6ea vendor: add and update proto/grpc vendoring 2017-07-06 14:38:20 +02:00
Fabian Reinartz 8a2850b5e1 vendor: add missing app engine dependencies 2017-07-05 16:39:50 +02:00
Fabian Reinartz 426125298e vendor: update prometheus/tsdb 2017-07-03 14:41:02 +02:00
Fabian Reinartz ca2b68889b Merge branch 'master' into dev-2.0 2017-06-23 13:15:44 +02:00
Fabian Reinartz 8088600202 vendor: add kingpin, drop unused deps 2017-06-20 17:37:40 +02:00
Goutham Veeramachaneni f40a5990a0
vendor: Update common/model 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 20:20:44 +05:30
Goutham Veeramachaneni 771e5a5d1d
vendor: gh/Sirupsen/logrus -> gh/sirupsen/logrus 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 16:04:33 +05:30
Goutham Veeramachaneni c399563ec1
vendor: Update common/log 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 15:49:41 +05:30
Goutham Veeramachaneni ea255c6520
vendor: Add win specific dependency 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-15 17:02:37 +05:30
Goutham Veeramachaneni cbeeaf48aa
vendor: Add cobra and pflag 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-15 16:36:36 +05:30
Fabian Reinartz 7640960469 vendor: update tsdb (#2840) 2017-06-13 07:44:07 +02:00
Frederic Branczyk d6a55c3013
vendor: fix mixed versions of gophercloud packages 2017-06-07 09:21:43 +02:00
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