Add a setting for cpu amount so the threshold is based on overall

Notifiarr · Nov 23, 2023 · da4fbfd · da4fbfd
1 parent 5575324
commit da4fbfd
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -61,6 +61,7 @@ docker run \
   -l net.unraid.docker.icon='https://golift.io/crontabs.png' \
   -p '9999:80/tcp' \
   -v '/mnt/disk1/appdata/dockwatch/config':'/config':'rw' \
+  -v '/proc':'/proc':'rw' \
   -v '/var/run/docker.sock':'/var/run/docker.sock':'rw' 'ghcr.io/notifiarr/dockwatch:main'
 ```
 
@@ -81,6 +82,7 @@ dockwatch:
 	volumes:
 	  - /appdata/dockwatch/config:/config
 	  - /var/run/docker.sock:/var/run/docker.sock
+	  - /proc:/proc
 ```
 
 ### Manual
@@ -93,6 +95,7 @@ Volumes
 | Name | Host | Container |
 | ----- | ----- | ----- |
 | App Config | /mnt/disk1/appdata/dockwatch/config | /config |
+| Proc | /proc | /proc |
 | Docker sock | /var/run/docker.sock | /var/run/docker.sock |
 
 Ports

diff --git a/root/app/www/public/ajax/settings.php b/root/app/www/public/ajax/settings.php
@@ -11,6 +11,10 @@
 
 if ($_POST['m'] == 'init') {
     $globalSettings = $settings['global'];
+    $cpus = cpuTotal();
+    if ($cpus == 0) {
+        $cpus = '0 (Could not get cpu count from /proc/cpuinfo)';
+    }
     ?>
     <div class="container-fluid pt-4 px-4">
         <div class="bg-secondary rounded h-100 p-4">
@@ -98,6 +102,13 @@
                             </td>
                             <td>If a container usage is above this number, send a notification (if notification is enabled)</td>
                         </tr>
+                        <tr>
+                            <th scope="row">CPUs</th>
+                            <td>
+                                <input class="form-control" type="number" id="globalSetting-cpuAmount" value="<?= $globalSettings['cpuAmount'] ?>">
+                            </td>
+                            <td>Detected count: <?= $cpus ?></td>
+                        </tr>
                         <tr>
                             <th scope="row">Memory<sup>1</sup></th>
                             <td>

diff --git a/root/app/www/public/crons/state.php b/root/app/www/public/crons/state.php
@@ -90,7 +90,13 @@
     //-- CHECK FOR HIGH CPU USAGE CONTAINERS
     if ($settings['notifications']['triggers']['cpuHigh']['active'] && floatval($settings['global']['cpuThreshold']) > 0) {
         if ($currentState['stats']['CPUPerc']) {
-            $cpu = floatval(str_replace('%', '', $currentState['stats']['CPUPerc']));
+            $cpu        = floatval(str_replace('%', '', $currentState['stats']['CPUPerc']));
+            $cpuAmount  = intval($settings['global']['cpuAmount']);
+
+            if ($cpuAmount > 0) {
+                $cpu = number_format(($cpu / $cpuAmount), 2);
+            }
+
             if ($cpu > floatval($settings['global']['cpuThreshold'])) {
                 $notify['usage']['cpu'][] = ['container' => $currentState['Names'], 'usage' => $cpu];
             }

diff --git a/root/app/www/public/functions/common.php b/root/app/www/public/functions/common.php
@@ -154,4 +154,20 @@ function calculateDaysFromString($str)
     } elseif (strpos($str, 'm') !== false) { //-- [1-12]m
         return intval(str_replace('m', '', $str)) * 30;
     }
+}
+
+function cpuTotal()
+{
+    $cpus       = 0;
+    $cmd        = 'cat /proc/cpuinfo';
+    $cpuinfo    = shell_exec($cmd . ' 2>&1');
+    $lines      = explode("\n", $cpuinfo);
+
+    foreach ($lines as $line) {
+        if (strpos($line, 'processor') !== false) {
+            $cpus++;
+        }
+    }
+
+    return $cpus;
 }