From 526f5efb78cabb8c9c7d25c3bba2bc78e8b9ee20 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Thu, 3 Jul 2025 18:43:42 +0200 Subject: [PATCH] metrics: fix nano to msecs conversion --- src/metrics.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/metrics.js b/src/metrics.js index e95bc081c..d0ac3b87a 100644 --- a/src/metrics.js +++ b/src/metrics.js @@ -41,7 +41,7 @@ async function readContainerMetric(name) { const blockRead = blkioStats.filter(entry => entry.op === 'read').reduce((sum, entry) => sum + entry.value, 0); const blockWrite = blkioStats.filter(entry => entry.op === 'write').reduce((sum, entry) => sum + entry.value, 0); - const cpuUsageMsecs = stats.cpu_stats.cpu_usage.total_usage / 1000; // convert to msecs (to match system metrics) + const cpuUsageMsecs = stats.cpu_stats.cpu_usage.total_usage / 1e6; // convert from nano to msecs (to match system metrics) return { networkRead, networkWrite, blockRead, blockWrite, memoryUsed, memoryMax, cpuUsageMsecs }; } @@ -389,7 +389,7 @@ async function getSystemStream(options) { const [error, metrics] = await safe(readSystemMetrics()); if (error) return metricsStream.destroy(error); - const cpuPercent = oldMetrics ? (metrics.userMsecs + metrics.sysMsecs - oldMetrics.userMsecs - oldMetrics.sysMsecs) * 0.1 / (intervalMsecs/1000) : null; + const cpuPercent = oldMetrics ? (metrics.userMsecs + metrics.sysMsecs - oldMetrics.userMsecs - oldMetrics.sysMsecs) * 100 / intervalMsecs : null; const blockReadRate = oldMetrics ? (metrics.blockRead - oldMetrics.blockRead) / (intervalMsecs/1000) : null; const blockWriteRate = oldMetrics ? (metrics.blockWrite - oldMetrics.blockWrite) / (intervalMsecs/1000) : null; const networkReadRate = oldMetrics ? (metrics.networkRead - oldMetrics.networkRead) / (intervalMsecs/1000) : null;