diff --git a/client/src/pages/config/routeConfigPage.jsx b/client/src/pages/config/routeConfigPage.jsx index c7238ad..021edad 100644 --- a/client/src/pages/config/routeConfigPage.jsx +++ b/client/src/pages/config/routeConfigPage.jsx @@ -8,6 +8,7 @@ import * as API from "../../api"; import RouteSecurity from "./routes/routeSecurity"; import RouteOverview from "./routes/routeoverview"; import IsLoggedIn from "../../isLoggedIn"; +import RouteMetrics from "../dashboard/routeMonitoring"; const RouteConfigPage = () => { const { routeName } = useParams(); @@ -63,6 +64,10 @@ const RouteConfigPage = () => { config={config} /> }, + { + title: 'Monitoring', + children: + }, ]}/>} {!config &&
diff --git a/client/src/pages/dashboard/components/table.jsx b/client/src/pages/dashboard/components/table.jsx index 14d1922..cd6694f 100644 --- a/client/src/pages/dashboard/components/table.jsx +++ b/client/src/pages/dashboard/components/table.jsx @@ -62,6 +62,9 @@ function descendingComparator(a, b, orderBy) { if(orderBy != 'name') { a1 = parseFloat(a["__" + orderBy]); b1 = parseFloat(b["__" + orderBy]); + } else { + a1 = a1.toLowerCase(); + b1 = b1.toLowerCase(); } if (b1 < a1) { diff --git a/client/src/pages/dashboard/containerMetrics.jsx b/client/src/pages/dashboard/containerMetrics.jsx index d9b06b7..a107a54 100644 --- a/client/src/pages/dashboard/containerMetrics.jsx +++ b/client/src/pages/dashboard/containerMetrics.jsx @@ -175,7 +175,7 @@ const ContainerMetrics = ({containerName}) => { } {metrics &&
- + {containerName} Monitoring + + + + {zoom.xaxis.min && } + + + + + + + + + + + +
} + + ); +}; + +export default RouteMetrics; diff --git a/package.json b/package.json index 7ab15e8..39c4209 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cosmos-server", - "version": "0.12.0-unstable33", + "version": "0.12.0-unstable34", "description": "", "main": "test-server.js", "bugs": {