Fix overview page to work with the new DASHBOARD_UID env var (ray-pro…

…ject#32279) In ray-project#32255 , i added a new env var to customize grafana dashboard uid. I forgot to use this var in the overview page. I also made the "View in Grafana" button take the user directly to the dashboard instead of the homepage of Grafana. Signed-off-by: Alan Guo aguo@anyscale.com
alanwguo · Feb 7, 2023 · c813a2a · c813a2a
1 parent 1767201
commit c813a2a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/dashboard/client/src/pages/metrics/Metrics.tsx b/dashboard/client/src/pages/metrics/Metrics.tsx
@@ -241,7 +241,7 @@ export const Metrics = ({ newIA = false }: MetricsProps) => {
             })}
           >
             <Button
-              href={grafanaHost}
+              href={`${grafanaHost}/d/${grafanaDefaultDashboardUid}`}
               target="_blank"
               rel="noopener noreferrer"
               endIcon={<RiExternalLinkLine />}

diff --git a/dashboard/client/src/pages/overview/cards/ClusterUtilizationCard.tsx b/dashboard/client/src/pages/overview/cards/ClusterUtilizationCard.tsx
@@ -40,10 +40,13 @@ export const ClusterUtilizationCard = ({
 }: ClusterUtilizationCardProps) => {
   const classes = useStyles();
 
-  const { grafanaHost, prometheusHealth, sessionName } =
-    useContext(GlobalContext);
-  const path =
-    "/d-solo/rayDefaultDashboard/default-dashboard?orgId=1&theme=light&panelId=41";
+  const {
+    grafanaHost,
+    prometheusHealth,
+    sessionName,
+    grafanaDefaultDashboardUid = "rayDefaultDashboard",
+  } = useContext(GlobalContext);
+  const path = `/d-solo/${grafanaDefaultDashboardUid}/default-dashboard?orgId=1&theme=light&panelId=41`;
   const timeRangeParams = "&from=now-30m&to=now";
 
   return (

diff --git a/dashboard/client/src/pages/overview/cards/NodeCountCard.tsx b/dashboard/client/src/pages/overview/cards/NodeCountCard.tsx
@@ -38,10 +38,13 @@ type NodeCountCardProps = {
 export const NodeCountCard = ({ className }: NodeCountCardProps) => {
   const classes = useStyles();
 
-  const { grafanaHost, prometheusHealth, sessionName } =
-    useContext(GlobalContext);
-  const path =
-    "/d-solo/rayDefaultDashboard/default-dashboard?orgId=1&theme=light&panelId=24";
+  const {
+    grafanaHost,
+    prometheusHealth,
+    sessionName,
+    grafanaDefaultDashboardUid = "rayDefaultDashboard",
+  } = useContext(GlobalContext);
+  const path = `/d-solo/${grafanaDefaultDashboardUid}/default-dashboard?orgId=1&theme=light&panelId=24`;
   const timeRangeParams = "&from=now-30m&to=now";
 
   return (