mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-10 07:34:04 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
2205 commits 245 branches 436 tags 650 MiB
Commit graph

2205 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabian Reinartz 468d2eb60e Vendoring via govendor 2015-09-15 15:37:12 +02:00
Fabian Reinartz e88eb9f164 Remove Godeps 2015-09-15 15:35:29 +02:00
Björn Rabenstein 6561897853 Merge pull request #1084 from prometheus/beorn7/storage 
Increase waiting time in TestEvictAndLoadChunkDescs
 2015-09-14 21:23:12 +02:00
beorn7 22d3a4311a Increase waiting time in TestEvictAndLoadChunkDescs 
The test had become flaky with Go1.5.

Theory here is that with Go1.5.x, sleeping for 10ms might not be
enough to wake up another goroutine, possibly because it is used for
GC. 50ms should always be enough due to GC pause guarantees with the
new GC.
 2015-09-14 21:09:46 +02:00
Brian Brazil fa793d917e Merge pull request #1080 from prometheus/query-timeout-test 
promql: Bump sleep in query timeout test
 2015-09-14 13:00:47 +01:00
Brian Brazil ce7f31e03c promql: Bump sleep in query timeout test 
This test is flaky, I'm presuming the time.AfterFunc
call is being delayed so the evaluation isn't getting
cancelled.
 2015-09-14 11:49:18 +01:00
Julius Volz 347630431c Merge pull request #1077 from prometheus/cleanups 
Fix some dead code, missing error checks, shadowings.
 2015-09-14 12:37:26 +02:00
Julius Volz af513468eb Fix some dead code, missing error checks, shadowings. 
I applied
https://medium.com/@jgautheron/quality-pipeline-for-go-projects-497e34d6567
and was greeted with a deluge of warnings, most of which were not
applicable or really fixable realistically. These are some of the first
ones I decided to fix.
 2015-09-14 12:21:34 +02:00
Brian Brazil 29de4ee2b0 Merge pull request #1078 from prometheus/whats-our-vector-victor 
Remove optional vector() 2nd argument
 2015-09-13 14:14:20 +01:00
Brian Brazil 9b382647b5 Remove optional vector() 2nd argument 2015-09-13 09:13:22 +01:00
Fabian Reinartz 896928ad00 Fix redirect path 2015-09-12 09:02:34 +02:00
Fabian Reinartz d7b21f2fdb Merge pull request #1039 from prometheus/startpage 
Change UI start page
 2015-09-12 08:44:54 +02:00
Fabian Reinartz 87b1d47e2b Change UI start page 2015-09-12 08:40:46 +02:00
Fabian Reinartz a1617d90f4 Merge pull request #1073 from prometheus/whats-our-vector-victor 
promql: Add vector function.
 2015-09-12 08:36:13 +02:00
Fabian Reinartz bae9816834 Merge branch 'master' of github.com:prometheus/prometheus 2015-09-11 21:11:43 +02:00
Fabian Reinartz b2c6378aae Fix go1.5 compile flag warnings 2015-09-11 21:11:22 +02:00
Julius Volz 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
Julius Volz d73c8a4f0b Remove notice about 0.14.x config file format change. 2015-09-11 16:43:04 +02:00
Björn Rabenstein 2c3c1ba69f Merge pull request #1075 from prometheus/beorn7/storage 
Fix DropMetricsForFingerprints
 2015-09-11 16:06:41 +02:00
beorn7 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
Julius Volz e7c1db42f3 Merge pull request #1072 from fabric8io/kubernetes-discovery 
Clean up kubernetes http response bodies
 2015-09-11 14:47:01 +02:00
Brian Brazil 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
Jimmi Dyson 7ef9399920 Clean up kubernetes http response bodies 2015-09-11 11:44:28 +01:00
Fabian Reinartz d6ed1df4fb Merge pull request #1070 from amorken/forgotten-close 
Close HTTP connections on HTTP errors too.
 2015-09-11 00:30:54 +02:00
Anders Daljord Morken 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
Fabian Reinartz 66f376f75a Merge pull request #1068 from prometheus/go1.5.1 
Use go1.5.1
 2015-09-10 12:19:33 +02:00
Fabian Reinartz 8456b7e12f Use go1.5.1 2015-09-10 12:11:44 +02:00
Julius Volz 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
Julius Volz 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
Julius Volz 9a70ee752e Merge pull request #1063 from fabric8io/kubernetes-discovery 
Kubernetes SD config check
 2015-09-09 15:28:27 +02:00
Jimmi Dyson ec04ba38a2 Kubernetes SD config check 2015-09-09 13:24:44 +01:00
Fabian Reinartz 58c32f84ce Merge pull request #1055 from fabric8io/kubernetes-discovery 
Move TLS options to scrape config
 2015-09-09 11:24:29 +02:00
Jimmi Dyson a1574aa2b3 Move TLS options to scrape config 
Fixes #1013, fixes #989
 2015-09-09 09:52:21 +01:00
Julius Volz ffc5142c54 Merge pull request #1058 from prometheus/check-errors 
Fix error checking and logging around checkpointing.
 2015-09-07 19:57:16 +02:00
Julius Volz 6774a73878 Fix error checking and logging around checkpointing. 2015-09-07 19:34:59 +02:00
Julius Volz 011faf9057 Fix typo in comment. 2015-09-07 19:15:28 +02:00
Fabian Reinartz 09c353c272 Change mail address 2015-09-07 15:12:42 +02:00
Fabian Reinartz e298463fd6 Merge pull request #1053 from prometheus/diag 
Update architecture diagram
 2015-09-07 15:08:14 +02:00
Fabian Reinartz 1a3ee28cd2 Point README to new architecture diagram 2015-09-07 15:07:47 +02:00
Fabian Reinartz e761f0d664 Update architecture diagram 2015-09-07 14:11:28 +02:00
Fabian Reinartz 1ef5ed0cf2 Merge pull request #1048 from xperimental/fix/marathon-config 
Fix parsing Marathon SD config
 2015-09-06 20:09:46 +02:00
Robert Jacob eb7416e71f Fix missing unmarshal for Marathon SD config. 2015-09-06 20:02:22 +02:00
Julius Volz b7b7b2e883 Merge pull request #1050 from fabric8io/kubernetes-discovery 
Kubernetes SD improvements
 2015-09-04 14:58:11 +02:00
Jimmi Dyson 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
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