~canonical-server/prometheus-snap:upstream

Last commit made on 2020-08-05
Get this branch:
git clone -b upstream https://git.launchpad.net/~canonical-server/prometheus-snap
Members of Canonical Server can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
upstream
Repository:
lp:~canonical-server/prometheus-snap

Recent commits

983ebb4... by =?utf-8?q?Bj=C3=B6rn_Rabenstein?= <email address hidden>

Merge pull request #7750 from prometheus/beorn7/release

Cut v2.20.1

5aa1cde... by beorn7 <email address hidden>

Cut v2.20.1

Signed-off-by: beorn7 <email address hidden>

f169931... by =?utf-8?q?Bj=C3=B6rn_Rabenstein?= <email address hidden>

Merge pull request #7724 from roidelapluie/consultm

Consul: Reduce WatchTimeout to 2m and set it as timeout for requests

3a7120b... by Julien Pivotto <email address hidden>

Consul: Reduce WatchTimeout to 2m and set it as timeout for requests

Signed-off-by: Julien Pivotto <email address hidden>

e5a06b4... by =?utf-8?q?Bj=C3=B6rn_Rabenstein?= <email address hidden>

Merge pull request #7641 from prometheus/beorn7/release

Cut final v2.20.0

c7013c0... by beorn7 <email address hidden>

Cut final v2.20.0

Signed-off-by: beorn7 <email address hidden>

d29b40d... by =?utf-8?q?Bj=C3=B6rn_Rabenstein?= <email address hidden>

Merge pull request #7633 from roidelapluie/anotherfix

DigitalOcean, Docker Swarm: properly load files

0cca23d... by Julien Pivotto <email address hidden>

DigitalOcean, Docker Swarm: properly load files

Signed-off-by: Julien Pivotto <email address hidden>

113d167... by =?utf-8?q?Bj=C3=B6rn_Rabenstein?= <email address hidden>

Merge pull request #7622 from prometheus/beorn7/release

Cut 2.20.0-rc.1

9c9248a... by beorn7 <email address hidden>

Cut 2.20.0-rc.1

Note that all new lines in the CHANGELOG except the last will
disappear in the final release because they only deal with issues
introduced in 2.20.0-rc.0.

This commit also adds an explanation for the WAL compression becoming
default.

Furthermore, this commit reverts the upgrade to grpc 1.30.0. It was
just a routine upgrade, but because grpc 1.30.0 contains two very
Go-module unfriendly breaking changes that in combination wreak havoc
for anyone importing from the prometheus/prometheus repo while still
depending on 1.29.1, we decided to revert as Prometheus itself doesn't
need the upgrade right now.

Signed-off-by: beorn7 <email address hidden>