From 97cf90e33f8482fad548e72cdd0ab5af51b755c6 Mon Sep 17 00:00:00 2001 From: Duologic Date: Wed, 25 Aug 2021 14:31:40 +0200 Subject: [PATCH 1/2] fix(rules): upstream recording rule switched to sum_irate ref: https://github.com/kubernetes-monitoring/kubernetes-mixin/pull/619 --- cortex-mixin/recording_rules.libsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cortex-mixin/recording_rules.libsonnet b/cortex-mixin/recording_rules.libsonnet index 433fa8e6..4074cc00 100644 --- a/cortex-mixin/recording_rules.libsonnet +++ b/cortex-mixin/recording_rules.libsonnet @@ -213,7 +213,7 @@ local utils = import 'mixin-utils/utils.libsonnet'; sum by (cluster, namespace, deployment) ( label_replace( label_replace( - node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate, + node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate, "deployment", "$1", "pod", "(.*)-(?:([0-9]+)|([a-z0-9]+)-([a-z0-9]+))" ), # The question mark in "(.*?)" is used to make it non-greedy, otherwise it From 79c5f753afd21506af30751eff4c7bcc88e4e40e Mon Sep 17 00:00:00 2001 From: Duologic Date: Wed, 25 Aug 2021 14:42:51 +0200 Subject: [PATCH 2/2] add changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d4f88773..40b51d48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,7 @@ * [BUGFIX] Fixed rollout progress dashboard to correctly work when a Cortex service deployment spans across multiple zones (a zone is expected to have the `zone-[a-z]` suffix). #366 * [BUGFIX] Fixed rollout progress dashboard to include query-scheduler too. #376 * [BUGFIX] Fixed `-distributor.extend-writes` setting on ruler when `unregister_ingesters_on_shutdown` is disabled. #369 +* [BUGFIX] Upstream recording rule `node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate` renamed. #379 ## 1.9.0 / 2021-05-18