[HWORKS-896] Allow non admin users to view serving resource usage das…

…hboards (#1653)
logicalclocks · Feb 9, 2024 · 2c89f75 · 2c89f75
1 parent 6b57061
commit 2c89f75
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/hopsworks-api/src/main/java/io/hops/hopsworks/api/kibana/GrafanaProxyServlet.java b/hopsworks-api/src/main/java/io/hops/hopsworks/api/kibana/GrafanaProxyServlet.java
@@ -111,7 +111,9 @@ public class GrafanaProxyServlet extends ProxyServlet {
       put(YARN_APP_PATTERN_KEY, Pattern.compile("(application_.*?_.\\d*)"));
       put(FG_KAFKA_TOPIC_KEY, Pattern.compile(
         "(?<projectid>[0-9]+)_(?<fgid>[0-9]+)_(?<fgname>[a-z0-9_]+)_(?<fgversion>[0-9]+)_onlinefs"));
-      put(DEPLOYMENT_METRICS_KEY, Pattern.compile("namespace_name=\\\\\"(?<projectname>[0-9a-z-]+)\\\\\""));
+      put(DEPLOYMENT_METRICS_KEY,
+          Pattern.compile("(namespace_name|exported_namespace|container_label_io_kubernetes_pod_namespace)" +
+              "=\\\\\"(?<projectname>[0-9a-z-]+)\\\\\""));
       put(USER_STATEMENT_SUMMARIES, Pattern.compile("user=\\\\\"(?<dbuser>[0-9a-z_]+)\\\\\""));
     }
   };