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

Jump to bottom

Filter namespace by cluster in tempo dashboards variables #1771

Merged
merged 4 commits into from
Sep 29, 2022
Merged

Filter namespace by cluster in tempo dashboards variables #1771

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d04725c
Filter namespace by cluster in tempo dashboards variables
electron0zero Sep 29, 2022
19efe46
Update CHANGELOG.md
electron0zero Sep 29, 2022
f690602
run jsonnetfmt
electron0zero Sep 29, 2022
f3530d8
Use same jsonnet version and implementation as CI to make CI happy
electron0zero Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## main / unreleased

* [ENHANCEMENT] Filter namespace by cluster in tempo dashboards variables [#1771](https://github.com/grafana/tempo/pull/1771) (@electron0zero)
* [ENHANCEMENT] Exit early from sharded search requests [#1742](https://github.com/grafana/tempo/pull/1742) (@electron0zero)
* [CHANGE] Identify bloom that could not be retrieved from backend block [#1737](https://github.com/grafana/tempo/pull/1737) (@AlexDHoffer)
* [CHANGE] tempo: check configuration returns now a list of warnings [#1663](https://github.com/grafana/tempo/pull/1663) (@frzifus)
Expand Down
6 changes: 3 additions & 3 deletions operations/tempo-mixin-compiled/dashboards/tempo-operational.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5565,7 +5565,7 @@
"type": "prometheus",
"uid": "$ds"
},
"definition": "label_values(tempo_build_info, namespace)",
"definition": "label_values(tempo_build_info{cluster=~'$cluster'}, namespace)",
electron0zero marked this conversation as resolved.
Show resolved Hide resolved
"hide": 0,
"includeAll": false,
"multi": false,
Expand All @@ -5574,7 +5574,7 @@

],
"query": {
"query": "label_values(tempo_build_info, namespace)",
"query": "label_values(tempo_build_info{cluster=~'$cluster'}, namespace)",
"refId": "ops-cortex-namespace-Variable-Query"
},
"refresh": 1,
Expand Down Expand Up @@ -5668,4 +5668,4 @@
"uid": "a6175b9cc7ec20591890117c39580030",
"version": 1,
"weekStart": ""
}
}
4 changes: 2 additions & 2 deletions operations/tempo-mixin-compiled/dashboards/tempo-reads.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1562,7 +1562,7 @@
"options": [

],
"query": "label_values(tempo_build_info, namespace)",
"query": "label_values(tempo_build_info{cluster=~'$cluster'}, namespace)",
"refresh": 1,
"regex": "",
"sort": 2,
Expand Down Expand Up @@ -1609,4 +1609,4 @@
"title": "Tempo / Reads",
"uid": "",
"version": 0
}
}
4 changes: 2 additions & 2 deletions operations/tempo-mixin-compiled/dashboards/tempo-resources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2185,7 +2185,7 @@
"options": [

],
"query": "label_values(tempo_build_info, namespace)",
"query": "label_values(tempo_build_info{cluster=~'$cluster'}, namespace)",
"refresh": 1,
"regex": "",
"sort": 2,
Expand Down Expand Up @@ -2232,4 +2232,4 @@
"title": "Tempo / Resources",
"uid": "",
"version": 0
}
}
10 changes: 5 additions & 5 deletions operations/tempo-mixin-compiled/dashboards/tempo-rollout-progress.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@
},
{
"color": "orange",
"value": 0.20000000000000001
"value": 0.2
},
{
"color": "red",
Expand Down Expand Up @@ -548,7 +548,7 @@
},
{
"color": "orange",
"value": 0.20000000000000001
"value": 0.2
},
{
"color": "red",
Expand Down Expand Up @@ -792,7 +792,7 @@
},
{
"color": "red",
"value": 0.050000000000000003
"value": 0.05
}
]
},
Expand Down Expand Up @@ -1509,7 +1509,7 @@
"options": [

],
"query": "label_values(tempo_build_info, namespace)",
"query": "label_values(tempo_build_info{cluster=~'$cluster'}, namespace)",
"refresh": 1,
"regex": "",
"sort": 2,
Expand Down Expand Up @@ -1556,4 +1556,4 @@
"title": "Rollout progress",
"uid": "217b16a8c5966b32c770225dea289b19",
"version": 0
}
}
4 changes: 2 additions & 2 deletions operations/tempo-mixin-compiled/dashboards/tempo-writes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1688,7 +1688,7 @@
"options": [

],
"query": "label_values(tempo_build_info, namespace)",
"query": "label_values(tempo_build_info{cluster=~'$cluster'}, namespace)",
"refresh": 1,
"regex": "",
"sort": 2,
Expand Down Expand Up @@ -1735,4 +1735,4 @@
"title": "Tempo / Writes",
"uid": "",
"version": 0
}
}
2 changes: 1 addition & 1 deletion operations/tempo-mixin/dashboards/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', allValue=null),
.addMultiTemplate('namespace', 'tempo_build_info{cluster=~\'$cluster\'}', 'namespace', allValue=null),
},

jobMatcher(job)::
Expand Down
4 changes: 2 additions & 2 deletions operations/tempo-mixin/dashboards/tempo-operational.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5203,14 +5203,14 @@
"type": "prometheus",
"uid": "$ds"
},
"definition": "label_values(tempo_build_info, namespace)",
"definition": "label_values(tempo_build_info{cluster=~'$cluster'}, namespace)",
"hide": 0,
"includeAll": false,
"multi": false,
"name": "namespace",
"options": [],
"query": {
"query": "label_values(tempo_build_info, namespace)",
"query": "label_values(tempo_build_info{cluster=~'$cluster'}, namespace)",
"refId": "ops-cortex-namespace-Variable-Query"
},
"refresh": 1,
Expand Down