mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-07 01:59:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1341 from bergware/master

Browse Source 
Fixed regression error in disk critical / warning coloring & monitoring
This commit is contained in:
tom mortensen
2023-05-29 08:47:09 -07:00
committed by GitHub
parent 85440840f1 fd4dad2dae
commit 1dc8ae39d7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/dynamix/include/Helpers.php
View File

@@ -117,8 +117,8 @@ function my_usage() {
function usage_color(&$disk, $limit, $free) {
global $display;
if (_var($display,'text',0)==1 || intval(_var($display,'text',0)/10)==1) return '';
$critical = ($disk['critical'] ?? $display['critical'] ?? 0) ?: 0;
$warning = ($disk['warning'] ?? $display['warning'] ?? 0) ?: 0;
if (strlen($disk['critical'])) $critical = $disk['critical']; elseif (strlen($display['critical'])) $critical = $display['critical']; else $critical = 0;
if (strlen($disk['warning'])) $warning = $disk['warning']; elseif (strlen($display['warning'])) $warning = $display['warning']; else $warning = 0;
if (!$free) {
if ($critical>0 && $limit>=$critical) return 'redbar';
if ($warning>0 && $limit>=$warning) return 'orangebar';

8
plugins/dynamix/scripts/monitor
View File

@@ -46,8 +46,8 @@ function check_temp(&$disk,$text,$info) {
global $notify,$saved,$server,$display,$top;
$name = _var($disk,'name');
$temp = _var($disk,'temp','*');
$max = ($disk['maxTemp'] ?? $display['max'] ?? 0) ?: 0;
$hot = ($disk['hotTemp'] ?? $display['hot'] ?? 0) ?: 0;
if (strlen($disk['maxTemp'])) $max = $disk['maxTemp']; elseif (strlen($display['max'])) $max = $display['max']; else $max = 0;
if (strlen($disk['hotTemp'])) $hot = $disk['hotTemp']; elseif (strlen($display['hot'])) $hot = $display['hot']; else $hot = 0;
$warn = exceed($temp,$max,$top) ? 'alert' : (exceed($temp,$hot,$top) ? 'warning' : false);
$item = 'temp';
$last = $saved[$item][$name] ?? 0;
@@ -123,8 +123,8 @@ function check_usage(&$disk,$used,$text,$info) {
global $notify,$saved,$server,$display;
if ($used == -1) return;
$name = _var($disk,'name');
$critical = ($disk['critical'] ?? $display['critical'] ?? 0) ?: 0;
$warning = ($disk['warning'] ?? $display['warning'] ?? 0) ?: 0;
if (strlen($disk['critical'])) $critical = $disk['critical']; elseif (strlen($display['critical'])) $critical = $display['critical']; else $critical = 0;
if (strlen($disk['warning'])) $warning = $disk['warning']; elseif (strlen($display['warning'])) $warning = $display['warning']; else $warning = 0;
$warn = exceed($used,$critical) ? 'alert' : (exceed($used,$warning) ? 'warning' : false);
$item = 'used';
$last = $saved[$item][$name] ?? 0;