Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tempo-mixin: clear allValue so selecting All namespaces only queries Tempo namespaces #1138

Merged
merged 2 commits into from
Nov 27, 2021
Merged

tempo-mixin: clear allValue so selecting All namespaces only queries Tempo namespaces #1138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c5c869
tempo-mixin: clear allValue so selecting All namespaces only queries …
Nov 26, 2021
5ec47a6
Run jb update, remove temporary code
Nov 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions operations/tempo-mixin/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions operations/tempo-mixin/dashboard-utils.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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)::
Expand Down Expand Up @@ -137,4 +137,4 @@ grafana {
$.queryPanel('sum by(instance) (go_memstats_heap_inuse_bytes{%s})' % job, '{{instance}}') +
{ yaxes: $.yaxes('bytes') },

}
}
6 changes: 3 additions & 3 deletions operations/tempo-mixin/jsonnetfile.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"subdir": "grafana-builder"
}
},
"version": "c4975f7c4a7ab4c21020c4afbf247aa49142174d",
"sum": "y8uA/daOROErelzoo2p1rtqABhUPArg2alsfcb0PQBk="
"version": "84900d9dc450116ad66864f48088f92ccae36c54",
"sum": "0KkygBQd/AFzUvVzezE4qF/uDYgrwUXVpZfINBti0oc="
},
{
"source": {
Expand All @@ -18,7 +18,7 @@
"subdir": "mixin-utils"
}
},
"version": "c4975f7c4a7ab4c21020c4afbf247aa49142174d",
"version": "84900d9dc450116ad66864f48088f92ccae36c54",
"sum": "v6fuqqQp9rHZbsxN9o79QzOpUlwYZEJ84DxTCZMCYeU="
}
],
Expand Down
8 changes: 4 additions & 4 deletions ...ions/tempo-mixin/vendor/github.com/grafana/jsonnet-libs/grafana-builder/grafana.libsonnet
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion operations/tempo-mixin/yamls/tempo-reads.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1623,7 +1623,7 @@
"useTags": false
},
{
"allValue": ".+",
"allValue": null,
"current": {
"selected": true,
"text": "All",
Expand Down
2 changes: 1 addition & 1 deletion operations/tempo-mixin/yamls/tempo-resources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1871,7 +1871,7 @@
"useTags": false
},
{
"allValue": ".+",
"allValue": null,
"current": {
"selected": true,
"text": "All",
Expand Down
2 changes: 1 addition & 1 deletion operations/tempo-mixin/yamls/tempo-writes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1673,7 +1673,7 @@
"useTags": false
},
{
"allValue": ".+",
"allValue": null,
"current": {
"selected": true,
"text": "All",
Expand Down