From 0187328c6d20ab99829219bb424075fcefa77b17 Mon Sep 17 00:00:00 2001 From: Johanna Ratliff Date: Tue, 15 Jun 2021 13:58:38 -0600 Subject: [PATCH 1/3] Add cortex-gw-internal to watched gateway metrics --- cortex-mixin/config.libsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cortex-mixin/config.libsonnet b/cortex-mixin/config.libsonnet index d07c61be..95ddc0df 100644 --- a/cortex-mixin/config.libsonnet +++ b/cortex-mixin/config.libsonnet @@ -34,7 +34,7 @@ query_scheduler: 'query-scheduler', // Not part of single-binary. table_manager: '(table-manager|cortex$)', store_gateway: '(store-gateway|cortex$)', - gateway: '(gateway|cortex-gw)', + gateway: '(gateway|cortex-gw|cortex-gw-internal)', compactor: 'compactor.*', // Match also custom compactor deployments. }, From e25a9f9dfe1db5f6a90ff6d0d4057922ae9f5d38 Mon Sep 17 00:00:00 2001 From: Johanna Ratliff Date: Tue, 15 Jun 2021 14:05:33 -0600 Subject: [PATCH 2/3] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa332975..f990da11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## master / unreleased +* [ENHANCEMENT] Cortex-mixin: Include `cortex-gw-internal` naming variation. #164 * [CHANGE] `namespace` template variable in dashboards now only selects namespaces for selected clusters. #311 * [CHANGE] Alertmanager: mounted overrides configmap to alertmanager too. #315 * [CHANGE] Memcached: upgraded memcached from `1.5.17` to `1.6.9`. #316 From ecbfd81e3d2e19c42e9b75122dd11d1474bccd7c Mon Sep 17 00:00:00 2001 From: Johanna Ratliff Date: Wed, 16 Jun 2021 15:53:32 -0600 Subject: [PATCH 3/3] Update CHANGELOG.md Co-authored-by: Marco Pracucci --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f990da11..099ee1fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## master / unreleased -* [ENHANCEMENT] Cortex-mixin: Include `cortex-gw-internal` naming variation. #164 +* [ENHANCEMENT] Cortex-mixin: Include `cortex-gw-internal` naming variation in default `gateway` job names. #328 * [CHANGE] `namespace` template variable in dashboards now only selects namespaces for selected clusters. #311 * [CHANGE] Alertmanager: mounted overrides configmap to alertmanager too. #315 * [CHANGE] Memcached: upgraded memcached from `1.5.17` to `1.6.9`. #316