Fabian Reinartz
d839980fcb
Merge pull request #1051 from prometheus/globallabels
...
Change global label handling
2015-09-03 16:52:59 +02:00
Fabian Reinartz
8fa719f778
Attach global labels to remote storage samples
2015-09-03 16:38:04 +02:00
Fabian Reinartz
5fed076a76
Attach global labels to outgoing alerts.
2015-09-03 16:38:04 +02:00
Fabian Reinartz
9bbd9264e2
Add global labels to federation
2015-09-03 16:38:03 +02:00
Brian Brazil
9ec11b1847
Merge pull request #1049 from prometheus/bool-nofilter
...
promql: Add 'bool' modifier to comparison functions
2015-09-03 15:08:38 +01:00
Fabian Reinartz
bc89b98a7d
Merge branch 'master' of github.com:prometheus/prometheus
2015-09-03 14:22:16 +02:00
Fabian Reinartz
e3d809024c
Change email address
2015-09-03 14:19:26 +02:00
Fabian Reinartz
cc1a2a2061
Remove attachment of global labels upon ingestion
2015-09-03 14:16:23 +02:00
Fabian Reinartz
e2b979868b
Merge pull request #1047 from swsnider/upstreamed
...
Add an exported counter to track configuration reloads
2015-09-02 19:16:26 +02:00
Silas Snider
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
Brian Brazil
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
Fabian Reinartz
4459265739
Merge branch 'master' of github.com:prometheus/prometheus
2015-09-01 18:06:40 +02:00
Fabian Reinartz
ebf417a282
Fix map initialization
2015-09-01 18:06:22 +02:00
Julius Volz
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
Julius Volz
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
Julius Volz
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
Julius Volz
f63a899744
Change config regexes to full-string matches.
...
This anchors all regular expressions entered via the config to match a
full string vs. a substring.
THIS IS A BREAKING CHANGE!
Fixes part of https://github.com/prometheus/prometheus/issues/996
2015-09-01 15:46:41 +02:00
Julius Volz
dfbda8fd3f
Merge pull request #1041 from Dieterbe/fix-fanout-comment
...
fix comment.
2015-08-31 12:28:51 +02:00
Dieter Plaetinck
e1dacc56e6
fix comment.
...
the sample doesn't get appended to the list of sampleappenders.
2015-08-30 16:26:46 +02:00
Fabian Reinartz
bfdd474202
Merge pull request #1040 from prometheus/fixfilesd
...
Fix draining of file watcher events
2015-08-28 15:53:24 +02:00
Fabian Reinartz
542da6774e
Fix draining of file watcher events
2015-08-28 12:17:22 +02:00
Fabian Reinartz
facf60e033
Merge pull request #1033 from dln/serverset-shard
...
serverset discovery: extract shard number from serverset data
2015-08-27 16:42:10 +02:00
Daniel Lundin
4abf54b747
serverset: extract shard number from serverset data
2015-08-27 16:26:00 +02:00
Brian Brazil
4d196fea6b
Merge pull request #1032 from prometheus/scalar-metric
...
rules: Allow for setting labels on LHS on scalars
2015-08-26 16:56:16 +01:00
Brian Brazil
3bcdb2bbba
rules: Allow for setting labels on LHS on scalars
2015-08-26 16:54:28 +01:00
Julius Volz
9bca70710b
Merge pull request #1034 from prometheus/fix-pprof
...
Add POST handler for /debug to fix CPU profiling.
2015-08-26 17:47:01 +02:00
Julius Volz
da2499d5a5
Add POST handler for /debug to fix CPU profiling.
...
`go tool pprof` sends a POST request to enable CPU profiling, so we also
need to handle that method.
2015-08-26 17:42:25 +02:00
Julius Volz
29eaa8c7cf
Merge pull request #1030 from prometheus/fix-flakey-filesd
...
Fix flakey FileSD test.
2015-08-26 13:25:00 +02:00
Julius Volz
3fd5826589
Fix flakey FileSD test.
...
When the test ends, all files matching the watcher's glob are removed
via defer. In that moment, the draining goroutine may still be running
and then detect no files matching the configured glob just before the
test exits.
This is now solved by waiting for the draining goroutine to finish
before leaving the test function and thus causing the deferred file
removal.
2015-08-26 13:06:34 +02:00
Julius Volz
744d5d5a7a
Merge pull request #1029 from prometheus/vet-fixes
...
Fix "go vet" errors.
2015-08-26 12:50:18 +02:00
Julius Volz
78f5a93ea6
Merge pull request #1028 from prometheus/lint-fixes
...
Fix most golint warnings.
2015-08-26 12:50:03 +02:00
Julius Volz
995d3b831d
Fix most golint warnings.
...
This is with `golint -min_confidence=0.5`.
I left several lint warnings untouched because they were either
incorrect or I felt it was better not to change them at the moment.
2015-08-26 12:44:46 +02:00
Julius Volz
963ad82dcb
Fix "go vet" errors.
...
I ignored all errors of the type "composite literal uses unkeyed
fields". Most of them are wrong because of
https://github.com/golang/go/issues/9171 .
2015-08-26 02:05:04 +02:00
Fabian Reinartz
6664b77f36
Merge pull request #1021 from prometheus/appenders
...
move metric modifications into SampleAppenders
2015-08-25 17:47:55 +02:00
Julius Volz
077a753e6b
Merge pull request #1006 from prometheus/true-values
...
promql: Remove interpolation of vector values.
2015-08-25 16:11:07 +02:00
Fabian Reinartz
01834fa528
Move metric modifications into SampleAppenders
2015-08-25 15:32:37 +02:00
Fabian Reinartz
a2d117c677
Merge pull request #1025 from prometheus/model
...
Migrate promql to common/model
2015-08-25 13:55:56 +02:00
Fabian Reinartz
d6b8da8d43
Switch promql types to common/model
2015-08-25 13:49:14 +02:00
Fabian Reinartz
e061595352
Move COWMetric into storage/metric package
2015-08-25 11:59:07 +02:00
Fabian Reinartz
ad8e8f9f24
Upgrade common vendoring
2015-08-25 11:59:07 +02:00
Fabian Reinartz
3394fb8745
Merge pull request #1026 from prometheus/format
...
Do a make format run
2015-08-25 00:19:49 +02:00
Brian Brazil
a09d896cbf
Do a make format run
2015-08-24 18:32:48 +01:00
Fabian Reinartz
d6d88f8950
Add missing license headers
2015-08-24 19:19:21 +02:00
Brian Brazil
fb585e4591
promql: Remove interpolation of vector values.
...
The current behaviour produces values that are not
from rules or scrapes. So if for example I have
a boolean 0/1 it can be returned as 0.2344589. This
prevents a number of advanced use cases, introduces
race conditions and can produce misleading graphs.
2015-08-24 17:37:31 +01:00
Brian Brazil
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
Brian Brazil
fdf0d0642e
Cast value to float, as that's what the console templates expect.
2015-08-24 16:59:08 +01:00
Julius Volz
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
Julius Volz
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
Fabian Reinartz
8769a75183
Merge pull request #1023 from prometheus/model
...
More type cleanup
2015-08-24 12:59:19 +02:00
Fabian Reinartz
1535ef1457
Replace metric.SamplePair with model.SamplePair
2015-08-22 14:52:35 +02:00
