From 340de6c31c259071eac10e650df56465b0b66375 Mon Sep 17 00:00:00 2001 From: Fabian Reinartz Date: Fri, 25 Nov 2016 14:29:07 +0100 Subject: [PATCH 1/3] circle: update golang-builder image version --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 0cefd85a13..6d7cbcd6b3 100644 --- a/circle.yml +++ b/circle.yml @@ -2,7 +2,7 @@ machine: environment: DOCKER_IMAGE_NAME: prom/prometheus QUAY_IMAGE_NAME: quay.io/prometheus/prometheus - DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.6-base + DOCKER_TEST_IMAGE_NAME: quay.io/prometheus/golang-builder:1.7-base REPO_PATH: github.com/prometheus/prometheus pre: - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci' From 35da23fd821ab228dffb2c1718949dc261eed757 Mon Sep 17 00:00:00 2001 From: Fabian Reinartz Date: Sun, 27 Nov 2016 11:01:16 +0100 Subject: [PATCH 2/3] consul: start service watch as goroutine --- discovery/consul/consul.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/discovery/consul/consul.go b/discovery/consul/consul.go index e81749b1cd..05eac61e84 100644 --- a/discovery/consul/consul.go +++ b/discovery/consul/consul.go @@ -197,7 +197,7 @@ func (cd *Discovery) Run(ctx context.Context, ch chan<- []*config.TargetGroup) { } wctx, cancel := context.WithCancel(ctx) - srv.watch(wctx, ch) + go srv.watch(wctx, ch) services[name] = cancel } From 6be1e98278b8e656a20d31a4e3f03fbc09c0eea4 Mon Sep 17 00:00:00 2001 From: Fabian Reinartz Date: Mon, 28 Nov 2016 09:29:23 +0100 Subject: [PATCH 3/3] *: cut 1.4.1 --- CHANGELOG.md | 4 ++++ VERSION | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72a1df2f1e..d9552f0ecf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.4.1 / 2016-11-28 + +* [BUGFIX] Fix Consul service discovery + ## 1.4.0 / 2016-11-25 * [FEATURE] Allow configuring Alertmanagers via service discovery diff --git a/VERSION b/VERSION index 88c5fb891d..347f5833ee 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.0 +1.4.1