From db914b02576243c3b3194290d1b7edf22ff2e80f Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Thu, 29 Feb 2024 12:49:12 -0800
Subject: [PATCH] Explicitly set allowAll for all variables includeAll

A follow-up to https://github.com/jupyterhub/grafana-dashboards/pull/91,
as the openscapes community reported this is causing issues
not just for the $hub variable but everything else as well.

https://github.com/jupyterhub/grafana-dashboards/pull/90 is
the long term fix
---
 dashboards/user.jsonnet | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dashboards/user.jsonnet b/dashboards/user.jsonnet
index c9be28c..667f871 100755
--- a/dashboards/user.jsonnet
+++ b/dashboards/user.jsonnet
@@ -37,7 +37,10 @@ local templates = [
     // Allow viewing dashboard for multiple users
     includeAll=true,
     multi=true
-  ),
+  ) + {
+    // Explicitly set '$user_pod' to be `.*` when 'All' is selected, as we always use `$user_pod` as a regex
+    allValue: '.*',
+  },
   template.new(
     // Queries should use the 'instance' label when querying metrics that
     // come from collectors present on each node - such as node_exporter or
@@ -50,7 +53,10 @@ local templates = [
     // Allow viewing dashboard for multiple nodes
     includeAll=true,
     multi=true
-  ),
+  ) + {
+    // Explicitly set '$instance' to be `.*` when 'All' is selected, as we always use `$instance` as a regex
+    allValue: '.*',
+  },
 ];