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

Fixed to get the correct graph of the right group number in the 'fs' graph when using 'silent=imagetag' option [#16]

This commit is contained in:
Jordi Sanfeliu 2013-05-10 12:04:38 +02:00
parent 47552c082d
commit 6975fb71ed
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/fs.pm
View File

@ -614,7 +614,7 @@ sub fs_cgi {
}
}
$e = 0;
$e = $e2 = 0;
foreach my $k (sort keys %{$fs->{list}}) {
my @f = split(',', $fs->{list}->{$k});
@ -725,7 +725,7 @@ sub fs_cgi {
$err = RRDs::error;
print("ERROR: while graphing $PNG_DIR" . "$PNGz[$e * 3]: $err\n") if $err;
}
$e2 = $e + 1;
$e2 = $e . "1";
if($title || ($silent =~ /imagetag/ && $graph =~ /fs$e2/)) {
if(lc($config->{enable_zoom}) eq "y") {
if(lc($config->{disable_javascript_void}) eq "y") {
@ -847,7 +847,7 @@ sub fs_cgi {
$err = RRDs::error;
print("ERROR: while graphing $PNG_DIR" . "$PNGz[$e * 3 + 1]: $err\n") if $err;
}
$e2 = $e + 2;
$e2 = $e . "2";
if($title || ($silent =~ /imagetag/ && $graph =~ /fs$e2/)) {
if(lc($config->{enable_zoom}) eq "y") {
if(lc($config->{disable_javascript_void}) eq "y") {
@ -1014,7 +1014,7 @@ sub fs_cgi {
$err = RRDs::error;
print("ERROR: while graphing $PNG_DIR" . "$PNGz[$e * 3 + 2]: $err\n") if $err;
}
$e2 = $e + 3;
$e2 = $e . "3";
if($title || ($silent =~ /imagetag/ && $graph =~ /fs$e2/)) {
if(lc($config->{enable_zoom}) eq "y") {
if(lc($config->{disable_javascript_void}) eq "y") {

17
monitorix
View File

@ -47,8 +47,8 @@ $SIG{'CHLD'} = 'CHLD_handler';
$SIG{'HUP' } = 'HUP_handler';
$SIG{'ALRM'} = 'ALRM_handler';
use constant VERSION => "3.1.93";
use constant RELDATE => "09-May-2013";
use constant VERSION => "3.1.94";
use constant RELDATE => "10-May-2013";
my @suppsys = ("Linux", "FreeBSD", "OpenBSD", "NetBSD");
our %config;
@ -286,6 +286,19 @@ EOF
}
next;
}
if($g eq "fs") {
$n = 0;
foreach my $k (sort keys %{$config{graphs}}) {
if($k =~ m/$g/) {
$gname = "_" . $g . ++$n;
my $gname2 = "_" . $g . "0" . $n;
if($config{graphs}->{$gname}) {
print(OUT " <option value='" . $gname2 ."'>" . $config{graphs}->{$gname} . "</option>\n");
}
}
}
next;
}
if($g eq "net") {
my $n2;
for($n = 0; $n < scalar(my @nl = split(',', $config{net}->{list})); $n++) {