mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-02-27 04:41:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1343 from bergware/master

Browse Source 
Fixed disk utilization and temp thresholds
This commit is contained in:
tom mortensen
2023-05-31 07:37:35 -07:00
committed by GitHub
parent d6853fb3fb e473a4c52e
commit 6535bb793d
3 changed files with 10 additions and 10 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 = (isset($disk['critical']) && strlen($disk['critical'])) ? $disk['critical'] : ((isset($display['critical']) && strlen($display['critical'])) ? $display['critical'] : 0);
$warning = (isset($disk['warning']) && strlen($disk['warning'])) ? $disk['warning'] : ((isset($display['warning']) && strlen($display['warning'])) ? $display['warning'] : 0);
$critical = _var($disk,'critical') ? $disk['critical'] : (_var($display,'critical') ? $display['critical'] : 0);
$warning = _var($disk,'warning') ? $disk['warning'] : (_var($display,'warning') ? $display['warning'] : 0);
if (!$free) {
if ($critical>0 && $limit>=$critical) return 'redbar';
if ($warning>0 && $limit>=$warning) return 'orangebar';

8
plugins/dynamix/nchan/update_2
View File

@@ -159,8 +159,8 @@ function device_temp(&$disk, &$red, &$orange) {
global $display;
$spin = strpos(_var($disk,'color'),'blink')===false;
$temp = _var($disk,'temp','*');
$max = ($disk['maxTemp'] ?? $display['max'] ?? 0) ?: 0;
$hot = ($disk['hotTemp'] ?? $display['hot'] ?? 0) ?: 0;
$max = _var($disk,'maxTemp') ? $disk['maxTemp'] : (_var($display,'max') ? $display['max'] : 0);
$hot = _var($disk,'hotTemp') ? $disk['hotTemp'] : (_var($display,'hot') ? $display['hot'] : 0);
$top = $display['top'] ?? 120;
$heat = false; $color = 'green';
if (exceed($temp,$max,$top)) {
@@ -208,8 +208,8 @@ function device_usage(&$disk, &$full, &$high) {
if ($used) {
if ($text==2 || $text==21) {
$load = substr($used,0,-1);
$critical = ($disk['critical'] ?? $display['critical'] ?? 0) ?: 0;
$warning = ($disk['warning'] ?? $display['warning'] ?? 0) ?: 0;
$critical = _var($disk,'critical') ? $disk['critical'] : (_var($display,'critical') ? $display['critical'] : 0);
$warning = _var($disk,'warning') ? $disk['warning'] : (_var($display,'warning') ? $display['warning'] : 0);
if ($critical>0 && $load>=$critical) {$class = 'redbar'; $full++;}
elseif ($warning>0 && $load>=$warning) {$class = 'orangebar'; $high++;}
else $class = 'greenbar';

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 = (isset($disk['maxTemp']) && strlen($disk['maxTemp'])) ? $disk['maxTemp'] : ((isset($display['max']) && strlen($display['max'])) ? $display['max'] : 0);
$hot = (isset($disk['hotTemp']) && strlen($disk['hotTemp'])) ? $disk['hotTemp'] : ((isset($display['hot']) && strlen($display['hot'])) ? $display['hot'] : 0);
$max = _var($disk,'maxTemp') ? $disk['maxTemp'] : (_var($display,'max') ? $display['max'] : 0);
$hot = _var($disk,'hotTemp') ? $disk['hotTemp'] : (_var($display,'hot') ? $display['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 = (isset($disk['critical']) && strlen($disk['critical'])) ? $disk['critical'] : ((isset($display['critical']) && strlen($display['critical'])) ? $display['critical'] : 0);
$warning = (isset($disk['warning']) && strlen($disk['warning'])) ? $disk['warning'] : ((isset($display['warning']) && strlen($display['warning'])) ? $display['warning'] : 0);
$critical = _var($disk,'critical') ? $disk['critical'] : (_var($display,'critical') ? $display['critical'] : 0);
$warning = _var($disk,'warning') ? $disk['warning'] : (_var($display,'warning') ? $display['warning'] : 0);
$warn = exceed($used,$critical) ? 'alert' : (exceed($used,$warning) ? 'warning' : false);
$item = 'used';
$last = $saved[$item][$name] ?? 0;