Merge pull request #168 from consideRatio/pr/username-safe

Username mapping for both of kubespawner's escaping schemes

Author: jnywong

dashboards/group.jsonnet

@@ -131,19 +131,22 @@ local homedirSharedUsage =
           # make namespace/directory combinations become more namespace/directory/usergroup combinations
           * on (namespace, directory) group_right()
           group(
-            # FIXME: We assume ability to match the escaped username with the
-            #        directory name, but how usernames are escaped has changed
-            #        over time - the directory name may or may not match
-            #        `username_escaped`.
-            #
-            #        - actual:      [email protected]
-            #        - old escaped: my-2ename-40example-2ecom
-            #        - new escaped: my-name-example-com---abcd1234
-            #
-            # duplicate jupyterhub_user_group_info's username_escaped label as directory
-            label_replace(
-              jupyterhub_user_group_info{namespace=~"$hub_name", username_escaped=~".*", usergroup=~"$user_group"},
-              "directory", "$1", "username_escaped", "(.+)"
+            # match using username_safe (kubespawner's modern "safe" scheme)
+            (
+              # duplicate jupyterhub_user_group_info's username_safe label as directory
+              label_replace(
+                jupyterhub_user_group_info{namespace=~"$hub_name", username_safe=~".*", usergroup=~"$user_group"},
+                "directory", "$1", "username_safe", "(.+)"
+              )
+            )
+            or
+            # match using username_escaped (kubespawner's legacy "escape" scheme)
+            (
+              # duplicate jupyterhub_user_group_info's username_escaped label as directory
+              label_replace(
+                jupyterhub_user_group_info{namespace=~"$hub_name", username_escaped=~".*", usergroup=~"$user_group"},
+                "directory", "$1", "username_escaped", "(.+)"
+              )
             )
           ) by (namespace, directory, usergroup)
 

dashboards/user.jsonnet

@@ -85,14 +85,35 @@ local homedirSharedUsage =
     prometheus.new(
       '$PROMETHEUS_DS',
       |||
-        max(
-          dirsize_total_size_bytes{namespace=~"$hub_name"}
-          * on (namespace, directory) group_left(username)
+        sum(
+
+          # max is used to de-duplicate data from multiple sources
+          max(
+            dirsize_total_size_bytes{namespace=~"$hub_name"}
+          ) by (namespace, directory)
+
+          # make namespace/directory combinations become more namespace/directory/username combinations
+          * on (namespace, directory) group_right()
           group(
-            label_replace(
-              jupyterhub_user_group_info{namespace=~"$hub_name", username_escaped=~".*"},
-                "directory", "$1", "username_escaped", "(.+)")
-          ) by (directory, namespace, username)
+            # match using username_safe (kubespawner's modern "safe" scheme)
+            (
+              # duplicate jupyterhub_user_group_info's username_safe label as directory
+              label_replace(
+                jupyterhub_user_group_info{namespace=~"$hub_name", username_safe=~".*"},
+                "directory", "$1", "username_safe", "(.+)"
+              )
+            )
+            or
+            # match using username_escaped (kubespawner's legacy "escape" scheme)
+            (
+              # duplicate jupyterhub_user_group_info's username_escaped label as directory
+              label_replace(
+                jupyterhub_user_group_info{namespace=~"$hub_name", username_escaped=~".*"},
+                "directory", "$1", "username_escaped", "(.+)"
+              )
+            )
+          ) by (namespace, directory, username)
+
         ) by (namespace, username)
       |||
     )