mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-10 15:44:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
2083 commits 245 branches 436 tags 652 MiB
Commit graph

2083 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabian Reinartz f592740bac Only exit static target provider on done 2015-08-18 11:51:53 +02:00
Julius Volz b4adf2723d Merge pull request #994 from robbiet480/consul-datacenter-name 
Pass through current agent Consul datacenter name
 2015-08-18 01:09:24 +02:00
Robbie Trencheny 48e461f7db Pass through current agent Consul datacenter name 
Instead of only filling __meta_consul_dc when datacenter is set in
consul_sd_config this change fills the label based on what the agent
reports it's current data center is, if datacenter isn't manually set,
otherwise it uses whatever datacenter was set to.
 2015-08-17 16:00:26 -07:00
Fabian Reinartz d0a90964c1 Fix license header 2015-08-17 19:51:12 +02:00
Fabian Reinartz eabbdc6603 Add missing license headers 2015-08-17 19:49:10 +02:00
Julius Volz 47a96bff1a Update constant names in comments. 2015-08-17 15:05:06 +02:00
Julius Volz f65ef1ed10 Fix wording in shutdown warning. 2015-08-17 14:26:53 +02:00
Fabian Reinartz 79eb208d0f Merge pull request #995 from prometheus/relabel-replace 
retrieval: Don't include unmatched source of regex in replacement.
 2015-08-17 12:17:37 +02:00
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.
 2015-08-17 00:31:56 +01:00
Brian Brazil 60967736fa Merge pull request #993 from prometheus/fabxc/filesd_interval 
Increase default retry interval for file SD
 2015-08-16 14:08:29 +01:00
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.
 2015-08-16 15:06:26 +02:00
Fabian Reinartz 4ee88017f3 Merge pull request #992 from prometheus/term-docs 
Storage: Tell users how to avoid crash recovery.
 2015-08-16 12:00:02 +02:00
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.
 2015-08-16 10:42:31 +01:00
Fabian Reinartz d8f5da9152 Merge pull request #990 from prometheus/fabxc/allconsul 
Scrape all services on empty services list.
 2015-08-14 17:46:45 +02:00
Fabian Reinartz 3c6dd161d7 Scrape all services on empty services list. 2015-08-14 17:39:41 +02:00
Fabian Reinartz 9b9ff66212 Merge pull request #977 from prometheus/fabxc/target-dedup 
Improve target discovery pipeline
 2015-08-14 16:38:16 +02:00
Fabian Reinartz b1e60e58ec Merge pull request #988 from prometheus/fabxc/fixreload 
Fix loop-reloading on shutdown
 2015-08-14 16:35:17 +02:00
Fabian Reinartz 18c0f347a3 Fix loop-reloading on shutdown 2015-08-14 16:29:34 +02:00
Fabian Reinartz 9e9f88b5ce Merge pull request #987 from prometheus/fabxc/marathonfix 
Add application labels as meta labels
 2015-08-14 15:38:27 +02:00
Fabian Reinartz 8fa9ec278b Add application labels as meta labels 
Removes built-in conditional scraping based on application's
'prometheus' label.
 2015-08-14 15:34:02 +02:00
Fabian Reinartz f269943950 Adjust Kubernetes SD to pipeline changes 2015-08-14 13:30:27 +02:00
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