From efc7dff50885751e8ede1abd5fbf19b49a2d6ada Mon Sep 17 00:00:00 2001 From: Marco Pracucci Date: Fri, 12 Mar 2021 09:55:54 +0100 Subject: [PATCH 1/2] Sort legend descending in the CPU/memory panels Signed-off-by: Marco Pracucci --- cortex-mixin/dashboards/dashboard-utils.libsonnet | 7 ++++++- cortex-mixin/dashboards/writes-resources.libsonnet | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cortex-mixin/dashboards/dashboard-utils.libsonnet b/cortex-mixin/dashboards/dashboard-utils.libsonnet index 2e48fd7a..47ff4919 100644 --- a/cortex-mixin/dashboards/dashboard-utils.libsonnet +++ b/cortex-mixin/dashboards/dashboard-utils.libsonnet @@ -139,6 +139,7 @@ local utils = import 'mixin-utils/utils.libsonnet'; fill: 0, }, ], + tooltip: { sort: 2 }, // Sort descending. }, containerMemoryWorkingSetPanel(title, containerName):: @@ -158,6 +159,7 @@ local utils = import 'mixin-utils/utils.libsonnet'; }, ], yaxes: $.yaxes('bytes'), + tooltip: { sort: 2 }, // Sort descending. }, goHeapInUsePanel(title, jobName):: @@ -166,7 +168,10 @@ local utils = import 'mixin-utils/utils.libsonnet'; 'sum by(%s) (go_memstats_heap_inuse_bytes{%s})' % [$._config.per_instance_label, $.jobMatcher(jobName)], '{{%s}}' % $._config.per_instance_label ) + - { yaxes: $.yaxes('bytes') }, + { + yaxes: $.yaxes('bytes'), + tooltip: { sort: 2 }, // Sort descending. + }, // Switches a panel from lines (default) to bars. bars:: { diff --git a/cortex-mixin/dashboards/writes-resources.libsonnet b/cortex-mixin/dashboards/writes-resources.libsonnet index 68570111..95f7a056 100644 --- a/cortex-mixin/dashboards/writes-resources.libsonnet +++ b/cortex-mixin/dashboards/writes-resources.libsonnet @@ -35,7 +35,10 @@ local utils = import 'mixin-utils/utils.libsonnet'; $.queryPanel( 'sum by(%s) (cortex_ingester_memory_series{%s})' % [$._config.per_instance_label, $.jobMatcher($._config.job_names.ingester)], '{{%s}}' % $._config.per_instance_label - ), + ) + + { + tooltip: { sort: 2 }, // Sort descending. + }, ) .addPanel( $.containerCPUUsagePanel('CPU', 'ingester'), From 5a1e2305ffa7339d2b94ddebb56615d6546d2e0d Mon Sep 17 00:00:00 2001 From: Marco Pracucci Date: Fri, 12 Mar 2021 09:56:45 +0100 Subject: [PATCH 2/2] Added CHANGELOG entry Signed-off-by: Marco Pracucci --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69bb2df7..de6991fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ git branch -u origin/main main ``` * [ENHANCEMENT] Add `EtcdAllocatingTooMuchMemory` alert for monitoring etcd memory usage. #261 +* [ENHANCEMENT] Sort legend descending in the CPU/memory panels. #271 ## 1.7.0 / 2021-02-24