From 2c89f757fdaa8b80f4ce9103cd3e068d7d5a9bcf Mon Sep 17 00:00:00 2001
From: Gibson Chikafa <gibbschikafa@gmail.com>
Date: Wed, 31 Jan 2024 01:26:08 +0200
Subject: [PATCH] [HWORKS-896] Allow non admin users to view serving resource
 usage dashboards (#1653)

---
 .../io/hops/hopsworks/api/kibana/GrafanaProxyServlet.java     | 4 +++-
 1 file changed, 3 insertions(+), 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
index 9e7cd32ba0..a90ffd0285 100644
--- 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_]+)\\\\\""));
     }
   };