diff --git a/client/src/Components/Charts/Utils/chartUtils.jsx b/client/src/Components/Charts/Utils/chartUtils.jsx
index 414e1ff9c..bbf81ae38 100644
--- a/client/src/Components/Charts/Utils/chartUtils.jsx
+++ b/client/src/Components/Charts/Utils/chartUtils.jsx
@@ -112,6 +112,7 @@ export const InfrastructureTooltip = ({
yLabel,
dotColor,
dateRange,
+ formatter = getFormattedPercentage,
}) => {
const uiTimezone = useSelector((state) => state.ui.timezone);
const theme = useTheme();
@@ -166,8 +167,8 @@ export const InfrastructureTooltip = ({
sx={{ opacity: 0.8 }}
>
{yIdx >= 0
- ? `${yLabel} ${getFormattedPercentage(payload[0].payload[hardwareType][yIdx][metric])}`
- : `${yLabel} ${getFormattedPercentage(payload[0].payload[yKey])}`}
+ ? `${yLabel} ${formatter(payload[0].payload[hardwareType][yIdx][metric])}`
+ : `${yLabel} ${formatter(payload[0].payload[yKey])}`}
diff --git a/client/src/Pages/Infrastructure/Details/Components/NetworkStats/NetworkCharts.jsx b/client/src/Pages/Infrastructure/Details/Components/NetworkStats/NetworkCharts.jsx
index 497fa1410..9ef548b2e 100644
--- a/client/src/Pages/Infrastructure/Details/Components/NetworkStats/NetworkCharts.jsx
+++ b/client/src/Pages/Infrastructure/Details/Components/NetworkStats/NetworkCharts.jsx
@@ -2,7 +2,7 @@
import { Grid, Card, CardContent, Typography } from "@mui/material";
import { useTheme } from "@mui/material/styles";
import AreaChart from "../../../../../Components/Charts/AreaChart";
-import { TzTick } from '../../../../../Components/Charts/Utils/chartUtils';
+import { TzTick, InfrastructureTooltip } from '../../../../../Components/Charts/Utils/chartUtils';
const BytesTick = ({ x, y, payload }) => {
const value = payload.value;
@@ -16,37 +16,89 @@ const BytesTick = ({ x, y, payload }) => {
return {label};
};
+const getFormattedNetworkMetric = (value) => {
+ if (typeof value !== "number" || isNaN(value)) return "0";
+ if (value >= 1024 ** 3) return `${(value / 1024 ** 3).toFixed(1)} GB/s`;
+ if (value >= 1024 ** 2) return `${(value / 1024 ** 2).toFixed(1)} MB/s`;
+ if (value >= 1024) return `${(value / 1024).toFixed(1)} KB/s`;
+ return `${Math.round(value)} B/s`;
+};
+
const NetworkCharts = ({ eth0Data, dateRange }) => {
const theme = useTheme();
const textColor = theme.palette.primary.contrastTextTertiary;
const charts = [
- { title: "eth0 Bytes/sec", key: "bytesPerSec", color: theme.palette.info.main, yTick: },
- { title: "eth0 Packets/sec", key: "packetsPerSec", color: theme.palette.success.main },
- { title: "eth0 Errors", key: "errors", color: theme.palette.error.main },
- { title: "eth0 Drops", key: "drops", color: theme.palette.warning.main }
+ { title: "Bytes per second", key: "bytesPerSec", color: theme.palette.info.main, yTick: },
+ { title: "Packets per second", key: "packetsPerSec", color: theme.palette.success.main },
+ { title: "Errors", key: "errors", color: theme.palette.error.main },
+ { title: "Drops", key: "drops", color: theme.palette.warning.main }
];
+ const formatYAxis = (key, value) => {
+ if (key === "bytesPerSec") {
+ // Format as MB/s or GB/s if large
+ if (value >= 1024 ** 3) return `${(value / 1024 ** 3).toFixed(1)} GB/s`;
+ if (value >= 1024 ** 2) return `${(value / 1024 ** 2).toFixed(1)} MB/s`;
+ if (value >= 1024) return `${(value / 1024).toFixed(1)} KB/s`;
+ return `${Math.round(value)} B/s`;
+ }
+ return Math.round(value).toLocaleString();
+ };
+
+ const CustomTick = ({ x, y, payload, chartKey }) => {
+ // Ensure value is always rounded for display
+ let value = payload.value;
+ if (typeof value === 'number') {
+ value = Math.round(value);
+ }
+ return (
+
+ {formatYAxis(chartKey, value)}
+
+ );
+ };
+
+ const chartConfigs = charts.map((chart) => ({
+ data: eth0Data,
+ dataKeys: [chart.key],
+ heading: chart.title,
+ strokeColor: chart.color,
+ gradientStartColor: chart.color,
+ yTick: chart.yTick || ,
+ xTick: ,
+ toolTip: (
+
+ ),
+ }));
+
return (
- {charts.map((chart) => (
-
+ {chartConfigs.map((config, idx) => (
+
- {chart.title}
+ {config.heading}
}
- strokeColor={chart.color}
+ yTick={config.yTick}
+ xTick={config.xTick}
+ strokeColor={config.strokeColor}
gradient
- gradientStartColor={chart.color}
+ gradientStartColor={config.gradientStartColor}
gradientEndColor="#fff"
height={200}
+ customTooltip={config.toolTip}
/>
diff --git a/client/src/Pages/Infrastructure/Details/Components/NetworkStats/NetworkStatBoxes.jsx b/client/src/Pages/Infrastructure/Details/Components/NetworkStats/NetworkStatBoxes.jsx
index abe67fa8e..5253742a6 100644
--- a/client/src/Pages/Infrastructure/Details/Components/NetworkStats/NetworkStatBoxes.jsx
+++ b/client/src/Pages/Infrastructure/Details/Components/NetworkStats/NetworkStatBoxes.jsx
@@ -7,76 +7,78 @@ import StatBox from "../../../../../Components/StatBox";
import { Typography } from "@mui/material";
const INTERFACE_LABELS = {
- en0: "Ethernet/Wi-Fi (Primary)",
- wlan0: "Wi-Fi (Secondary)",
+ en0: "Ethernet/Wi-Fi (Primary)",
+ wlan0: "Wi-Fi (Secondary)",
};
function formatBytes(bytes) {
- if (bytes === 0 || bytes == null) return "0 B";
- const k = 1024;
- const sizes = ["B", "KB", "MB", "GB", "TB"];
- const i = Math.floor(Math.log(bytes) / Math.log(k));
- return `${(bytes / Math.pow(k, i)).toFixed(2)} ${sizes[i]}`;
+ if (bytes === 0 || bytes == null) return "0 B";
+ const k = 1024;
+ const sizes = ["B", "KB", "MB", "GB", "TB"];
+ const i = Math.floor(Math.log(bytes) / Math.log(k));
+ return `${(bytes / Math.pow(k, i)).toFixed(2)} ${sizes[i]}`;
}
// Format numbers with commas
function formatNumber(num) {
- return num != null ? num.toLocaleString() : "0";
+ return num != null ? num.toLocaleString() : "0";
}
const NetworkStatBoxes = ({ shouldRender, net }) => {
- const filtered = net?.filter(
- (iface) => iface.name === "en0" || iface.name === "wlan0"
- ) || [];
+ const filtered =
+ net?.filter((iface) => iface.name === "en0" || iface.name === "wlan0") || [];
- if (!net?.length) {
- return No network stats available.;
- }
+ if (!net?.length) {
+ return No network stats available.;
+ }
- return (
-
- {filtered.map((iface) => (
- <>
-
-
-
-
-
-
- >
- ))}
-
- );
+ return (
+
+ {filtered.map((iface) => (
+ <>
+
+
+
+
+
+
+ >
+ ))}
+
+ );
};
export default NetworkStatBoxes;
diff --git a/client/src/Pages/Infrastructure/Details/Components/NetworkStats/index.jsx b/client/src/Pages/Infrastructure/Details/Components/NetworkStats/index.jsx
index ecb62e769..60825be0f 100644
--- a/client/src/Pages/Infrastructure/Details/Components/NetworkStats/index.jsx
+++ b/client/src/Pages/Infrastructure/Details/Components/NetworkStats/index.jsx
@@ -3,98 +3,105 @@ import NetworkCharts from "./NetworkCharts";
import MonitorTimeFrameHeader from "../../../../../Components/MonitorTimeFrameHeader";
function filterByDateRange(data, dateRange) {
- if (!Array.isArray(data)) return [];
- const now = Date.now();
- let cutoff;
- switch (dateRange) {
- case "recent":
- cutoff = now - 2 * 60 * 60 * 1000; // last 2 hours
- break;
- case "day":
- cutoff = now - 24 * 60 * 60 * 1000; // last 24 hours
- break;
- case "week":
- cutoff = now - 7 * 24 * 60 * 60 * 1000; // last 7 days
- break;
- case "month":
- cutoff = now - 30 * 24 * 60 * 60 * 1000; // last 30 days
- break;
- default:
- cutoff = 0;
- }
- return data.filter((d) => new Date(d.time).getTime() >= cutoff);
+ if (!Array.isArray(data)) return [];
+ const now = Date.now();
+ let cutoff;
+ switch (dateRange) {
+ case "recent":
+ cutoff = now - 2 * 60 * 60 * 1000; // last 2 hours
+ break;
+ case "day":
+ cutoff = now - 24 * 60 * 60 * 1000; // last 24 hours
+ break;
+ case "week":
+ cutoff = now - 7 * 24 * 60 * 60 * 1000; // last 7 days
+ break;
+ case "month":
+ cutoff = now - 30 * 24 * 60 * 60 * 1000; // last 30 days
+ break;
+ default:
+ cutoff = 0;
+ }
+ return data.filter((d) => new Date(d.time).getTime() >= cutoff);
}
const Network = ({ net, checks, isLoading, dateRange, setDateRange }) => {
- const eth0Data = getEth0TimeSeries(checks);
- const xAxisFormatter = getXAxisFormatter(checks);
- const filteredEth0Data = filterByDateRange(eth0Data, dateRange);
+ const eth0Data = getEth0TimeSeries(checks);
+ const xAxisFormatter = getXAxisFormatter(checks);
+ const filteredEth0Data = filterByDateRange(eth0Data, dateRange);
- return (
- <>
-
-
-
- >
- );
+ return (
+ <>
+
+
+
+ >
+ );
};
export default Network;
/* ---------- Helper functions ---------- */
function getEth0TimeSeries(checks) {
- const sorted = [...(checks || [])].sort((a, b) => new Date(a._id) - new Date(b._id));
- const series = [];
- let prev = null;
+ const sorted = [...(checks || [])].sort((a, b) => new Date(a._id) - new Date(b._id));
+ const series = [];
+ let prev = null;
- for (const check of sorted) {
- const eth = (check.net || []).find((iface) => iface.name === "en0");
- if (!eth) {
- prev = check;
- continue;
- }
- if (prev) {
- const prevEth = (prev.net || []).find((iface) => iface.name === "en0");
- const t1 = new Date(check._id);
- const t0 = new Date(prev._id);
- if (!prevEth || isNaN(t1) || isNaN(t0)) {
- prev = check;
- continue;
- }
- const dt = (t1 - t0) / 1000;
- if (dt > 0) {
- series.push({
- time: check._id,
- bytesPerSec: (eth.bytesSent - prevEth.bytesSent) / dt,
- packetsPerSec: (eth.packetsSent - prevEth.packetsSent) / dt,
- errors: (eth.errIn ?? 0) + (eth.errOut ?? 0),
- drops: (eth.dropIn ?? 0) + (eth.dropOut ?? 0),
- });
- }
- }
- prev = check;
- }
+ for (const check of sorted) {
+ const eth = (check.net || []).find((iface) => iface.name === "en0");
+ if (!eth) {
+ prev = check;
+ continue;
+ }
+ if (prev) {
+ const prevEth = (prev.net || []).find((iface) => iface.name === "en0");
+ const t1 = new Date(check._id);
+ const t0 = new Date(prev._id);
+ if (!prevEth || isNaN(t1) || isNaN(t0)) {
+ prev = check;
+ continue;
+ }
+ const dt = (t1 - t0) / 1000;
+ if (dt > 0) {
+ series.push({
+ time: check._id,
+ bytesPerSec: (eth.bytesSent - prevEth.bytesSent) / dt,
+ packetsPerSec: (eth.packetsSent - prevEth.packetsSent) / dt,
+ errors: (eth.errIn ?? 0) + (eth.errOut ?? 0),
+ drops: (eth.dropIn ?? 0) + (eth.dropOut ?? 0),
+ });
+ }
+ }
+ prev = check;
+ }
- return series;
+ return series;
}
function getXAxisFormatter(checks) {
- if (!checks || checks.length === 0) return (val) => val;
- const sorted = [...checks].sort((a, b) => new Date(a._id) - new Date(b._id));
- const first = new Date(sorted[0]._id);
- const last = new Date(sorted[sorted.length - 1]._id);
- const diffDays = (last - first) / (1000 * 60 * 60 * 24);
+ if (!checks || checks.length === 0) return (val) => val;
+ const sorted = [...checks].sort((a, b) => new Date(a._id) - new Date(b._id));
+ const first = new Date(sorted[0]._id);
+ const last = new Date(sorted[sorted.length - 1]._id);
+ const diffDays = (last - first) / (1000 * 60 * 60 * 24);
- return diffDays > 2
- ? (val) => new Date(val).toLocaleDateString(undefined, { month: "short", day: "numeric" })
- : (val) =>
- new Date(val).toLocaleTimeString(undefined, {
- hour: "2-digit",
- minute: "2-digit",
- hour12: false,
- });
+ return diffDays > 2
+ ? (val) =>
+ new Date(val).toLocaleDateString(undefined, { month: "short", day: "numeric" })
+ : (val) =>
+ new Date(val).toLocaleTimeString(undefined, {
+ hour: "2-digit",
+ minute: "2-digit",
+ hour12: false,
+ });
}