From e9787382b4d159a98ed1d3e8ec2e9b911db242a1 Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Wed, 3 May 2017 20:32:50 +0100 Subject: [PATCH 1/3] Ensure ewma int64s are always aligned. (#2675) --- storage/remote/ewma.go | 6 ++++-- storage/remote/queue_manager.go | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/storage/remote/ewma.go b/storage/remote/ewma.go index d974bc3bb..82b6dd101 100644 --- a/storage/remote/ewma.go +++ b/storage/remote/ewma.go @@ -29,8 +29,10 @@ type ewmaRate struct { mutex sync.Mutex } -func newEWMARate(alpha float64, interval time.Duration) ewmaRate { - return ewmaRate{ +// newEWMARate always allocates a new ewmaRate, as this guarantees the atomically +// accessed int64 will be aligned on ARM. See prometheus#2666. +func newEWMARate(alpha float64, interval time.Duration) *ewmaRate { + return &ewmaRate{ alpha: alpha, interval: interval, } diff --git a/storage/remote/queue_manager.go b/storage/remote/queue_manager.go index ad462d176..6813566a4 100644 --- a/storage/remote/queue_manager.go +++ b/storage/remote/queue_manager.go @@ -185,7 +185,7 @@ type QueueManager struct { quit chan struct{} wg sync.WaitGroup - samplesIn, samplesOut, samplesOutDuration ewmaRate + samplesIn, samplesOut, samplesOutDuration *ewmaRate integralAccumulator float64 } From 2ae2b663a9be8c5bb339501cf789924db0fcfac4 Mon Sep 17 00:00:00 2001 From: Tobias Schmidt Date: Sat, 15 Apr 2017 12:26:51 -0300 Subject: [PATCH 2/3] Create sha256 checksums file during release --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index 4f9519a0d..7e09a2cbe 100644 --- a/circle.yml +++ b/circle.yml @@ -49,6 +49,7 @@ deployment: owner: prometheus commands: - promu crossbuild tarballs + - promu checksum .tarballs - promu release .tarballs - mkdir $CIRCLE_ARTIFACTS/releases/ && cp -a .tarballs/* $CIRCLE_ARTIFACTS/releases/ - docker login -e $DOCKER_EMAIL -u $DOCKER_LOGIN -p $DOCKER_PASSWORD From 53a2bd71b97af8d9a505cca0915fc50730fb7b2b Mon Sep 17 00:00:00 2001 From: Frederic Branczyk Date: Thu, 18 May 2017 11:06:29 +0200 Subject: [PATCH 3/3] *: cut 1.6.3 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a001d54f..5680450ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 1.6.3 / 2017-05-18 + +* [BUGFIX] Fix disappearing Alertmanger targets in Alertmanager discovery. +* [BUGFIX] Fix panic with remote_write on ARMv7. +* [BUGFIX] Fix stacked graphs to adapt min/max values. + ## 1.6.2 / 2017-05-11 * [BUGFIX] Fix potential memory leak in Kubernetes service discovery