mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-28 23:19:41 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
5166 commits 243 branches 444 tags 649 MiB
Commit graph

198 commits

Author SHA1 Message Date
Marc Sluiter 6a633eece1 Added go-conntrack for monitoring http connections (#3241) 
Added metrics for in- and outgoing traffic with go-conntrack.
 2017-10-06 11:22:19 +01:00
Fabian Reinartz 748d392a7a vendor: remove unused dependencies 2017-10-05 15:08:24 +02:00
Fabian Reinartz f52248269e vendor: update prometheus/tsdb 2017-10-05 14:38:39 +02:00
Fabian Reinartz 2d0b8e8b94 Merge branch 'master' into dev-2.0 2017-10-05 13:09:18 +02:00
Paul Gier f79b55d057 cmd/prometheus: remove govalidator for url validation 
The usage of govalidator is redundant with the call to url.Parse for
url validation. Removing it has the following benefits:

 - The explicit error message is displayed instead of just a generic
   valid/invalid message
 - Slightly smaller code with one fewer external dependency
 - Speed improvement by removing duplicate call to url.Parse (inside
   govalidator.IsURL()
 - Resolves issue #2717

The only potential drawback of removing govalidator is that certain
URLs will be considered valid which were previously invalid. For example:

 - URLs with hostnames that start and/or end with an underscore (http://_example.com_)
 - URLs with hostnames that contain some special characters (http://foo&*bar.org)

These are valid URIs according to RFC 3986 and valid domain names per RFC 2181,
however they are not valid hostnames per RFC 952.
 2017-10-04 10:08:34 -05:00
Krasi Georgiev 3c17e51391 vendor: update go-stack to fix sigpanic when debugging with delve 
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
 2017-09-29 15:04:58 +03:00
Fabian Reinartz 34f0af30cf vendor: update prometheus/tsdb 2017-09-21 15:27:21 +02:00
Fabian Reinartz 701152d574 vendor: update tsdb revisions to master 2017-09-20 15:15:42 +02:00
Fabian Reinartz a04be0bc1c vendor: update prometheus/tsdb 2017-09-19 14:31:15 +02:00
Goutham Veeramachaneni 3f0267c548 Merge branch 'dev-2.0' into go-kit/log 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-09-15 23:15:27 +05:30
Goutham Veeramachaneni f5aed810f9 logging: Port to common/promlog 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-09-15 12:40:50 +05:30
Fabian Reinartz 2b2e214857 vendor: update prometheus/tsdb 2017-09-12 12:01:54 +02:00
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
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
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 9c60dce1de vendoring: Update vendor/golang.org/x/sys/unix/ vendoring 
No immediate need here, but after adding the windows vendoring, we
have different commits vendored from the same repository. To avoid
confusion, this commit brings them in line.
 2016-10-28 15:36:41 +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 9d91b9f2a5 vendoring: Update checksum 
Govendor insisted on changing this checksum. I don't know why.
 2016-10-28 15:21:42 +02:00
beorn7 997864a1f4 Update context vendoring 
Most fixes here are mostly http2, but since I'm suspecting a bug in
the context package, I thought we better go with the current version
to rule out bugs already fixed.
 2016-10-28 15:19:33 +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