mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-18 03:24:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
2590 commits 248 branches 440 tags 658 MiB
Commit graph

2590 commits

This branch
This branch
All branches
Author SHA1 Message Date
Julius Volz 1ae23bf5e9 Handle OPTIONS HTTP requests correctly. 
Fixes https://github.com/prometheus/prometheus/issues/1346
 2016-01-26 12:31:44 +01:00
Fabian Reinartz 41a39472a1 Increase notification test timeouts 2016-01-26 11:24:35 +01:00
Tobias Schmidt 4dc8c4f94c Merge pull request #1344 from prometheus/consistent-error-message 
Rename matrix to range selector in external error messages
 2016-01-25 13:40:08 -05:00
beorn7 a2cd479058 Fix calculation of chunks to persist after restart 
Since we are not overestimating the number of chunks to persist
anymore, this commit also adjusts the default value for
-storage.local.memory-chunks. Update of documentation will follow.
 2016-01-25 19:33:51 +01:00
Tobias Schmidt 1a91cd6e09 Rename matrix to range selector in external error messages 
The documentation speaks about range vectors and range vector selectors.
This change does not fix all issues, we might still expose the term
"Matrix" in error messages using %T.
 2016-01-25 13:25:56 -05:00
beorn7 972d94433a Introduce a hysteresis for "rushed mode" 
"Rushed mode" is formerly known as "degraded mode", which is changed
with this commit, too. The name "degraded" was very misleading.

Also, switch into rushed mode if we have too many chunks in memory and
an at least reasonable amount of chunks to persist so that speeding up
persisting chunks can help.
 2016-01-25 19:24:37 +01:00
Björn Rabenstein 3214cb9529 Merge pull request #1342 from prometheus/beorn7/storage 
Streamline chunk writing
 2016-01-25 18:58:04 +01:00
beorn7 14796bdb60 Improve chunkMaxBatchSize doc comment 2016-01-25 18:57:51 +01:00
Tobias Schmidt 40ab0da398 Merge pull request #1339 from prometheus/range-parsing 
Consolidate offset modifier parsing
 2016-01-25 10:52:17 -05:00
Björn Rabenstein 2f108452fc Merge pull request #1341 from prometheus/beorn7/storage2 
Remove a race condition from TestRetentionCutoff
 2016-01-25 16:46:02 +01:00
beorn7 582af1618c Streamline chunk writing 
This helps to avoid allocations in the same way we were already doing
it during reading.
 2016-01-25 16:36:36 +01:00
beorn7 99b9611351 Remove a race condition from TestRetentionCutoff 2016-01-25 16:36:14 +01:00
Björn Rabenstein f50d90f3aa Merge pull request #1336 from RichiH/security/go_1.5.3 
scripts/goenv.sh: Require Go 1.5.3
 2016-01-25 12:24:15 +01:00
Tobias Schmidt 122d73858d Validate URL parameters 2016-01-25 00:37:09 -05:00
Tobias Schmidt 411ca4dba1 Consolidate offset modifier parsing 
Remove duplicated offset modifier parsing and ensure offset can only
appear at the end of a selector statement.
 2016-01-24 23:11:44 -05:00
Tiago Katcipis 73be7f63be Fix typos and moving example to the correct place 2016-01-23 16:38:24 -02:00
Fabian Reinartz e7b6a01888 Merge pull request #1333 from prometheus/vendorup 
Update common/model vendoring
 2016-01-22 12:24:52 +01:00
Fabian Reinartz 13da34f241 Update common/model vendoring 2016-01-22 12:16:39 +01:00
Tobias Schmidt 0e56181016 Merge pull request #1332 from prometheus/license 
Add missing license files of vendored packages
 2016-01-21 16:15:13 -05:00
Tobias Schmidt 364dd36bde Add missing license files of vendored packages 
With the total optimized copy command. Assumes all vendored packages are
checked out in $GOPATH.

    govendor list +v | awk '{print $2}' | while read dep; do echo $dep |
    cut -d/ -f1-3; done | uniq | while read dep; do find
    $GOPATH/src/$dep -name LICENSE -o -name NOTICE | grep -v vendor |
    sed "s;$GOPATH/src/;;"; done | while read license; do [ -f
    vendor/$license ] || cp $GOPATH/src/$license vendor/$license; done
 2016-01-21 14:44:58 -05:00
Fabian Reinartz c56f35274e Merge pull request #1330 from prometheus/swapfix 
Fix swapped constants, improve instrumentation
 2016-01-21 13:06:55 +01:00
Fabian Reinartz b0adfea8d5 Fix swapped constants, improve instrumentation 2016-01-21 12:15:29 +01:00
Julius Volz b150c5768c Add missing word in comment. 2016-01-21 01:37:08 +01:00
Fabian Reinartz 86244db799 Merge pull request #1318 from fabric8io/kubernetes-discovery 
Kubernetes SD: Refactor to handle missing Kubernetes events
 2016-01-20 18:16:00 +01:00
