github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,681 Commits
252 Branches
442 Tags
625 MiB
Commit Graph

3681 Commits (6aee1551e1ec53054d5cbf6464b806339c26ced7)

Author SHA1 Message Date
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
beorn7 4221c7de5c Improve handling of series file truncation 
If only very few chunks are to be truncated from a very large series
file, the rewrite of the file is a lorge overhead. With this change, a
certain ratio of the file has to be dropped to make it happen. While
only causing disk overhead at about the same ratio (by default 10%),
it will cut down I/O by a lot in above scenario.
 2016-01-11 16:42:10 +01:00
Fabian Reinartz 49fe948b9a Merge pull request #1303 from prometheus/revac 
Revert autocomplete changes
 2016-01-11 15:27:33 +01:00
Fabian Reinartz 8a67110041 Revert autocomplete changes 2016-01-11 15:18:39 +01:00
Brian Brazil e0efe75c2d Merge pull request #1302 from iksaif/master 
Use '.' instead of '=' to separate labels from their values in Graphite
 2016-01-11 13:01:35 +00:00
Corentin Chary 7b6c3e556c Use '.' instead of '=' to separate labels from their values in Graphite 
Using .label=value. was weird to use in Graphite and didn't bring much value.
 2016-01-11 13:57:14 +01:00
Fabian Reinartz 37d28bf91a Merge pull request #1300 from prometheus/oldalerts 
Support old alerting rule syntax
 2016-01-11 12:14:47 +01:00
Fabian Reinartz 6b4a6962d2 Support old alerting rule syntax 2016-01-11 12:14:06 +01:00
Fabian Reinartz c44594185f Merge pull request #1298 from prometheus/rulemgrfix 
Fix premature rule evaluation
 2016-01-08 18:32:16 +01:00
Fabian Reinartz 37d80c4b25 Fix premature rule evaluation 
This commit prevents rule evaluation from starting until after
the storage is ready.
 2016-01-08 17:51:22 +01:00