mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-09-30 12:47:33 -07:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity
5879 commits 214 branches 425 tags 748 MiB
Commit graph

5879 commits

This branch
This branch
All branches
Author SHA1 Message Date
Will Rouesnel 7810448dbe Add proxy_url parameter to allow specifying per-job HTTP proxy servers 
Allow scrape_configs to have an optional proxy_url option which specifies
a proxy to be used for all connections to hosts in that config.

Internally this modifies the various client functions to take a *url.URL pointer
which currently must point to an HTTP proxy (but has been left open-ended to
allow the url format to be extended to support others, such as maybe SOCKS if
needed).
 2015-08-08 04:29:27 +10:00
Brian Brazil e2a63d900d Merge pull request #971 from prometheus/prom-console 
Add console template for Prometheus itself
 2015-08-07 16:43:18 +01:00
Brian Brazil 992c47b2c7 Add console template for Prometheus itself 2015-08-07 16:34:48 +01:00
Fabian Reinartz a2d382627a Merge pull request #967 from fabric8io/relabelable-scheme 
Make scheme relabelable via discovery
 2015-08-06 14:15:01 +02:00
Jimmi Dyson da4c50a6cf Make scheme relabelable via discovery 2015-08-06 12:00:33 +01:00
Fabian Reinartz 7a67472fc1 Resolve relative paths on configuration loading 
This moves the concern of resolving the files relative to the config
file into the configuration loading itself.
It also fixes #921 which did not load the cert and token files relatively.
 2015-08-05 18:08:04 +02:00
Julius Volz e324910ff2 Merge pull request #936 from prometheus/predict 
promql: Add support for predict(my_timeseries[1h], 2h)
 2015-08-05 16:40:51 +02:00
Brian Brazil d6a80c2b76 promql: Add support for predict_linear(my_timeseries[1h], 7200) 
This will give a prediction for the value of my_timeseries in 2 hours,
based on the last hour of data.
 2015-08-05 15:16:49 +01:00
Fabian Reinartz abb26fb72d Merge pull request #921 from jimmidyson/target-auth-options 
Configuration options for bearer tokens, client certs & CA certs
 2015-08-04 18:23:39 +02:00
Jimmi Dyson 52cf6b3e6e Configuration options for bearer tokens, client certs & CA certs 
Fixes #918, fixes #917
 2015-08-04 17:18:46 +01:00
Fabian Reinartz e46e93dcba Merge pull request #962 from prometheus/fabxc/un-vec 
Implement unary expression for vector types.
 2015-08-04 16:44:34 +02:00
Fabian Reinartz 579fdf65e2 Implement unary expression for vector types. 
Closes #956
 2015-08-04 15:46:36 +02:00
Fabian Reinartz c322422412 Merge pull request #954 from prometheus/fabxc/fuzz-fix 
Add missing check for nil expression
 2015-08-03 16:48:20 +02:00
Fabian Reinartz adf109795c forbid unexpected (runtime) errors in parse tests 2015-08-03 12:53:31 +02:00
Fabian Reinartz c20e25f718 Add missing check for nil expression 2015-08-03 12:28:40 +02:00
Brian Brazil 2983a9ad76 Merge pull request #952 from prometheus/promql-test 
promql: Test errors aren't always ParseErr
 2015-08-03 11:01:14 +01:00
Brian Brazil a0f0b82348 promql: Test errors aren't always ParseErr 2015-08-02 23:26:21 +01:00
Fabian Reinartz ba24948ec7 Merge pull request #950 from prometheus/snmp-consoles 
Add SNMP consoles
 2015-08-02 22:47:25 +02:00
Fabian Reinartz de848f7e1a Merge pull request #949 from prometheus/fabxc/pql-rt 
Handle parser runtime panics gracefully
 2015-08-02 17:23:35 +02:00
Brian Brazil 11375a5be9 Add SNMP consoles 2015-08-02 15:41:15 +01:00
Fabian Reinartz 5279d50d92 Handle parser runtime panics gracefully 2015-08-02 13:42:18 +02:00
Fabian Reinartz a5483a43d2 Merge pull request #948 from Marmelatze/consul_port 
consul port label
 2015-07-31 18:35:26 +02:00
Florian Pfitzer 1fa0b0f253 fix consul port label 2015-07-31 16:20:17 +00:00
Brian Brazil adf7f16d1a Merge pull request #934 from prometheus/query-params 
Retrieval: Make it possible to relabel query params
 2015-07-31 11:01:45 +01:00
Brian Brazil d8875d17d8 Retrieval: Make it possible to relabel query params 
This only allows relabelling the first value
for a given parameter, this should be sufficient in practice.
 2015-07-31 10:09:28 +01:00
Julius Volz 9be9b98dcc Merge pull request #947 from keatonrow/add-anchors-to-status-h2s 
Add IDs to H2 tags to allow anchored linking
 2015-07-30 22:38:12 +02:00