rih d1c3f5de25 scripts/goenv.sh: Require Go 1.5.3 2016-01-20 13:25:03 +01:00
Fabian Reinartz 0ecf8e98d1 Merge pull request #1325 from prometheus/notifyfix 
Fix rule manager shutdown issues
 2016-01-20 13:23:35 +01:00
Jimmi Dyson 9faa7515c6 Kubernetes SD: Refactor to handle missing Kubernetes events 2016-01-19 20:49:58 +00:00
Fabian Reinartz 308d447cd7 Merge pull request #1327 from prometheus/makefix 
Remove `assets` target from default `make` execution
 2016-01-19 12:33:10 +01:00
Fabian Reinartz 1d58c10b45 Remove assets target from default make execution 
go-bindata constantly attempts to update timestamps even though
the file data didn't change.

Fixes #1326
 2016-01-18 18:24:25 +01:00
Fabian Reinartz a8c38c3ac5 Don't log rule evaluation failure on shutdown 2016-01-18 17:34:25 +01:00
Fabian Reinartz 7e1b39c682 Fix startup/teardown order, add documentation 2016-01-18 17:34:25 +01:00
Brian Brazil 4a829e63a2 Merge pull request #1299 from PrFalken/master 
Support AirBnB's Smartstack Nerve client for SD
 2016-01-18 13:31:04 +00:00
Julien Dehee 061fe2f364 Support AirBnB's Smartstack Nerve client for SD 
nerve's registration format differs from serverset. With this commit
there is now a dedicated treecache file in util,
and two separate files for serverset and nerve.

Reference:
https://github.com/airbnb/nerve
 2016-01-18 14:07:28 +01:00
Tiago Katcipis b7ae20d3d8 fixing typos 2016-01-17 21:35:51 -02:00
Tiago Katcipis 53fb648849 adding README to explain the example 2016-01-17 15:57:49 -02:00
Tiago Katcipis bb4722d6b5 Adding RabbitMQ example as mentioned on #1312 2016-01-12 20:59:37 -02:00
Tobias Schmidt 944b1f7e84 Merge pull request #1313 from fabric8io/kubernetes-discovery 
Kubernetes Discovery: Ensure metrics path isn't overwritten in example relabeling
 2016-01-12 17:01:30 -05:00
Jimmi Dyson d3934345e9 Kubernetes Discovery: Ensure metrics path isn't overwritten in example relabeling 2016-01-12 21:06:32 +00:00
Brian Brazil cb381e0bce Merge pull request #1311 from prometheus/up-down 
Use up/down in UI for consistency with 'up' metric.
 2016-01-12 12:19:23 +00:00
Brian Brazil 7a5f019c40 Use up/down in UI for consistency with 'up' metric. 2016-01-12 12:09:20 +00:00
Fabian Reinartz 3c81843167 Merge pull request #1310 from prometheus/beorn7/storage 
Update doc comment
 2016-01-12 12:42:09 +01:00
beorn7 3f4d22e4c7 Update doc comment 
This should have gone into a previous commit, but I forgot to save
this particular file.
 2016-01-12 12:38:18 +01:00
Fabian Reinartz 7a012ea611 Merge pull request #1306 from prometheus/beorn7/storage 
Tolerate the lost+found directory in the data directory
 2016-01-12 12:17:38 +01:00
Fabian Reinartz 19e81f81a0 Merge pull request #1308 from prometheus/rulefix 
Fix hanging shutdown shortly after restart
 2016-01-12 11:24:11 +01:00
Fabian Reinartz 6eee86dce8 Terminate rule groups during initial sleep 
When an evaluation group runs initially, it waits a deterministic
amount of time. During that time it also has to accept
a termination singnal so shutdown doesn't hang during the first
evaluation iteration after a configuration reload.

Fixes #1307
 2016-01-12 10:54:09 +01:00
Fabian Reinartz 26eb3ac2f8 Don't skip recording rule errors 2016-01-12 10:26:06 +01:00
beorn7 add2ebdd56 Tolerate the lost+found directory in the data directory 2016-01-11 18:05:36 +01:00
Björn Rabenstein 6293f3a374 Merge pull request #1304 from prometheus/beorn7/storage 
Improve handling of series file truncation
 2016-01-11 17:27:08 +01:00
Fabian Reinartz 8c81289575 Merge pull request #1305 from prometheus/beorn7/storage2 
Add a series ops metric "purge_on_request"
 2016-01-11 17:25:39 +01:00
beorn7 cb117d8346 Add a series ops metric "purge_on_request" 
It counts series deletions triggered via the API.
 2016-01-11 17:22:16 +01:00