896928ad00
Fix redirect path
2015-09-12 09:02:34 +02:00
d7b21f2fdb
Merge pull request #1039 from prometheus/startpage
...
Change UI start page
2015-09-12 08:44:54 +02:00
87b1d47e2b
Change UI start page
2015-09-12 08:40:46 +02:00
a1617d90f4
Merge pull request #1073 from prometheus/whats-our-vector-victor
...
promql: Add vector function.
2015-09-12 08:36:13 +02:00
bae9816834
Merge branch 'master' of github.com:prometheus/prometheus
2015-09-11 21:11:43 +02:00
b2c6378aae
Fix go1.5 compile flag warnings
2015-09-11 21:11:22 +02:00
af58d784fd
Merge pull request #1076 from prometheus/remove-config-change-notice
...
Remove notice about 0.14.x config file format change.
2015-09-11 17:36:52 +02:00
d73c8a4f0b
Remove notice about 0.14.x config file format change.
2015-09-11 16:43:04 +02:00
2c3c1ba69f
Merge pull request #1075 from prometheus/beorn7/storage
...
Fix DropMetricsForFingerprints
2015-09-11 16:06:41 +02:00
daeccdd0e9
Fix DropMetricsForFingerprints
...
It now deletes the series file also for archived series.
Also, fix a naming error in a doc comment.
2015-09-11 15:47:23 +02:00
e7c1db42f3
Merge pull request #1072 from fabric8io/kubernetes-discovery
...
Clean up kubernetes http response bodies
2015-09-11 14:47:01 +02:00
69f5fa0c1e
promql: Add vector function.
...
Currently the only way to convert a scalar to a vector is to
use absent(), which isn't very clean. This adds a vector()
function that's the inverse of scalar() and lets your optionally
set labels.
Example usage would be
vector(time() % 86400) < 3600
to filter to only the first hour of the day.
2015-09-11 12:09:34 +01:00
7ef9399920
Clean up kubernetes http response bodies
2015-09-11 11:44:28 +01:00
d6ed1df4fb
Merge pull request #1070 from amorken/forgotten-close
...
Close HTTP connections on HTTP errors too.
2015-09-11 00:30:54 +02:00
9fb65a91af
Close HTTP connections on HTTP errors too.
...
Move defer resp.Body.Close() up to make sure it's called even when the
HTTP request returns something other than 200 or Decoder construction
fails. This avoids leaking and eventually running out of file descriptors.
2015-09-10 22:41:05 +02:00
66f376f75a
Merge pull request #1068 from prometheus/go1.5.1
...
Use go1.5.1
2015-09-10 12:19:33 +02:00
8456b7e12f
Use go1.5.1
2015-09-10 12:11:44 +02:00
6e393807c3
Merge pull request #1066 from prometheus/fix-bool
...
Fix bool modifier in recording rules and printing.
2015-09-10 12:03:11 +02:00
6d3e054692
Fix bool modifier in recording rules and printing.
...
Fixes https://github.com/prometheus/prometheus/issues/1065
2015-09-10 01:37:05 +02:00
9a70ee752e
Merge pull request #1063 from fabric8io/kubernetes-discovery
...
Kubernetes SD config check
2015-09-09 15:28:27 +02:00
ec04ba38a2
Kubernetes SD config check
2015-09-09 13:24:44 +01:00
58c32f84ce
Merge pull request #1055 from fabric8io/kubernetes-discovery
...
Move TLS options to scrape config
2015-09-09 11:24:29 +02:00
a1574aa2b3
Move TLS options to scrape config
...
Fixes #1013 , fixes #989
2015-09-09 09:52:21 +01:00
ffc5142c54
Merge pull request #1058 from prometheus/check-errors
...
Fix error checking and logging around checkpointing.
2015-09-07 19:57:16 +02:00
6774a73878
Fix error checking and logging around checkpointing.
2015-09-07 19:34:59 +02:00
011faf9057
Fix typo in comment.
2015-09-07 19:15:28 +02:00
09c353c272
Change mail address
2015-09-07 15:12:42 +02:00
e298463fd6
Merge pull request #1053 from prometheus/diag
...
Update architecture diagram
2015-09-07 15:08:14 +02:00
1a3ee28cd2
Point README to new architecture diagram
2015-09-07 15:07:47 +02:00
e761f0d664
Update architecture diagram
2015-09-07 14:11:28 +02:00
1ef5ed0cf2
Merge pull request #1048 from xperimental/fix/marathon-config
...
Fix parsing Marathon SD config
2015-09-06 20:09:46 +02:00
eb7416e71f
Fix missing unmarshal for Marathon SD config.
2015-09-06 20:02:22 +02:00
b7b7b2e883
Merge pull request #1050 from fabric8io/kubernetes-discovery
...
Kubernetes SD improvements
2015-09-04 14:58:11 +02:00
d7a7fd4589
Kubernetes SD improvements
...
* Support multiple masters with retries against each master as required.
* Scrape masters' metrics.
* Add role meta label for node/service/master to make it easier for relabeling.
2015-09-04 11:31:20 +01:00
d839980fcb
Merge pull request #1051 from prometheus/globallabels
...
Change global label handling
2015-09-03 16:52:59 +02:00
8fa719f778
Attach global labels to remote storage samples
2015-09-03 16:38:04 +02:00
5fed076a76
Attach global labels to outgoing alerts.
2015-09-03 16:38:04 +02:00
9bbd9264e2
Add global labels to federation
2015-09-03 16:38:03 +02:00
9ec11b1847
Merge pull request #1049 from prometheus/bool-nofilter
...
promql: Add 'bool' modifier to comparison functions
2015-09-03 15:08:38 +01:00
bc89b98a7d
Merge branch 'master' of github.com:prometheus/prometheus
2015-09-03 14:22:16 +02:00
e3d809024c
Change email address
2015-09-03 14:19:26 +02:00
cc1a2a2061
Remove attachment of global labels upon ingestion
2015-09-03 14:16:23 +02:00
e2b979868b
Merge pull request #1047 from swsnider/upstreamed
...
Add an exported counter to track configuration reloads
2015-09-02 19:16:26 +02:00
b2cb637f97
Add instrumentation around configuration reloads.
...
This commit enables automation (and alerting) around attempts to update prometheus
server configuration automatically.
2015-09-02 10:08:51 -07:00
29e8dc2c49
promql: Add 'bool' modifier to comparison functions
...
When doing comparison operations on vectors, filtering
sometimes gets in the way and you have to go to a fair bit of
effort to workaround it in order to always return a result.
The 'bool' modifier instead of filtering returns 0/1 depending
on the result of the compairson.
This is also a prerequisite to removing plain scalar/scalar comparisons,
as it maintains the current behaviour under a new syntax.
2015-09-02 14:51:44 +01:00
4459265739
Merge branch 'master' of github.com:prometheus/prometheus
2015-09-01 18:06:40 +02:00
ebf417a282
Fix map initialization
2015-09-01 18:06:22 +02:00
58780a8c79
Merge pull request #1045 from prometheus/anchored-label-replace
...
Change relabel_replace() to do full-string matches.
2015-09-01 17:50:36 +02:00
4c90168130
Merge pull request #1044 from prometheus/config-anchored-regexes
...
Change config regexes to full-string matches.
2015-09-01 17:14:23 +02:00
61c42c8da0
Change relabel_replace() to do full-string matches.
...
THIS IS A BREAKING CHANGE.
Fixes part of https://github.com/prometheus/prometheus/issues/996
2015-09-01 15:49:28 +02:00
Fabian Reinartz
Julius Volz
Björn Rabenstein
beorn7
Brian Brazil
Jimmi Dyson
Anders Daljord Morken
Robert Jacob
Brian Brazil
Silas Snider