Merge branch 'main' into fix-refetch-alert

Author: pracucci

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
 * [BUGFIX] Fixed `CortexQuerierHighRefetchRate` alert. #268
 
 ## 1.7.0 / 2021-02-24

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:: {

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'),