Skip to content

Commit

Permalink
Explicitly set allValues for hub variable
Browse files Browse the repository at this point in the history
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. jupyterhub#89

Both of these are being undertaken in
jupyterhub#90,
but in the meantime, this PR implements
[this
workaround](jupyterhub#90)
so end users can at least see data.
  • Loading branch information
yuvipanda committed Oct 19, 2023
1 parent c0dbe1c commit 3ec1b7e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
5 changes: 4 additions & 1 deletion dashboards/jupyterhub.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ local templates = [
// Allow viewing dashboard for multiple combined hubs
includeAll=true,
multi=true
),
) + {
// Explicitly set '$hub' to be `.*` when 'All' is selected, as we always use `$hub` as a regex
allValue: '.*',
},
];


Expand Down
5 changes: 4 additions & 1 deletion dashboards/usage-report.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@ local templates = [
// Allow viewing dashboard for multiple combined hubs
includeAll=true,
multi=false
),
) + {
// Explicitly set '$hub' to be `.*` when 'All' is selected, as we always use `$hub` as a regex
allValue: '.*',
},
];

local memoryUsageUserPods = barGaugePanel.new(
Expand Down
5 changes: 4 additions & 1 deletion dashboards/user.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ local templates = [
// Allow viewing dashboard for multiple combined hubs
includeAll=true,
multi=true
),
) + {
// Explicitly set '$hub' to be `.*` when 'All' is selected, as we always use `$hub` as a regex
allValue: '.*',
},
template.new(
'user_pod',
datasource='$PROMETHEUS_DS',
Expand Down

0 comments on commit 3ec1b7e

Please sign in to comment.