Merge pull request #1156 from SebastianOsinski/improve_docker_memory_stats

Display Docker container's used memory instead of total memory

.devcontainer/devcontainer.json

@@ -3,7 +3,7 @@
 	"build": {
 		"dockerfile": "Dockerfile",
 		"args": {
-			"VARIANT": "18-buster"
+			"VARIANT": "18-bullseye"
 		}
 	},
 	"customizations": {

.gitignore

@@ -4,6 +4,7 @@
 /node_modules
 /.pnp
 .pnp.js
+.pnpm-store
 
 # testing
 /coverage

src/widgets/docker/component.jsx

@@ -1,7 +1,7 @@
 import useSWR from "swr";
 import { useTranslation } from "next-i18next";
 
-import calculateCPUPercent from "./stats-helpers";
+import { calculateCPUPercent, calculateUsedMemory } from "./stats-helpers";
 
 import Container from "components/services/widget/container";
 import Block from "components/services/widget/block";
@@ -47,7 +47,7 @@ export default function Component({ service }) {
     <Container service={service}>
       <Block label="docker.cpu" value={t("common.percent", { value: calculateCPUPercent(statsData.stats) })} />
       {statsData.stats.memory_stats.usage && 
-        <Block label="docker.mem" value={t("common.bytes", { value: statsData.stats.memory_stats.usage })} />
+        <Block label="docker.mem" value={t("common.bytes", { value: calculateUsedMemory(statsData.stats) })} />
       }
       {network && (
         <>

src/widgets/docker/stats-helpers.js

@@ -1,4 +1,4 @@
-export default function calculateCPUPercent(stats) {
+export function calculateCPUPercent(stats) {
   let cpuPercent = 0.0;
   const cpuDelta = stats.cpu_stats.cpu_usage.total_usage - stats.precpu_stats.cpu_usage.total_usage;
   const systemDelta = stats.cpu_stats.system_cpu_usage - stats.precpu_stats.system_cpu_usage;
@@ -9,3 +9,7 @@ export default function calculateCPUPercent(stats) {
 
   return Math.round(cpuPercent * 10) / 10;
 }
+
+export function calculateUsedMemory(stats) {
+  return stats.memory_stats.usage - (stats.memory_stats.stats.cache ?? 0)
+}