From 78d88ba0c0b3bc9ff3b73494e0e8489fef68fef3 Mon Sep 17 00:00:00 2001
From: "andreas.dinauer" <andreas.j.dinauer@gmail.com>
Date: Sun, 16 Nov 2025 14:03:15 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=BD=EF=B8=8F=20Move=20to=20new=20node?=
 =?UTF-8?q?=20data=20model?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/{ => node}/Node.ts                    | 15 ++++++++++++---
 components/NodeComponent.vue                  |  8 ++++----
 components/inspect/resources/NodeList.vue     |  2 +-
 components/monitorings/MonitoredResource.ts   |  2 +-
 components/monitorings/NodeMonitoringPage.vue |  2 +-
 5 files changed, 19 insertions(+), 10 deletions(-)
 rename classes/{ => node}/Node.ts (50%)

diff --git a/classes/Node.ts b/classes/node/Node.ts
similarity index 50%
rename from classes/Node.ts
rename to classes/node/Node.ts
index fe1e118..cbadb34 100644
--- a/classes/Node.ts
+++ b/classes/node/Node.ts
@@ -1,16 +1,25 @@
-import type { Metadata } from "./Metadata";
-import type { HasMetadata } from "./repo/ResourceRepo";
+import { Metadata } from "../Metadata";
+import { type HasMetadata } from "../repo/ResourceRepo";
 
 export class Node implements HasMetadata
 {
     constructor (
         public metadata: Metadata,
-        public runningPods: number,
+        public metrics: NodeMetrics,
         public status: Status
     ) { }
+}
 
+class NodeMetrics
+{
+    absoluteCpuUsage?: number;
     relativeCpuUsage?: number;
+    absoluteMemory?: number;
     relativeMemory?: number;
+    runningPods?: number;
+    relativeDiskUsage?: number;
+    totalDiskSpace?: number;
+
 }
 
 class Status
diff --git a/components/NodeComponent.vue b/components/NodeComponent.vue
index 1debfcf..ba8052d 100644
--- a/components/NodeComponent.vue
+++ b/components/NodeComponent.vue
@@ -4,21 +4,21 @@
         <div class="grid-element">
             <p>{{ calcAge(nodeStats.metadata?.creationTimestamp) }}</p>
         </div>
-        <p class="grid-element">{{ nodeStats.runningPods }}</p>
+        <p class="grid-element">{{ nodeStats.metrics.runningPods }}</p>
         <div class="grid-element">
             <NodeReadyComponent :ready="isReady(nodeStats)"></NodeReadyComponent>
         </div>
         <div class="grid-element">
-            <p class="usage" :class="cpuUsageFlag(nodeStats.relativeCpuUsage)">{{ nodeStats.relativeCpuUsage }}%</p>
+            <p class="usage" :class="cpuUsageFlag(nodeStats.metrics.relativeCpuUsage)">{{ nodeStats.metrics.relativeCpuUsage }}%</p>
         </div>
         <div class="grid-element">
-            <p class="usage" :class="ramUsageFlag(nodeStats.relativeMemory)">{{ nodeStats.relativeMemory }}%</p>
+            <p class="usage" :class="ramUsageFlag(nodeStats.metrics.relativeMemory)">{{ nodeStats.metrics.relativeMemory }}%</p>
         </div>
     </div>
 </template>
 
 <script setup lang="ts">
-import type { Node } from '~/classes/Node';
+import type { Node } from '~/classes/node/Node';
 import NodeReadyComponent from './NodeReadyComponent.vue';
 import { calcAge } from '~/classes/Pod';
 
diff --git a/components/inspect/resources/NodeList.vue b/components/inspect/resources/NodeList.vue
index d3a109b..ea32798 100644
--- a/components/inspect/resources/NodeList.vue
+++ b/components/inspect/resources/NodeList.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script setup lang="ts">
-import type { Node } from '~/classes/Node';
+import type { Node } from '~/classes/node/Node';
 import { ResourceRepo } from '~/classes/repo/ResourceRepo';
 import NodeComponent from '~/components/NodeComponent.vue';
 
diff --git a/components/monitorings/MonitoredResource.ts b/components/monitorings/MonitoredResource.ts
index 02c3e9b..5f9c8a9 100644
--- a/components/monitorings/MonitoredResource.ts
+++ b/components/monitorings/MonitoredResource.ts
@@ -1,5 +1,5 @@
 import axios from "axios";
-import type { Node } from "~/classes/Node";
+import type { Node } from "~/classes/node/Node";
 import type { Pod } from "~/classes/Pod";
 import { Data } from "../chart/Dataset";
 import dayjs from "dayjs";
diff --git a/components/monitorings/NodeMonitoringPage.vue b/components/monitorings/NodeMonitoringPage.vue
index e87233a..9d876b3 100644
--- a/components/monitorings/NodeMonitoringPage.vue
+++ b/components/monitorings/NodeMonitoringPage.vue
@@ -40,7 +40,7 @@
 </template>
 
 <script setup lang="ts">
-import type { Node } from '~/classes/Node';
+import type { Node } from '~/classes/node/Node';
 import { MonitoredResource } from './MonitoredResource';
 import { Dataset } from '../chart/Dataset';
 import { VOLUME_CHART_CONFIG } from './volumes/ChartConfig';