mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #1422 from prometheus/release-0.17

Browse source 
Merge more commits from 0.17.
This commit is contained in:
Björn Rabenstein 2016-02-23 23:07:44 +01:00
parent e4e00b6f24 5eff37ccbe
commit a8c79f0a0c
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CHANGELOG.md
View file

@ -1,9 +1,15 @@
## 0.17.0 / 2016-01-27 ## 0.17.0 / unreleased
This version no longer works with Alertmanager 0.4.0 and earlier! This version no longer works with Alertmanager 0.0.4 and earlier!
The alerting rule syntax has changed as well but the old syntax is supported The alerting rule syntax has changed as well but the old syntax is supported
up until version 0.18. up until version 0.18.
All regular expressions in PromQL are anchored now, matching the behavior of
regular expressions in config files. Expressions in rules, alerts or dashboards
need to be changed if they don't match the full value so far (for example
`http_requests_total{status=~"^5"}` won't match anything anymore and needs to
be changed to `http_requests_total{status=~"5.."}`).
* [CHANGE] Integrate with Alertmanager 0.1.0 and higher * [CHANGE] Integrate with Alertmanager 0.1.0 and higher
* [CHANGE] Degraded storage mode renamed to rushed mode * [CHANGE] Degraded storage mode renamed to rushed mode
* [CHANGE] New alerting rule syntax * [CHANGE] New alerting rule syntax

7
storage/local/storage.go
View file

@ -971,6 +971,13 @@ loop:
} else { } else {
dirtySeriesCount = 0 dirtySeriesCount = 0
} }
// If a checkpoint takes longer than checkpointInterval, unluckily timed
// combination with the Reset(0) call below can lead to a case where a
// time is lurking in C leading to repeated checkpointing without break.
select {
case <-checkpointTimer.C: // Get rid of the lurking time.
default:
}
checkpointTimer.Reset(s.checkpointInterval) checkpointTimer.Reset(s.checkpointInterval)
case fp := <-memoryFingerprints: case fp := <-memoryFingerprints:
if s.maintainMemorySeries(fp, model.Now().Add(-s.dropAfter)) { if s.maintainMemorySeries(fp, model.Now().Add(-s.dropAfter)) {