Merge pull request #446 from dappnode/stats-parser

Review stats parser

Author: dapplion

packages/admin-ui/src/common/types.ts

@@ -1062,7 +1062,7 @@ export interface HostStatMemory {
   total: number;
   used: number;
   free: number;
-  freePercentage: number;
+  usedPercentage: number;
 }
 
 /**
@@ -1073,7 +1073,6 @@ export interface HostStatDisk {
   used: number;
   free: number;
   usedPercentage: number;
-  freePercentage: number;
 }
 
 /**

packages/admin-ui/src/pages/dashboard/components/HostStats.tsx

@@ -79,7 +79,7 @@ export function HostStats() {
       <StatsCardContainer title={"memory"}>
         {memoryStats.data ? (
           <StatsCardOk
-            percent={memoryStats.data.freePercentage}
+            percent={memoryStats.data.usedPercentage}
             text={
               humanFileSize(memoryStats.data.used) +
               " / " +

packages/dappmanager/src/utils/parseDiskStats.ts

@@ -7,13 +7,10 @@ import osu from "node-os-utils";
  * @param disk string with disk usage info
  */
 export function parseDiskStats(stats: osu.DriveInfo): HostStatDisk {
-  const diskStats = Object.values(stats).map(item => toBytes(item, "gb"));
-
   return {
-    total: diskStats[0],
-    used: diskStats[1],
-    free: diskStats[2],
-    usedPercentage: stats.usedPercentage,
-    freePercentage: stats.freePercentage
+    total: toBytes(stats.totalGb, "gb"),
+    used: toBytes(stats.usedGb, "gb"),
+    free: toBytes(stats.freeGb, "gb"),
+    usedPercentage: stats.usedPercentage
   };
 }

packages/dappmanager/src/utils/parseMemoryStats.ts

@@ -7,12 +7,10 @@ import osu from "node-os-utils";
  * @param mem string with memory usage info
  */
 export function parseMemoryStats(stats: osu.MemInfo): HostStatMemory {
-  const memoryStats = Object.values(stats).map(item => toBytes(item, "mb"));
-
   return {
-    total: memoryStats[0],
-    used: memoryStats[1],
-    free: memoryStats[2],
-    freePercentage: stats.freeMemPercentage
+    total: toBytes(stats.totalMemMb, "mb"),
+    used: toBytes(stats.usedMemMb, "mb"),
+    free: toBytes(stats.freeMemMb, "mb"),
+    usedPercentage: 100 - stats.freeMemPercentage
   };
 }

packages/dappmanager/test/utils/parseDiskStats.test.ts

@@ -13,13 +13,14 @@ describe("Util: parseDiskStats", async function() {
       freePercentage: 91.3
     };
 
-    const diskStats = parseDiskStats(dfOutput);
-    expect(diskStats).to.deep.equal({
+    const expectedResult: ReturnType<typeof parseDiskStats> = {
       total: 1006525585818,
       used: 35970351104,
       free: 919337749709,
-      usedPercentage: 3.6,
-      freePercentage: 91.3
-    });
+      usedPercentage: 3.6
+    };
+
+    const diskStats = parseDiskStats(dfOutput);
+    expect(diskStats).to.deep.equal(expectedResult);
   });
 });

packages/dappmanager/test/utils/parseMemoryStats.test.ts

@@ -12,12 +12,14 @@ describe("Util: parseMemoryStats", async function() {
       freeMemPercentage: 66.3
     };
 
-    const memoryStats = parseMemoryStats(freeOutput);
-    expect(memoryStats).to.deep.equal({
+    const expectedResult: ReturnType<typeof parseMemoryStats> = {
       total: 16535026401,
       used: 5571514204,
       free: 10963512197,
-      freePercentage: 66.3
-    });
+      usedPercentage: 33.7
+    };
+
+    const memoryStats = parseMemoryStats(freeOutput);
+    expect(memoryStats).to.deep.equal(expectedResult);
   });
 });