Only show namespaces from selected cluster. "All" works thanks to usi…

…ng regex matcher. (#311) * Only show namespaces from selected cluster. "All" works thanks to using regex matcher. * CHANGELOG.md
grafana · May 19, 2021 · 66e3a52 · 66e3a52
1 parent 79734a7
commit 66e3a52
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## master / unreleased
 
+* [CHANGE] `namespace` template variable in dashboards now only selects namespaces for selected clusters. #311
+
 ## 1.9.0 / 2021-05-18
 
 * [CHANGE] Replace use of removed Cortex CLI flag `-querier.compress-http-responses` for query frontend with `-api.response-compression-enabled`. #299

diff --git a/cortex-mixin/dashboards/dashboard-utils.libsonnet b/cortex-mixin/dashboards/dashboard-utils.libsonnet
@@ -36,13 +36,13 @@ local utils = import 'mixin-utils/utils.libsonnet';
           then d.addMultiTemplate('job', 'cortex_build_info', 'job')
           else d
                .addMultiTemplate('cluster', 'cortex_build_info', 'cluster')
-               .addMultiTemplate('namespace', 'cortex_build_info', 'namespace')
+               .addMultiTemplate('namespace', 'cortex_build_info{cluster=~"$cluster"}', 'namespace')
         else
           if $._config.singleBinary
           then d.addTemplate('job', 'cortex_build_info', 'job')
           else d
                .addTemplate('cluster', 'cortex_build_info', 'cluster')
-               .addTemplate('namespace', 'cortex_build_info', 'namespace'),
+               .addTemplate('namespace', 'cortex_build_info{cluster=~"$cluster"}', 'namespace'),
 
     },