tempo-mixin: clear allValue so selecting All namespaces only queries …

…Tempo namespaces This is a temporary patch until grafana/jsonnet-libs#703 is merged. More details can be found in that issue as well.
yvrhdn · Nov 26, 2021 · 7c5c869 · 7c5c869
1 parent a1a95b3
commit 7c5c869
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 9 deletions.
diff --git a/operations/tempo-mixin/Makefile b/operations/tempo-mixin/Makefile
@@ -1,18 +1,18 @@
 .PHONY: all check install dashboards alerts rules
 
-all: dashboards alerts rules
+all: install dashboards alerts rules
 
 check: all
 	git diff --exit-code -- yamls/
 
 install:
 	jb install
 
-dashboards: install
+dashboards:
 	jsonnet -J vendor -S dashboards.jsonnet -m yamls
 
-alerts: install
+alerts:
 	jsonnet -J vendor -S alerts.jsonnet > yamls/alerts.yaml
 
-rules: install
+rules:
 	jsonnet -J vendor -S rules.jsonnet > yamls/rules.yaml
diff --git a/operations/tempo-mixin/dashboard-utils.libsonnet b/operations/tempo-mixin/dashboard-utils.libsonnet
@@ -7,6 +7,37 @@ grafana {
   // - some links that propagate the selected cluster.
   dashboard(title)::
     super.dashboard(title) + {
+      // Override addMultipleTempalte to make allValue configurable
+      // Remove when https://github.com/grafana/jsonnet-libs/pull/703 is merged
+      addMultiTemplate(name, metric_name, label_name, hide=0, allValue='.+'):: self {
+        templating+: {
+          list+: [{
+            allValue: allValue,
+            current: {
+              selected: true,
+              text: 'All',
+              value: '$__all',
+            },
+            datasource: '$datasource',
+            hide: hide,
+            includeAll: true,
+            label: name,
+            multi: true,
+            name: name,
+            options: [],
+            query: 'label_values(%s, %s)' % [metric_name, label_name],
+            refresh: 1,
+            regex: '',
+            sort: 2,
+            tagValuesQuery: '',
+            tags: [],
+            tagsQuery: '',
+            type: 'query',
+            useTags: false,
+          }],
+        },
+      },
+
       addClusterSelectorTemplates()::
         local d = self {
           tags: ['tempo'],
@@ -25,7 +56,7 @@ grafana {
         };
 
         d.addMultiTemplate('cluster', 'tempo_build_info', 'cluster')
-         .addMultiTemplate('namespace', 'tempo_build_info', 'namespace'),
+         .addMultiTemplate('namespace', 'tempo_build_info', 'namespace', allValue=null),
     },
 
   jobMatcher(job)::
@@ -137,4 +168,4 @@ grafana {
     $.queryPanel('sum by(instance) (go_memstats_heap_inuse_bytes{%s})' % job, '{{instance}}') +
     { yaxes: $.yaxes('bytes') },
 
-}
+}
diff --git a/operations/tempo-mixin/yamls/tempo-reads.json b/operations/tempo-mixin/yamls/tempo-reads.json
@@ -1623,7 +1623,7 @@
     "useTags": false
    },
    {
-    "allValue": ".+",
+    "allValue": null,
     "current": {
      "selected": true,
      "text": "All",

diff --git a/operations/tempo-mixin/yamls/tempo-resources.json b/operations/tempo-mixin/yamls/tempo-resources.json
@@ -1871,7 +1871,7 @@
     "useTags": false
    },
    {
-    "allValue": ".+",
+    "allValue": null,
     "current": {
      "selected": true,
      "text": "All",

diff --git a/operations/tempo-mixin/yamls/tempo-writes.json b/operations/tempo-mixin/yamls/tempo-writes.json
@@ -1673,7 +1673,7 @@
     "useTags": false
    },
    {
-    "allValue": ".+",
+    "allValue": null,
     "current": {
      "selected": true,
      "text": "All",