Commit graph

254 commits

Author SHA1 Message Date
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 cb84d6057e vendor: add non-amd64 implementation for xxhash 2017-04-04 15:19:22 +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 b416ccb650 vendor: add old inluxdb client 2017-03-07 12:04:15 +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
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
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
beorn7 6946fb2058 Update common/expfmt vendoring 2016-02-11 16:08:29 +01:00
beorn7 cfc15cf103 Update common/model vendoring 2016-01-29 15:33:00 +01:00
Fabian Reinartz d9f836e5b8 Merge pull request #1340 from prometheus/validate-externa-url
Validate URL parameters
2016-01-27 15:49:08 +01:00
Julius Volz 1ae23bf5e9 Handle OPTIONS HTTP requests correctly.
Fixes https://github.com/prometheus/prometheus/issues/1346
2016-01-26 12:31:44 +01:00
Tobias Schmidt 122d73858d Validate URL parameters 2016-01-25 00:37:09 -05:00
Fabian Reinartz 13da34f241 Update common/model vendoring 2016-01-22 12:16:39 +01:00
Tobias Schmidt 364dd36bde Add missing license files of vendored packages
With the total optimized copy command. Assumes all vendored packages are
checked out in $GOPATH.

    govendor list +v | awk '{print $2}' | while read dep; do echo $dep |
    cut -d/ -f1-3; done | uniq | while read dep; do find
    $GOPATH/src/$dep -name LICENSE -o -name NOTICE | grep -v vendor |
    sed "s;$GOPATH/src/;;"; done | while read license; do [ -f
    vendor/$license ] || cp $GOPATH/src/$license vendor/$license; done
2016-01-21 14:44:58 -05:00
Fabian Reinartz cadca0aa23 Upgrade common/log vendoring.
Fixes #1186
2016-01-04 14:48:35 +01:00
Fabian Reinartz e0f70ed5ca Update common/{expfmt,model}
Closes #1232
2015-12-10 11:19:46 +01:00
Fabian Reinartz 9107f583aa Update vendoring 2015-10-26 13:40:45 +01:00
Fabian Reinartz 21a7b94d6c Upgrade common/log vendoring 2015-10-24 21:37:05 +02:00
Matt Jibson 5ba5a31e12 vendor EC2 dependencies 2015-10-06 18:36:19 -04:00
Fabian Reinartz e3b6ec9784 Switch to common/log 2015-10-03 10:21:43 +02:00
Fabian Reinartz 398bbf906b Switch to common/route package 2015-09-24 17:08:47 +02:00
Fabian Reinartz 327152862c Update expfmt.NewDecoder usage 2015-09-22 12:11:28 +02:00
Fabian Reinartz 4876e92014 Upgrade expfmt vendoring 2015-09-17 17:20:08 +02:00
Julius Volz eeb1da36ac Fix InfluxDB write support to work with InfluxDB 0.9.x.
Because the InfluxDB client library currently pulls in multiple MBs of
unnecessary dependencies, I have modified and cut up the vendored
version to only pull in the few pieces that are actually needed.

On InfluxDB's side, this dependency issue is tracked in:

https://github.com/influxdb/influxdb/issues/3447

Hopefully, it will be resolved soon.

If a password is needed for InfluxDB, it may be supplied via the
INFLUXDB_PW environment variable.
2015-09-16 17:40:03 +02:00
Fabian Reinartz 468d2eb60e Vendoring via govendor 2015-09-15 15:37:12 +02:00