Skip to content

Commit 2c89f75

Browse files
gibchikafao-alex
authored andcommitted
[HWORKS-896] Allow non admin users to view serving resource usage dashboards (#1653)
1 parent 6b57061 commit 2c89f75

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

hopsworks-api/src/main/java/io/hops/hopsworks/api/kibana/GrafanaProxyServlet.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ public class GrafanaProxyServlet extends ProxyServlet {
111111
put(YARN_APP_PATTERN_KEY, Pattern.compile("(application_.*?_.\\d*)"));
112112
put(FG_KAFKA_TOPIC_KEY, Pattern.compile(
113113
"(?<projectid>[0-9]+)_(?<fgid>[0-9]+)_(?<fgname>[a-z0-9_]+)_(?<fgversion>[0-9]+)_onlinefs"));
114-
put(DEPLOYMENT_METRICS_KEY, Pattern.compile("namespace_name=\\\\\"(?<projectname>[0-9a-z-]+)\\\\\""));
114+
put(DEPLOYMENT_METRICS_KEY,
115+
Pattern.compile("(namespace_name|exported_namespace|container_label_io_kubernetes_pod_namespace)" +
116+
"=\\\\\"(?<projectname>[0-9a-z-]+)\\\\\""));
115117
put(USER_STATEMENT_SUMMARIES, Pattern.compile("user=\\\\\"(?<dbuser>[0-9a-z_]+)\\\\\""));
116118
}
117119
};

0 commit comments

Comments
 (0)