From 798c82ba84da2cca41e309fc68dfcf039a84b76f Mon Sep 17 00:00:00 2001
From: Stephan de Wit <stephan.de.wit@deciso.com>
Date: Mon, 13 Jan 2025 11:27:32 +0100
Subject: [PATCH] system: define thresholds based on absolute space

---
 .../System/Status/DiskSpaceStatus.php         | 51 ++++++++++++++++---
 1 file changed, 45 insertions(+), 6 deletions(-)

diff --git a/src/opnsense/mvc/app/library/OPNsense/System/Status/DiskSpaceStatus.php b/src/opnsense/mvc/app/library/OPNsense/System/Status/DiskSpaceStatus.php
index 905d1370a..375618824 100644
--- a/src/opnsense/mvc/app/library/OPNsense/System/Status/DiskSpaceStatus.php
+++ b/src/opnsense/mvc/app/library/OPNsense/System/Status/DiskSpaceStatus.php
@@ -49,21 +49,32 @@ class DiskSpaceStatus extends AbstractStatus
 
         foreach ($output['storage-system-information']['filesystem'] as $filesystem) {
             if ($filesystem['mounted-on'] === '/') {
+                $used = $this->convertToGB($filesystem['used']);
+                $available = $this->convertToGB($filesystem['available']);
                 $usedPercent = intval($filesystem['used-percent']);
-                if ($usedPercent >= 90 && $usedPercent <= 95) {
+                $totalSpace = $used + $available;
+
+                $warningThresholdGB = min(10, 0.15 * $totalSpace);
+                $errorThresholdGB = min(5, 0.5 * $totalSpace);
+
+                if ($available <= $warningThresholdGB && $available > $errorThresholdGB) {
                     $this->internalStatus = SystemStatusCode::WARNING;
                     $this->internalMessage = sprintf(
                         gettext('Disk space on the root filesystem is nearly full (' .
-                                '%d%% used). Please consider cleaning up or expanding storage.'),
-                        $usedPercent
+                                '%.2fG or %d%% used, %.2fG available). Please consider cleaning up or expanding storage.'),
+                        $used,
+                        $usedPercent,
+                        $available
                     );
-                } elseif ($usedPercent > 95) {
+                } elseif ($available <= $errorThresholdGB) {
                     $this->internalPersistent = true;
                     $this->internalStatus = SystemStatusCode::ERROR;
                     $this->internalMessage = sprintf(
                         gettext('Disk space on the root filesystem is critically full (' .
-                                '%d%% used). Please consider cleaning up or expanding storage.'),
-                        $usedPercent
+                                '%.2fG or %d%% used, %.2fG available). Please consider cleaning up or expanding storage.'),
+                        $used,
+                        $usedPercent,
+                        $available
                     );
                 }
 
@@ -72,6 +83,34 @@ class DiskSpaceStatus extends AbstractStatus
         }
     }
 
+    private function convertToGB($value)
+    {
+        preg_match('/([0-9.]+)([a-zA-Z]+)/', $value, $matches);
+        if (count($matches) < 3) {
+            return floatval($value);
+        }
+
+        $number = floatval($matches[1]);
+        $unit = strtoupper($matches[2]);
+
+        switch ($unit) {
+            case 'B':
+                return $number / 1024 / 1024 / 1024;
+            case 'K':
+                return $number / 1024 / 1024;
+            case 'M':
+                return $number / 1024;
+            case 'T':
+                return $number * 1024;
+            case 'P':
+                return $number * 1024 * 1024;
+            case 'E':
+                return $number * 1024 * 1024 * 1024;
+            default:
+                return $number; // Default GB
+        }
+    }
+
     public function dismissStatus()
     {
         /* XXX not applicable */