Julius Volz
f65ef1ed10
Fix wording in shutdown warning.
9 years ago
Fabian Reinartz
79eb208d0f
Merge pull request #995 from prometheus/relabel-replace
...
retrieval: Don't include unmatched source of regex in replacement.
9 years ago
Brian Brazil
e1d5eb52f2
retrieval: Don't include unmatched source of regex in replacement.
...
ReplaceAllString only replaces the matching part of the regex,
the unmatched bits around it are left in place. This is not the
expected or desired behaviour as the replacement string should
be everything.
This may break users dependant on this behaviour, but
what they're doing is still possible.
9 years ago
Brian Brazil
60967736fa
Merge pull request #993 from prometheus/fabxc/filesd_interval
...
Increase default retry interval for file SD
9 years ago
Fabian Reinartz
139f27bf8a
Increase default retry interval for file SD
...
The automatic refresh is a safety mechanism in case
file watches fail. As they seem to be working well the
interval can be increased.
9 years ago
Fabian Reinartz
4ee88017f3
Merge pull request #992 from prometheus/term-docs
...
Storage: Tell users how to avoid crash recovery.
9 years ago
Brian Brazil
0ec71442cd
Storage: Tell users how to avoid crash recovery.
...
If users see the crash recovery error, the chances are
they aren't shutting down Prometheus correctly. Telling
them how to do so will help them debug and fix the problem.
9 years ago
Fabian Reinartz
d8f5da9152
Merge pull request #990 from prometheus/fabxc/allconsul
...
Scrape all services on empty services list.
9 years ago
Fabian Reinartz
3c6dd161d7
Scrape all services on empty services list.
9 years ago
Fabian Reinartz
9b9ff66212
Merge pull request #977 from prometheus/fabxc/target-dedup
...
Improve target discovery pipeline
9 years ago
Fabian Reinartz
b1e60e58ec
Merge pull request #988 from prometheus/fabxc/fixreload
...
Fix loop-reloading on shutdown
9 years ago
Fabian Reinartz
18c0f347a3
Fix loop-reloading on shutdown
9 years ago
Fabian Reinartz
9e9f88b5ce
Merge pull request #987 from prometheus/fabxc/marathonfix
...
Add application labels as meta labels
9 years ago
Fabian Reinartz
8fa9ec278b
Add application labels as meta labels
...
Removes built-in conditional scraping based on application's
'prometheus' label.
9 years ago
Fabian Reinartz
f269943950
Adjust Kubernetes SD to pipeline changes
9 years ago
Fabian Reinartz
4e84b86510
Improve target discovery pipeline
...
Replace the TargetProvider Stop method with done channels
that ensure properly broadcasted shutdown of the whole pipeline.
9 years ago
Fabian Reinartz
15b4115a25
Merge pull request #986 from prometheus/fabxc/tpdoc
...
Clarify docs of TargetProvider
9 years ago
Fabian Reinartz
625374ee36
Clarify docs of TargetProvider
9 years ago
Fabian Reinartz
7f9a8ded2b
Merge pull request #984 from prometheus/fabxc/dnssd
...
Rename __meta_dns_srv_name to __meta_dns_name
9 years ago
Fabian Reinartz
f7e3722388
Rename __meta_dns_srv_name to __meta_dns_name
...
This is change potentially breaking relabeling rules.
9 years ago
Fabian Reinartz
b964da4b75
Merge pull request #905 from fabric8io/kubernetes-discovery
...
Kubernetes discovery
9 years ago
Fabian Reinartz
24e91720ad
Merge pull request #980 from prometheus/map-labels
...
Retrieval: Add relabel action to map labels names with a regex.
9 years ago
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.
9 years ago
Fabian Reinartz
4070232802
Merge pull request #983 from prometheus/tmp-hash
...
config: Update tests/examples to use __tmp_
9 years ago
Brian Brazil
43449b0581
config: Update tests/examples to use __tmp_
9 years ago
Jimmi Dyson
923f8111d4
Initial Kubernetes discovery
...
Fixes #904
9 years ago
Brian Brazil
697347ffaf
Merge pull request #982 from miekg/hashmod-md5
...
Make HashMod use md5 instead of fnv
9 years ago
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.
9 years ago
Brian Brazil
b5861b02ac
Merge pull request #978 from prometheus/name-list
...
web: Support multiple names for console graphs.
9 years ago
Brian Brazil
eb82a4b948
web: Support multiple names for console graphs.
9 years ago
Brian Brazil
a8605825a0
Rollback, meant to send a PR
9 years ago
Brian Brazil
1ad449d233
web: Support multiple names for console graphs.
9 years ago
Fabian Reinartz
3c941b9e81
Merge pull request #976 from JanBerktold/web_reload
...
Allow reloading via webhandler
9 years ago
Jan Berktold
fa929a8345
Change /reload to /-/reload & and fix channel type
9 years ago
Jan Berktold
2bf7048dbb
Add reload handler to web
9 years ago
Fabian Reinartz
cdcfada2ac
Merge pull request #965 from prometheus/fabxc/relpath
...
Resolve relative paths on configuration loading
9 years ago
Fabian Reinartz
5e9ece46d5
Merge pull request #975 from prometheus/fabxc/single-query
...
Remove multi-statement queries
9 years ago
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.
9 years ago
Fabian Reinartz
73f1cc807d
Check token and cert file existence in promtool
9 years ago
Fabian Reinartz
c672973788
Merge pull request #970 from prometheus/fabxc/target-src
...
Improve unique target group sources.
9 years ago
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.
9 years ago
Fabian Reinartz
54202bc5a8
Merge pull request #902 from xperimental/feature/marathon-discovery
...
retrieval/discovery: Service discovery using marathon API
9 years ago
Robert Jacob
4d0f974c42
Add service discovery using Marathon API.
9 years ago
Fabian Reinartz
747e7709c6
Merge pull request #974 from prometheus/fabxc/authors
...
Update Authors
9 years ago
Fabian Reinartz
5a21b334d8
Update Authors
9 years ago
Fabian Reinartz
9fa7eeb095
Merge pull request #973 from laushinka/master
...
Don't warn about equal timestamps during append.
9 years ago
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.
9 years ago
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
9 years ago
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).
9 years ago
Brian Brazil
e2a63d900d
Merge pull request #971 from prometheus/prom-console
...
Add console template for Prometheus itself
9 years ago