mirrors
/
Monitorix
mirror of https://github.com/mikaku/Monitorix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed in 'zfs.pm' the way how is collected pool's data

This commit is contained in:
Jordi Sanfeliu 2018-03-19 12:30:29 +01:00
parent 10ad53ffbd
commit 593e1a7ea7
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changes
View File

@ -23,7 +23,7 @@
- Fixed to limit the length of the device names in 'fs.pm'. - Fixed to limit the length of the device names in 'fs.pm'.
- Fixed a missing gap colouring in some zoomed graphs of 'system.pm'. - Fixed a missing gap colouring in some zoomed graphs of 'system.pm'.
- Fixed to save missing values as 'unknown' in 'apcupsd.pm'. [#201] - Fixed to save missing values as 'unknown' in 'apcupsd.pm'. [#201]
- Fixed XSS vulnerability in CGI variables. [#203] - Fixed a XSS vulnerability in CGI variables. [#203]
(thanks to Sebastian Gilon from http://testarmy.com/, who pointed this out) (thanks to Sebastian Gilon from http://testarmy.com/, who pointed this out)
- Fixed to check if setgid() and setuid() functions were successful before - Fixed to check if setgid() and setuid() functions were successful before
starting the HTTP built-in. starting the HTTP built-in.
@ -32,6 +32,8 @@
(thanks to Sander Bos for pointing this out) (thanks to Sander Bos for pointing this out)
- Fixed to set permissions 0600 to log files. - Fixed to set permissions 0600 to log files.
(thanks to Sander Bos for pointing this out) (thanks to Sander Bos for pointing this out)
- Fixed in 'zfs.pm' the way how is collected pool's data.
(thanks to Derek Dongray, derek AT valedon.co.uk)
3.10.0 - 25-Sep-2017 3.10.0 - 25-Sep-2017

6
lib/zfs.pm
View File

@ -257,9 +257,9 @@ sub zfs_update {
if($pool) { if($pool) {
my @zpool; my @zpool;
$free = trim(`zfs get -rHp -o value available $pool`); $free = trim(`zfs get -Hp -o value available $pool`);
$udata = trim(`zfs get -rHp -o value used $pool`); $udata = trim(`zfs get -Hp -o value used $pool`);
$usnap = trim(`zfs get -rHp -o value usedbysnapshots $pool`); $usnap = eval join('+',`zfs get -rHp -o value usedbysnapshots -tfilesystem $pool`);
@zpool = split(' ', `zpool list -H $pool` || ""); @zpool = split(' ', `zpool list -H $pool` || "");
if(scalar(@zpool) == 10) { # ZFS version 0.6.4+ if(scalar(@zpool) == 10) { # ZFS version 0.6.4+