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

Merge pull request #96 from bergware/master

Browse Source 
Ignore mover log entries in color coding
Fixed wrong reference to Display Settings in Main page
Fixed: missing creating of eth10 settings page
This commit is contained in:
Eric Schultz
2017-03-20 20:40:33 -05:00
committed by GitHub
parent 1ed382e74a 0e96cf9c01
commit 4f2d0ccdfd
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/dynamix/ArrayDevices.page
View File

@@ -87,13 +87,13 @@ if ($display['total']) echo "<tr class='tr_last'><td colspan='11'>&nbsp;</td></t
> includes the device model number, serial number, linux device id, and the device size.
>
> **Temp.** (temperature) is read directly from the device. You configure which units to use on
> the [Display Preferences](Settings/Display) page. We do not read the temperature of spun-down hard
> the [Display Preferences](Settings/DisplaySettings) page. We do not read the temperature of spun-down hard
> drives since this typically causes them to spin up; instead we display the `*` symbol. We also
> display the `*` symbol for SSD and Flash devices, though sometimes these devices do report a valid
> temperature, and sometimes they return the value `0`.
>
> **Size, Used, Free** reports the total device size, used space, and remaining space for files. These
> units are also configured on the [Display Preferences](Settings/Display) page. The
> units are also configured on the [Display Preferences](Settings/DisplaySettings) page. The
> amount of space used will be non-zero even for an empty disk due to file system overhead.
>
> *Note: for a multi-device cache pool, this data is for the entire pool as returned by btrfs.*
@@ -111,7 +111,7 @@ if ($display['total']) echo "<tr class='tr_last'><td colspan='11'>&nbsp;</td></t
> **View** column contains a folder icon indicating the device is *mounted*. Click the icon to
> browse the file system.
>
> If "Display array totals" is enable on the [Display Preferences](Settings/Display) page, a
> If "Display array totals" is enable on the [Display Preferences](Settings/DisplaySettings) page, a
> **Total** line is included which provides a tally of the device statistics, including the average temperature
> of your devices.
>

3
plugins/dynamix/Eth0.page
View File

@@ -21,8 +21,7 @@ $ini = '/var/local/emhttp/network.ini';
$validIP = '((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)';
// get available ethernet ports (excluding eth0)
exec("ip -br addr|grep -Po '^eth[1-9]+\s'",$ports);
$ports = array_map('trim', $ports);
exec("ip -br addr|awk '/^eth[0-9]+\s/{print $1}'|grep -v '^eth0$'",$ports);
// remove non-existing ethernet ports
foreach (glob("$docroot/webGui/Eth[1-9]*.page",GLOB_NOSORT) as $port) {

2
plugins/dynamix/include/ColorCoding.php
View File

@@ -14,7 +14,7 @@
// Color coding for syslog and disk log
$match =
[['class' => 'text',
'text' => ['to the standard error','non[ -]fatal error','correct gpt errors','error handler\b','(kernel|logger): [|+ #-.]','logger: (naming|log)','tainted: (host-cpu|high-privileges)']
'text' => ['to the standard error','non[ -]fatal error','correct gpt errors','error handler\b','(kernel|logger): [|+ #-.]','logger: (naming|log)','tainted: (host-cpu|high-privileges)','root: (>f|cd)\+\+\+\+','root: \.d\.\.t\.']
],
['class' => 'login',
'text' => ['(accepted|failed) password','sshd\[\d+\]:']