mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-09-21 00:07:36 -07:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity
2062 commits 210 branches 425 tags 635 MiB
Commit graph

2062 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabian Reinartz 4e84b86510 Improve target discovery pipeline 
Replace the TargetProvider Stop method with done channels
that ensure properly broadcasted shutdown of the whole pipeline.
 2015-08-14 13:30:27 +02:00
Fabian Reinartz 15b4115a25 Merge pull request #986 from prometheus/fabxc/tpdoc 
Clarify docs of TargetProvider
 2015-08-14 12:07:15 +02:00
Fabian Reinartz 625374ee36 Clarify docs of TargetProvider 2015-08-14 12:02:22 +02:00
Fabian Reinartz 7f9a8ded2b Merge pull request #984 from prometheus/fabxc/dnssd 
Rename __meta_dns_srv_name to __meta_dns_name
 2015-08-13 17:58:17 +02:00
Fabian Reinartz f7e3722388 Rename __meta_dns_srv_name to __meta_dns_name 
This is change potentially breaking relabeling rules.
 2015-08-13 17:02:56 +02:00
Fabian Reinartz b964da4b75 Merge pull request #905 from fabric8io/kubernetes-discovery 
Kubernetes discovery
 2015-08-13 15:08:32 +02:00
Fabian Reinartz 24e91720ad Merge pull request #980 from prometheus/map-labels 
Retrieval: Add relabel action to map labels names with a regex.
 2015-08-13 14:36:59 +02:00
Brian Brazil 4e70a0a14e Retrieval: Add relabel action to map label names with a regex. 
The intended use case is where a user has tags/labels coming
from metadata in Kubernetes or EC2, and wants to make
some subset of them into target labels.
 2015-08-13 13:19:11 +01:00
Fabian Reinartz 4070232802 Merge pull request #983 from prometheus/tmp-hash 
config: Update tests/examples to use __tmp_
 2015-08-13 11:46:45 +02:00
Brian Brazil 43449b0581 config: Update tests/examples to use __tmp_ 2015-08-13 10:39:21 +01:00
Jimmi Dyson 923f8111d4 Initial Kubernetes discovery 
Fixes #904
 2015-08-13 10:38:52 +01:00
Brian Brazil 697347ffaf Merge pull request #982 from miekg/hashmod-md5 
Make HashMod use md5 instead of fnv
 2015-08-13 10:24:04 +01:00
Miek Gieben caaa3de4ff Make HashMod use MD5 instead of FNV 
MD5 will will distribute the inputs more uniformly over the output
space than FNV; leading to more evenly balanced load when using HashMod.
 2015-08-13 09:42:07 +01:00
Brian Brazil b5861b02ac Merge pull request #978 from prometheus/name-list 
web: Support multiple names for console graphs.
 2015-08-11 23:55:08 +01:00
Brian Brazil eb82a4b948 web: Support multiple names for console graphs. 2015-08-11 23:37:09 +01:00
Brian Brazil a8605825a0 Rollback, meant to send a PR 2015-08-11 20:02:03 +01:00
Brian Brazil 1ad449d233 web: Support multiple names for console graphs. 2015-08-11 19:59:00 +01:00
Fabian Reinartz 3c941b9e81 Merge pull request #976 from JanBerktold/web_reload 
Allow reloading via webhandler
 2015-08-11 18:06:30 +02:00
Jan Berktold fa929a8345 Change /reload to /-/reload & and fix channel type 2015-08-11 12:26:41 +02:00
Jan Berktold 2bf7048dbb Add reload handler to web 2015-08-11 11:27:15 +02:00
Fabian Reinartz cdcfada2ac Merge pull request #965 from prometheus/fabxc/relpath 
Resolve relative paths on configuration loading
 2015-08-10 19:43:42 +02:00
Fabian Reinartz 5e9ece46d5 Merge pull request #975 from prometheus/fabxc/single-query 
Remove multi-statement queries
 2015-08-10 15:13:47 +02:00
Fabian Reinartz 690b5f1575 Remove multi-statement queries 
This commit removes the possibility to have multi-statement queries
which had no full support anyway. This makes the caller responsible
for multi-statement semantics.
Multiple tests are no longer timing-dependent.
 2015-08-10 14:26:20 +02:00
Fabian Reinartz 73f1cc807d Check token and cert file existence in promtool 2015-08-10 11:42:29 +02:00
Fabian Reinartz c672973788 Merge pull request #970 from prometheus/fabxc/target-src 
Improve unique target group sources.
 2015-08-10 11:31:33 +02:00
Fabian Reinartz 0138d37458 Improve unique target group sources. 
Include position of same SD mechanisms within the same scrape configuration.
Move unique prefixing out of SD implementations and target manager into
its own interface.
 2015-08-10 11:29:09 +02:00
Fabian Reinartz 54202bc5a8 Merge pull request #902 from xperimental/feature/marathon-discovery 
retrieval/discovery: Service discovery using marathon API
 2015-08-10 01:43:37 +02:00
Robert Jacob 4d0f974c42 Add service discovery using Marathon API. 2015-08-10 01:36:24 +02:00
Fabian Reinartz 747e7709c6 Merge pull request #974 from prometheus/fabxc/authors 
Update Authors
 2015-08-10 00:13:59 +02:00
Fabian Reinartz 5a21b334d8 Update Authors 2015-08-10 00:11:12 +02:00
Fabian Reinartz 9fa7eeb095 Merge pull request #973 from laushinka/master 
Don't warn about equal timestamps during append.
 2015-08-09 23:55:28 +02:00
Laurie Malau 20ad403587 Don't warn/increment metric upon equal timestamps during append. 
Perhaps it would be even better to still warn in case the sample value has
changed but the timestamps are equal, but we don't have efficient access
to the last value.
 2015-08-09 23:49:49 +02:00
Fabian Reinartz 113ac96a71 Merge pull request #943 from wrouesnel/scrape_config_httpproxy 
[RFC] Add http_proxy parameter to allow specifying per-job HTTP proxy servers
 2015-08-08 15:11:52 +02:00
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