From 37c64a77d749a1ac517efa12cc20ba90c84ca58d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20S=CC=8Ctibrany=CC=81?= Date: Wed, 24 Feb 2021 16:33:46 +0100 Subject: [PATCH 1/2] Release 1.7.0. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba4f53b9..2b0c74e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## master / unreleased +## 1.7.0 / 2021-02-24 + * [CHANGE] Alertmanager storage backend no longer defaults to `gcs` with bucket name `'%(cluster)s-cortex-%(namespace)s' % $._config`. #258 * [CHANGE] Only single cluster and namespace can now be selected in "resources" dashboards. #251 * [CHANGE] Increased `CortexAllocatingTooMuchMemory` warning alert threshold from 50% to 65%. #256 From 9f3f475fa16d51adc4f1bb72d8148a4eb19ac838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20S=CC=8Ctibrany=CC=81?= Date: Wed, 24 Feb 2021 16:39:28 +0100 Subject: [PATCH 2/2] Update Cortex images. --- RELEASE.md | 2 +- cortex/images.libsonnet | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 6f32f84c..47a14659 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -4,7 +4,7 @@ ### Versioning strategy -Releases of `cortex-jsonnet` are versioned to match the compatible version of Cortex. The release of `cortex-jsonnet`tagged `1.6.0` should match compatible with the release of Cortex tagged `1.6.0`. +Releases of `cortex-jsonnet` are versioned to match the compatible version of Cortex. The release of `cortex-jsonnet` tagged `1.6.0` should match compatible with the release of Cortex tagged `1.6.0`. A release of `cortex-jsonnet` should follow shortly after a release of Cortex. ### Publish a release diff --git a/cortex/images.libsonnet b/cortex/images.libsonnet index 9714b302..77088f06 100644 --- a/cortex/images.libsonnet +++ b/cortex/images.libsonnet @@ -5,7 +5,7 @@ memcachedExporter: 'prom/memcached-exporter:v0.6.0', // Our services. - cortex: 'cortexproject/cortex:v1.6.0', + cortex: 'cortexproject/cortex:v1.7.0', alertmanager: self.cortex, distributor: self.cortex, @@ -19,7 +19,7 @@ store_gateway: self.cortex, cortex_tools: 'grafana/cortex-tools:v0.4.0', - query_tee: 'quay.io/cortexproject/query-tee:master-5d7b05c3', - testExporter: 'cortexproject/test-exporter:master-be013707', + query_tee: 'quay.io/cortexproject/query-tee:v1.7.0', + testExporter: 'cortexproject/test-exporter:v1.7.0', }, }