mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-28 15:09:39 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
2290 commits 243 branches 444 tags 649 MiB
Commit graph

2290 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Fabian Reinartz c9d396f476 Replace metric.LabelPair with model.LabelPair 2015-08-22 13:32:13 +02:00
Fabian Reinartz 3a0145c09e Reenable blocked appending tests 2015-08-22 09:47:57 +02:00
Fabian Reinartz 438e232c9b Fix grouping of import blocks 2015-08-22 09:42:45 +02:00
Fabian Reinartz 6d0f58dcf3 sanitize scrape health recording code 2015-08-21 23:01:08 +02:00
Fabian Reinartz 1a7f701359 Merge pull request #1018 from prometheus/fabxc/model 
Switch to common/{model,expfmt}
 2015-08-21 18:07:32 +02:00
Fabian Reinartz 25bf5fdaf5 Timeout sample appends 2015-08-21 18:04:35 +02:00
Fabian Reinartz 47aa0d536c Use common/expfmt in federation 2015-08-21 13:33:38 +02:00
Fabian Reinartz 11a577fcd0 Switch to common/expfmt for extraction 2015-08-21 13:33:38 +02:00
Fabian Reinartz f237b0e2da Vendor common/expfmt package 2015-08-21 13:33:38 +02:00
Fabian Reinartz 306e8468a0 Switch from client_golang/model to common/model 2015-08-21 13:33:38 +02:00
Fabian Reinartz 7a6d12a44c Vendor common/model package 2015-08-21 13:33:38 +02:00
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