Skip to content

Commit 8e07224

Browse files
committed
refactor: remove redundant parenthesis
1 parent 6a9b368 commit 8e07224

File tree

2 files changed

+16
-24
lines changed

2 files changed

+16
-24
lines changed

dashboards/group.jsonnet

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -132,21 +132,17 @@ local homedirSharedUsage =
132132
* on (namespace, directory) group_right()
133133
group(
134134
# match using username_safe (kubespawner's modern "safe" scheme)
135-
(
136-
# duplicate jupyterhub_user_group_info's username_safe label as directory
137-
label_replace(
138-
jupyterhub_user_group_info{namespace=~"$hub_name", username_safe=~".*", usergroup=~"$user_group"},
139-
"directory", "$1", "username_safe", "(.+)"
140-
)
135+
# duplicate jupyterhub_user_group_info's username_safe label as directory
136+
label_replace(
137+
jupyterhub_user_group_info{namespace=~"$hub_name", username_safe=~".*", usergroup=~"$user_group"},
138+
"directory", "$1", "username_safe", "(.+)"
141139
)
142140
or
143141
# match using username_escaped (kubespawner's legacy "escape" scheme)
144-
(
145-
# duplicate jupyterhub_user_group_info's username_escaped label as directory
146-
label_replace(
147-
jupyterhub_user_group_info{namespace=~"$hub_name", username_escaped=~".*", usergroup=~"$user_group"},
148-
"directory", "$1", "username_escaped", "(.+)"
149-
)
142+
# duplicate jupyterhub_user_group_info's username_escaped label as directory
143+
label_replace(
144+
jupyterhub_user_group_info{namespace=~"$hub_name", username_escaped=~".*", usergroup=~"$user_group"},
145+
"directory", "$1", "username_escaped", "(.+)"
150146
)
151147
) by (namespace, directory, usergroup)
152148

dashboards/user.jsonnet

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,21 +96,17 @@ local homedirSharedUsage =
9696
* on (namespace, directory) group_right()
9797
group(
9898
# match using username_safe (kubespawner's modern "safe" scheme)
99-
(
100-
# duplicate jupyterhub_user_group_info's username_safe label as directory
101-
label_replace(
102-
jupyterhub_user_group_info{namespace=~"$hub_name", username_safe=~".*"},
103-
"directory", "$1", "username_safe", "(.+)"
104-
)
99+
# duplicate jupyterhub_user_group_info's username_safe label as directory
100+
label_replace(
101+
jupyterhub_user_group_info{namespace=~"$hub_name", username_safe=~".*"},
102+
"directory", "$1", "username_safe", "(.+)"
105103
)
106104
or
107105
# match using username_escaped (kubespawner's legacy "escape" scheme)
108-
(
109-
# duplicate jupyterhub_user_group_info's username_escaped label as directory
110-
label_replace(
111-
jupyterhub_user_group_info{namespace=~"$hub_name", username_escaped=~".*"},
112-
"directory", "$1", "username_escaped", "(.+)"
113-
)
106+
# duplicate jupyterhub_user_group_info's username_escaped label as directory
107+
label_replace(
108+
jupyterhub_user_group_info{namespace=~"$hub_name", username_escaped=~".*"},
109+
"directory", "$1", "username_escaped", "(.+)"
114110
)
115111
) by (namespace, directory, username)
116112

0 commit comments

Comments
 (0)