Skip to content

Commit 3ec1b7e

Browse files
committed
Explicitly set allValues for hub variable
Currently, on latest grafana, the dashboards will currently show 'no data' because the `$hub` variable is not set correctly (see 2i2c-org/infrastructure#3237 for details). The longer term solution to this is: 1. Move away from the deprecated graphPanel to timeseries objects for panel 2. #89 Both of these are being undertaken in #90, but in the meantime, this PR implements [this workaround](#90) so end users can at least see data.
1 parent c0dbe1c commit 3ec1b7e

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

dashboards/jupyterhub.jsonnet

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ local templates = [
2828
// Allow viewing dashboard for multiple combined hubs
2929
includeAll=true,
3030
multi=true
31-
),
31+
) + {
32+
// Explicitly set '$hub' to be `.*` when 'All' is selected, as we always use `$hub` as a regex
33+
allValue: '.*',
34+
},
3235
];
3336

3437

dashboards/usage-report.jsonnet

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ local templates = [
1818
// Allow viewing dashboard for multiple combined hubs
1919
includeAll=true,
2020
multi=false
21-
),
21+
) + {
22+
// Explicitly set '$hub' to be `.*` when 'All' is selected, as we always use `$hub` as a regex
23+
allValue: '.*',
24+
},
2225
];
2326

2427
local memoryUsageUserPods = barGaugePanel.new(

dashboards/user.jsonnet

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ local templates = [
2626
// Allow viewing dashboard for multiple combined hubs
2727
includeAll=true,
2828
multi=true
29-
),
29+
) + {
30+
// Explicitly set '$hub' to be `.*` when 'All' is selected, as we always use `$hub` as a regex
31+
allValue: '.*',
32+
},
3033
template.new(
3134
'user_pod',
3235
datasource='$PROMETHEUS_DS',

0 commit comments

Comments
 (0)