d6d88f8950
Add missing license headers
2015-08-24 19:19:21 +02:00
9cf123d2f0
Merge pull request #1020 from prometheus/alert-templates-type
...
Cast value to float, as that's what the console templates expect.
2015-08-24 17:02:00 +01:00
fdf0d0642e
Cast value to float, as that's what the console templates expect.
2015-08-24 16:59:08 +01:00
25a8bd50a5
Merge pull request #1024 from prometheus/fix-updatetargets-busyloop
...
Fix busylooping in case of no target providers.
2015-08-24 17:14:56 +02:00
d36a7f4e6f
Fix busylooping in case of no target providers.
...
merge() closes the channel that handleUpdates() reads from when there
are zero configured target providers in the configuration. In that case,
the for-select loop in handleUpdates() entered a busy loop. It should
exit when the upstream channel is closed.
2015-08-24 16:42:28 +02:00
8769a75183
Merge pull request #1023 from prometheus/model
...
More type cleanup
2015-08-24 12:59:19 +02:00
1535ef1457
Replace metric.SamplePair with model.SamplePair
2015-08-22 14:52:35 +02:00
c9d396f476
Replace metric.LabelPair with model.LabelPair
2015-08-22 13:32:13 +02:00
3a0145c09e
Reenable blocked appending tests
2015-08-22 09:47:57 +02:00
438e232c9b
Fix grouping of import blocks
2015-08-22 09:42:45 +02:00
6d0f58dcf3
sanitize scrape health recording code
2015-08-21 23:01:08 +02:00
1a7f701359
Merge pull request #1018 from prometheus/fabxc/model
...
Switch to common/{model,expfmt}
2015-08-21 18:07:32 +02:00
25bf5fdaf5
Timeout sample appends
2015-08-21 18:04:35 +02:00
47aa0d536c
Use common/expfmt in federation
2015-08-21 13:33:38 +02:00
11a577fcd0
Switch to common/expfmt for extraction
2015-08-21 13:33:38 +02:00
f237b0e2da
Vendor common/expfmt package
2015-08-21 13:33:38 +02:00
306e8468a0
Switch from client_golang/model to common/model
2015-08-21 13:33:38 +02:00
7a6d12a44c
Vendor common/model package
2015-08-21 13:33:38 +02:00
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
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
6cb519fe82
Add Consul ServiceID to the discovery meta labels.
2015-08-20 14:04:42 -07:00
274e9d6955
Exit when web server encounters a startup error
2015-08-20 18:23:57 +02:00
ac0be60bb9
Add license headers
2015-08-20 13:03:56 +02:00
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
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
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
cdf38ab93a
Log runtime errors during query evaluation instead of panicking.
2015-08-19 16:56:41 +02:00
b615efbf21
Merge pull request #1011 from prometheus/fabxc/travis
...
simplify travis
2015-08-19 16:31:38 +02:00
863bbd2be4
simplify travis
2015-08-19 16:15:18 +02:00
2b0c153288
Merge pull request #998 from prometheus/label-replace
...
Implement label_replace().
2015-08-18 16:01:36 +02:00
832ae147e0
Merge pull request #1000 from prometheus/remove-silencing-link
...
Remove broken alert silencing links.
2015-08-18 14:59:07 +02:00
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
0f5022c091
Add missing Kubernetes doc strings
2015-08-18 14:37:28 +02:00
27ed874358
Implement label_replace()
...
Implements part of https://github.com/prometheus/prometheus/issues/959 .
2015-08-18 14:20:07 +02:00
205d391409
Merge pull request #999 from prometheus/fabxc/spinfix
...
Only exit static target provider on done
2015-08-18 12:01:53 +02:00
f592740bac
Only exit static target provider on done
2015-08-18 11:51:53 +02:00
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
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
d0a90964c1
Fix license header
2015-08-17 19:51:12 +02:00
eabbdc6603
Add missing license headers
2015-08-17 19:49:10 +02:00
47a96bff1a
Update constant names in comments.
2015-08-17 15:05:06 +02:00
f65ef1ed10
Fix wording in shutdown warning.
2015-08-17 14:26:53 +02:00
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
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
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
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
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
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
d8f5da9152
Merge pull request #990 from prometheus/fabxc/allconsul
...
Scrape all services on empty services list.
2015-08-14 17:46:45 +02:00
3c6dd161d7
Scrape all services on empty services list.
2015-08-14 17:39:41 +02:00
Fabian Reinartz
Brian Brazil
Brian Brazil
Julius Volz
Sharif Nassar
Laurie Malau
Robbie Trencheny