admin monitoring links should point to admin

openshift · Aug 17, 2020 · 24420e1 · 24420e1
1 parent 1eac085
commit 24420e1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/frontend/packages/dev-console/src/components/monitoring/overview/MonitoringOverview.tsx b/frontend/packages/dev-console/src/components/monitoring/overview/MonitoringOverview.tsx
@@ -33,6 +33,8 @@ type MonitoringOverviewProps = {
 };
 
 const MonitoringOverview: React.FC<MonitoringOverviewProps> = (props) => {
+  const { location } = window;
+  const { pathname: currentPath } = location;
   const { resource, pods, resourceEvents, monitoringAlerts } = props;
   const firingAlerts = getFiringAlerts(monitoringAlerts);
   const [expanded, setExpanded] = React.useState([
@@ -59,7 +61,6 @@ const MonitoringOverview: React.FC<MonitoringOverviewProps> = (props) => {
   }
 
   events = sortEvents(events);
-
   const onToggle = (id: string) => {
     const index = expanded.indexOf(id);
     const newExpanded =
@@ -132,7 +133,11 @@ const MonitoringOverview: React.FC<MonitoringOverviewProps> = (props) => {
               <>
                 <div className="odc-monitoring-overview__view-monitoring-dashboard">
                   <Link
-                    to={`/dev-monitoring/ns/${resource?.metadata?.namespace}/?workloadName=${resource?.metadata?.name}&workloadType=${resource?.kind}`}
+                    to={
+                      currentPath.startsWith('/k8s')
+                        ? `/monitoring/dashboards/grafana-dashboard-k8s-resources-workload`
+                        : `/dev-monitoring/ns/${resource?.metadata?.namespace}/?workloadName=${resource?.metadata?.name}&workloadType=${resource?.kind}`
+                    }
                   >
                     View monitoring dashboard
                   </Link>

diff --git a/...tend/packages/dev-console/src/components/monitoring/overview/MonitoringOverviewAlerts.tsx b/...tend/packages/dev-console/src/components/monitoring/overview/MonitoringOverviewAlerts.tsx
@@ -14,6 +14,8 @@ interface MonitoringOverviewAlertsProps {
 }
 
 const MonitoringOverviewAlerts: React.FC<MonitoringOverviewAlertsProps> = ({ alerts }) => {
+  const { location } = window;
+  const { pathname: currentPath } = location;
   const sortedAlerts = sortMonitoringAlerts(alerts);
 
   return (
@@ -25,9 +27,9 @@ const MonitoringOverviewAlerts: React.FC<MonitoringOverviewAlertsProps> = ({ ale
           labels: { severity, alertname, namespace },
           rule: { name, id },
         } = alert;
-        const alertDetailsPageLink = `/dev-monitoring/ns/${namespace}/alerts/${id}?${labelsToParams(
-          alert.labels,
-        )}`;
+        const alertDetailsPageLink = currentPath.startsWith('/k8s')
+          ? `/monitoring/alerts/${id}?${labelsToParams(alert.labels)}`
+          : `/dev-monitoring/ns/${namespace}/alerts/${id}?${labelsToParams(alert.labels)}`;
         return (
           <Alert
             variant={getAlertType(severity)}