Julius Volz
a7c248e3b1
Merge pull request #1017 from prometheus/crash-on-web-error
...
Exit when web server encounters a startup error
2015-08-21 13:15:06 +02:00
Brian Brazil
725a507206
Merge pull request #1019 from mrwacky42/add-consul-service-id
...
Add Consul ServiceID to the discovery meta labels.
2015-08-21 09:36:18 +01:00
Sharif Nassar
6cb519fe82
Add Consul ServiceID to the discovery meta labels.
2015-08-20 14:04:42 -07:00
Julius Volz
274e9d6955
Exit when web server encounters a startup error
2015-08-20 18:23:57 +02:00
Fabian Reinartz
ac0be60bb9
Add license headers
2015-08-20 13:03:56 +02:00
Brian Brazil
296f551418
Merge pull request #1014 from prometheus/scalar-rules
...
rules: Allow recorded rules expressions to be scalars.
2015-08-19 22:10:49 +01:00
Brian Brazil
e6a67476c2
rules: Allow recorded rules expressions to be scalars.
...
This is useful if you want to build up a constant metric,
such as a set of alert thresholds that vary by label value.
2015-08-19 21:09:00 +01:00
Fabian Reinartz
6a713eedca
Merge pull request #1012 from laushinka/master
...
Log runtime errors during query evaluation instead of panicking.
2015-08-19 17:21:11 +02:00
Laurie Malau
cdf38ab93a
Log runtime errors during query evaluation instead of panicking.
2015-08-19 16:56:41 +02:00
Fabian Reinartz
b615efbf21
Merge pull request #1011 from prometheus/fabxc/travis
...
simplify travis
2015-08-19 16:31:38 +02:00
Fabian Reinartz
863bbd2be4
simplify travis
2015-08-19 16:15:18 +02:00
Julius Volz
2b0c153288
Merge pull request #998 from prometheus/label-replace
...
Implement label_replace().
2015-08-18 16:01:36 +02:00
Julius Volz
832ae147e0
Merge pull request #1000 from prometheus/remove-silencing-link
...
Remove broken alert silencing links.
2015-08-18 14:59:07 +02:00
Julius Volz
e88007306c
Remove broken alert silencing links.
...
Let's remove the silencing links until we actually have support for that.
A silencing link shouldn't only redirect to Alertmanager, but also open a
silencing dialog for the respective alert name or active alert element.
2015-08-18 14:48:57 +02:00
Fabian Reinartz
0f5022c091
Add missing Kubernetes doc strings
2015-08-18 14:37:28 +02:00
Julius Volz
27ed874358
Implement label_replace()
...
Implements part of https://github.com/prometheus/prometheus/issues/959 .
2015-08-18 14:20:07 +02:00
Fabian Reinartz
205d391409
Merge pull request #999 from prometheus/fabxc/spinfix
...
Only exit static target provider on done
2015-08-18 12:01:53 +02:00
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