Dan Williams 0441518a71 Add IDs to H2 tags to allow anchored linking 
Allow sharing links directly to areas of the status page f.e. http://prometheus.internal/#config/
 2015-07-30 15:39:05 -04:00
Johannes 'fish' Ziemke 6e7d743cd4 Merge pull request #946 from prometheus/add-sd-dns-a 
Add support for A record based DNS SD
 2015-07-30 16:01:47 +02:00
Johannes 'fish' Ziemke 9ab340e95e Add support for A record based DNS SD 
If using A records, the user needs to specify "port" and set "type" to
"A".
 2015-07-30 15:55:38 +02:00
Julius Volz 17eebbc3b4 Merge pull request #942 from prometheus/fix-unicode-digits 
Fix lexer bug treating non-Latin Unicode digits as digits.
 2015-07-29 02:21:24 +02:00
Julius Volz 4e4b468fba Fix lexer bug treating non-Latin Unicode digits as digits. 
Fixes https://github.com/prometheus/prometheus/issues/939
 2015-07-29 02:11:13 +02:00
Julius Volz 0d393de63b Merge pull request #938 from robey/master 
create a unix-style tarball with a nested folder
 2015-07-28 18:20:28 +02:00
Robey Pointer 3a5c0f30c1 create a unix-style tarball with a nested folder 2015-07-28 08:52:41 -07:00
Julius Volz 64349aade2 Merge pull request #933 from prometheus/cut-0.15.1 
Cut Prometheus version 0.15.1.
 2015-07-27 17:53:33 +02:00
Julius Volz 89bfe616d0 Cut Prometheus version 0.15.1. 2015-07-27 17:51:34 +02:00
Julius Volz 05225a538a Merge pull request #932 from prometheus/update-deps 
Update vendored dependencies.
 2015-07-27 17:50:46 +02:00
Julius Volz 33b7895481 Update vendored dependencies. 2015-07-27 17:48:37 +02:00
Julius Volz beae7b6afb Merge pull request #929 from prometheus/override-arch 
Allow overriding GOARCH and GOOS in Makefile.INCLUDE.
 2015-07-27 11:45:52 +02:00
Julius Volz 5a58e876c3 Allow overriding GOARCH and GOOS in Makefile.INCLUDE. 
This allows building binaries for different target architectures and
OSes.
 2015-07-27 11:38:30 +02:00
Julius Volz a48ce1edb7 Merge pull request #927 from prometheus/fix-matchers 
Only do regex lookups when there was no equality match.
 2015-07-25 01:31:54 +02:00
Julius Volz 517badc21d Only do regex lookups when there was no equality match. 
For the label matching index-based preselection phase, don't do an OR
between equality and non-equality matchers. Execute only one of the two
(with equality matchers preferred when present).

Fixes https://github.com/prometheus/prometheus/issues/924
 2015-07-23 23:13:30 +02:00
Björn Rabenstein a59b7ac7f8 Merge pull request #913 from prometheus/beorn7/release 
Cut release 0.15.0
 2015-07-22 19:18:12 +02:00
beorn7 b54315c30c Cut release 0.15.0 
No changes to 0.15.0rc3.

Only consolidated the CHANGELOG.md.
 2015-07-22 19:09:58 +02:00
Julius Volz 7cd82c3f32 Merge pull request #922 from brian-brazil/ne-mountpoint 
Update node disk console for new filesystem labels.
 2015-07-22 19:04:05 +02:00
Björn Rabenstein 6ee7eb79ae Merge pull request #920 from prometheus/beorn7/sd 
Add Consul ServicePort and ServiceAddress to the meta labels.
 2015-07-22 18:52:15 +02:00
Brian Brazil 9286fe55dd Update node disk console for new filesystem labels. 2015-07-22 17:20:14 +01:00
beorn7 645f6772e5 Add Consul Address, ServicePort, and ServiceAddress to the meta labels. 
In setups where the ServiceAddress is the relevant address for
scraping, users can relabel the `__address__` label to ServiceAddress
+ ":" + ServicePort.

This needs to be documented, of course. Will do once this is LGTM'd.
 2015-07-22 18:19:13 +02:00
Björn Rabenstein 31fdb85d2c Merge pull request #919 from prometheus/revert-consul-service-address 
Revert "Use Consul ServiceAddress instead of Address when set"
 2015-07-22 14:48:32 +02:00
Björn Rabenstein 276dbf8a5d Merge pull request #915 from prometheus/fix-pprof 
Fix /debug/pprof endpoint with new web router.
 2015-07-22 14:39:43 +02:00
Julius Volz 9d98910fca Revert "Use Consul ServiceAddress instead of Address when set" 
This reverts commit 0ac7e7217e.

See discussion on https://github.com/prometheus/prometheus/pull/812 for
reasoning. While fixing one use case, it breaks others, and we need a
more generic way of handling this.
 2015-07-22 13:04:29 +02:00