Tenant Dashboard: Use natural sort for "user" variable (#9408)

So instead of getting `11000, 100000, 9000, struser`, we'll get `9000, 11000, 100000, struser`
grafana · Sep 25, 2024 · 09719b5 · 09719b5
1 parent bc8fe0b
commit 09719b5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/...oring-values-generated/mimir-distributed/templates/metamonitoring/grafana-dashboards.yaml b/...oring-values-generated/mimir-distributed/templates/metamonitoring/grafana-dashboards.yaml
@@ -35250,7 +35250,7 @@ data:
                    "query": "label_values(cortex_ingester_active_series{cluster=~\"$cluster\", namespace=~\"$namespace\"}, user)",
                    "refresh": 1,
                    "regex": "",
-                   "sort": 1,
+                   "sort": 7,
                    "tagValuesQuery": "",
                    "tags": [ ],
                    "tagsQuery": "",

diff --git a/operations/mimir-mixin-compiled-baremetal/dashboards/mimir-tenants.json b/operations/mimir-mixin-compiled-baremetal/dashboards/mimir-tenants.json
diff --git a/operations/mimir-mixin-compiled/dashboards/mimir-tenants.json b/operations/mimir-mixin-compiled/dashboards/mimir-tenants.json
diff --git a/operations/mimir-mixin/dashboards/dashboard-utils.libsonnet b/operations/mimir-mixin/dashboards/dashboard-utils.libsonnet
@@ -25,6 +25,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
   ]),
 
   local sortAscending = 1,
+  local sortNaturalAscending = 7,
 
   _config:: error 'must provide _config',
 
@@ -124,7 +125,7 @@ local utils = import 'mixin-utils/utils.libsonnet';
                .addTemplate('namespace', $._config.dashboard_variables.namespace_query, '%s' % $._config.per_namespace_label, sort=sortAscending),
 
       addActiveUserSelectorTemplates()::
-        self.addTemplate('user', 'cortex_ingester_active_series{%s=~"$cluster", %s=~"$namespace"}' % [$._config.per_cluster_label, $._config.per_namespace_label], 'user', sort=sortAscending),
+        self.addTemplate('user', 'cortex_ingester_active_series{%s=~"$cluster", %s=~"$namespace"}' % [$._config.per_cluster_label, $._config.per_namespace_label], 'user', sort=sortNaturalAscending),
 
       addCustomTemplate(label, name, options, defaultIndex=0):: self {
         // Escape the comma because it's used a separator in the options list.