From c44751e82bb96d3631bf8ab31ff8670da28102e4 Mon Sep 17 00:00:00 2001
From: mbecker20 <becker.maxh@gmail.com>
Date: Thu, 12 May 2022 12:44:44 -0400
Subject: [PATCH] better docker stats

---
 frontend/src/components/server/tabs/Stats.tsx | 27 +++++++++++++------
 frontend/src/util/query.ts                    |  7 +++--
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/server/tabs/Stats.tsx b/frontend/src/components/server/tabs/Stats.tsx
index 838510729..571df848a 100644
--- a/frontend/src/components/server/tabs/Stats.tsx
+++ b/frontend/src/components/server/tabs/Stats.tsx
@@ -1,5 +1,5 @@
-import { CommandLogError, SystemStats } from "@monitor/types";
-import { Component, createEffect, createSignal, Show } from "solid-js";
+import { CommandLogError, DockerStat, SystemStats } from "@monitor/types";
+import { Component, createEffect, createSignal, For, Show } from "solid-js";
 import { pushNotification } from "../../..";
 import { useAppState } from "../../../state/StateProvider";
 import { useTheme } from "../../../state/ThemeProvider";
@@ -14,11 +14,11 @@ import s from "./stats.module.scss";
 
 const Stats: Component<{}> = (p) => {
   const { selected } = useAppState();
-  const [log, setLog] = createSignal<CommandLogError>();
+  const [stats, setStats] = createSignal<DockerStat[]>();
   const [refreshing, setRefreshing] = createSignal(false);
   const load = () => {
     if (selected.id()) {
-      getServerStats(selected.id()).then(setLog);
+      getServerStats(selected.id()).then(setStats);
     }
   };
   createEffect(load);
@@ -69,15 +69,15 @@ const Stats: Component<{}> = (p) => {
           </Button>
         </Flex>
       </Show>
-      <Show when={log()} fallback={<Loading type="three-dot" scale={0.8} />}>
+      <Show when={stats()} fallback={<Loading type="three-dot" scale={0.8} />}>
         <Grid class={combineClasses(s.StatsContainer, themeClass())}>
           <Button
             class="blue"
             style={{ "justify-self": "end" }}
             onClick={async () => {
               setRefreshing(true);
-              const log = await getServerStats(selected.id());
-              setLog(log);
+              const stats = await getServerStats(selected.id());
+              setStats(stats);
               setRefreshing(false);
               pushNotification("good", "stats refreshed");
             }}
@@ -86,7 +86,18 @@ const Stats: Component<{}> = (p) => {
               <Icon type="refresh" />
             </Show>
           </Button>
-          <pre class={s.Stats}>{log()!.log.stdout}</pre>
+          <For each={stats()}>
+            {(stat) => (
+              <Flex alignItems="center">
+                <div>{stat.Name}</div>
+                <div>cpu: {stat.CPUPerc}</div>
+                <div>
+                  mem: {stat.MemPerc} ({stat.MemUsage})
+                </div>
+              </Flex>
+            )}
+          </For>
+          {/* <pre class={s.Stats}>{log()!.log.stdout}</pre> */}
         </Grid>
       </Show>
     </Grid>
diff --git a/frontend/src/util/query.ts b/frontend/src/util/query.ts
index b0045fbf1..ec4c59212 100644
--- a/frontend/src/util/query.ts
+++ b/frontend/src/util/query.ts
@@ -7,6 +7,7 @@ import {
   DeployActionState,
   Deployment,
   Deployments,
+  DockerStat,
   Log,
   Network,
   Server,
@@ -75,7 +76,9 @@ export async function downloadDeploymentLog(
   const date = new Date();
   fileDownload(
     (error ? log.stderr : log.stdout) || "no log",
-    `${name}-${error ? "error-" : ""}log-${date.toLocaleDateString().replaceAll("/", "-")}.txt`
+    `${name}-${error ? "error-" : ""}log-${date
+      .toLocaleDateString()
+      .replaceAll("/", "-")}.txt`
   );
 }
 
@@ -114,7 +117,7 @@ export async function getServer(id: string) {
 }
 
 export async function getServerStats(id: string) {
-  return await client.get<CommandLogError>(`/api/server/${id}/stats`);
+  return await client.get<DockerStat[]>(`/api/server/${id}/stats`);
 }
 
 export async function getServerSystemStats(id: string) {