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

fixed to honour the support of RAID controller parameters in the disk device names defined in the disk graph

This commit is contained in:
Jordi Sanfeliu 2013-04-29 12:48:07 +02:00
parent 61db45f21e
commit 7b716c772a
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changes
View File

@ -19,6 +19,8 @@
- Fixed in 'port' graph to show the minimum number of graphs between the value - Fixed in 'port' graph to show the minimum number of graphs between the value
of 'max' and the number of ports really defined. This fixes the error messages of 'max' and the number of ports really defined. This fixes the error messages
of uninitialized values in lines 410 and 411. of uninitialized values in lines 410 and 411.
- Fixed to honour the support of RAID controller parameters in the disk device
names defined in the disk graph.
3.1.0 - 15-Mar-2013 3.1.0 - 15-Mar-2013

28
lib/disk.pm
View File

@ -41,6 +41,7 @@ sub disk_init {
my $d = trim($dsk[$n]); my $d = trim($dsk[$n]);
$d =~ s/^\"//; $d =~ s/^\"//;
$d =~ s/\"$//; $d =~ s/\"$//;
$d =~ s/^(.+?) .*$/$1/;
next if -e $d; next if -e $d;
logger("ERROR: $myself: invalid or inexistent device name '$d'."); logger("ERROR: $myself: invalid or inexistent device name '$d'.");
return; return;
@ -360,7 +361,8 @@ sub disk_cgi {
push(@tmp, "COMMENT: \\n"); push(@tmp, "COMMENT: \\n");
for($n = 0; $n < 8; $n++) { for($n = 0; $n < 8; $n++) {
if($d[$n]) { if($d[$n]) {
my ($dstr) = (split /\s+/, trim($d[$n])); my $dstr = trim($d[$n]);
$dstr =~ s/^(.+?) .*$/$1/;
$str = sprintf("%-20s", $dstr); $str = sprintf("%-20s", $dstr);
push(@tmp, "LINE2:temp_" . $n . $LC[$n] . ":$str"); push(@tmp, "LINE2:temp_" . $n . $LC[$n] . ":$str");
push(@tmpz, "LINE2:temp_" . $n . $LC[$n] . ":$dstr"); push(@tmpz, "LINE2:temp_" . $n . $LC[$n] . ":$dstr");
@ -476,14 +478,18 @@ sub disk_cgi {
undef(@tmpz); undef(@tmpz);
for($n = 0; $n < 8; $n += 2) { for($n = 0; $n < 8; $n += 2) {
if($d[$n]) { if($d[$n]) {
$str = sprintf("%-17s", substr($d[$n], 0, 17)); my $dstr = trim($d[$n]);
$dstr =~ s/^(.+?) .*$/$1/;
$str = sprintf("%-17s", substr($dstr, 0, 17));
push(@tmp, "LINE2:rsc" . $n . $LC[$n] . ":$str"); push(@tmp, "LINE2:rsc" . $n . $LC[$n] . ":$str");
push(@tmpz, "LINE2:rsc" . $n . $LC[$n] . ":$d[$n]\\g"); push(@tmpz, "LINE2:rsc" . $n . $LC[$n] . ":$dstr\\g");
} }
if($d[$n + 1]) { if($d[$n + 1]) {
$str = sprintf("%-17s", substr($d[$n + 1], 0, 17)); my $dstr = trim($d[$n + 1]);
$dstr =~ s/^(.+?) .*$/$1/;
$str = sprintf("%-17s", substr($dstr, 0, 17));
push(@tmp, "LINE2:rsc" . ($n + 1) . $LC[$n + 1] . ":$str\\n"); push(@tmp, "LINE2:rsc" . ($n + 1) . $LC[$n + 1] . ":$str\\n");
push(@tmpz, "LINE2:rsc" . ($n + 1) . $LC[$n + 1] . ":$d[$n + 1]\\g"); push(@tmpz, "LINE2:rsc" . ($n + 1) . $LC[$n + 1] . ":$dstr\\g");
} }
} }
($width, $height) = split('x', $config->{graph_size}->{small}); ($width, $height) = split('x', $config->{graph_size}->{small});
@ -560,14 +566,18 @@ sub disk_cgi {
undef(@tmpz); undef(@tmpz);
for($n = 0; $n < 8; $n += 2) { for($n = 0; $n < 8; $n += 2) {
if($d[$n]) { if($d[$n]) {
$str = sprintf("%-17s", substr($d[$n], 0, 17)); my $dstr = trim($d[$n]);
$dstr =~ s/^(.+?) .*$/$1/;
$str = sprintf("%-17s", substr($dstr, 0, 17));
push(@tmp, "LINE2:cps" . $n . $LC[$n] . ":$str"); push(@tmp, "LINE2:cps" . $n . $LC[$n] . ":$str");
push(@tmpz, "LINE2:cps" . $n . $LC[$n] . ":$d[$n]\\g"); push(@tmpz, "LINE2:cps" . $n . $LC[$n] . ":$dstr\\g");
} }
if($d[$n + 1]) { if($d[$n + 1]) {
$str = sprintf("%-17s", substr($d[$n + 1], 0, 17)); my $dstr = trim($d[$n + 1]);
$dstr =~ s/^(.+?) .*$/$1/;
$str = sprintf("%-17s", substr($dstr, 0, 17));
push(@tmp, "LINE2:cps" . ($n + 1) . $LC[$n + 1] . ":$str\\n"); push(@tmp, "LINE2:cps" . ($n + 1) . $LC[$n + 1] . ":$str\\n");
push(@tmpz, "LINE2:cps" . ($n + 1) . $LC[$n + 1] . ":$d[$n + 1]\\g"); push(@tmpz, "LINE2:cps" . ($n + 1) . $LC[$n + 1] . ":$dstr\\g");
} }
} }
($width, $height) = split('x', $config->{graph_size}->{small}); ($width, $height) = split('x', $config->{graph_size}->{small});