From e634dd81b1ff45102d65c6a58f26a1fdd7024e59 Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Thu, 4 Apr 2024 18:58:01 -0400 Subject: [PATCH] Take these out --- .../Admin/Nodes/NodeViewController.php | 21 ------------------- .../views/admin/nodes/view/index.blade.php | 12 +++++------ 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/app/Http/Controllers/Admin/Nodes/NodeViewController.php b/app/Http/Controllers/Admin/Nodes/NodeViewController.php index 608d74fdd..f7e72773f 100644 --- a/app/Http/Controllers/Admin/Nodes/NodeViewController.php +++ b/app/Http/Controllers/Admin/Nodes/NodeViewController.php @@ -39,29 +39,8 @@ class NodeViewController extends Controller ->where('node_id', '=', $node->id) ->first(); - $usageStats = Collection::make(['disk' => $stats->sum_disk, 'memory' => $stats->sum_memory]) - ->mapWithKeys(function ($value, $key) use ($node) { - $maxUsage = $node->{$key}; - if ($node->{$key . '_overallocate'} > 0) { - $maxUsage = $node->{$key} * (1 + ($node->{$key . '_overallocate'} / 100)); - } - - $percent = ($value / $maxUsage) * 100; - - return [ - $key => [ - 'value' => number_format($value), - 'max' => number_format($maxUsage), - 'percent' => $percent, - 'css' => ($percent <= self::THRESHOLD_PERCENTAGE_LOW) ? 'green' : (($percent > self::THRESHOLD_PERCENTAGE_MEDIUM) ? 'red' : 'yellow'), - ], - ]; - }) - ->toArray(); - return view('admin.nodes.view.index', [ 'node' => $node, - 'stats' => $usageStats, 'version' => $this->versionService, ]); } diff --git a/resources/views/admin/nodes/view/index.blade.php b/resources/views/admin/nodes/view/index.blade.php index 2d0bb3287..230b2f23a 100644 --- a/resources/views/admin/nodes/view/index.blade.php +++ b/resources/views/admin/nodes/view/index.blade.php @@ -103,25 +103,25 @@ @endif
-
+
Disk Space Allocated - {{ $stats['disk']['value'] }} / {{ $stats['disk']['max'] }} MiB + Disk Value / Disk Max MiB
-
+
-
+
Memory Allocated - {{ $stats['memory']['value'] }} / {{ $stats['memory']['max'] }} MiB + Memory Value / Memory Max MiB
-
+