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

small fixes

This commit is contained in:
Jordi Sanfeliu 2018-03-06 09:57:50 +01:00
parent a812931056
commit 31b1752ff8
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/disk.pm
View File

@ -160,12 +160,12 @@ sub disk_init {
} }
# check dependencies # check dependencies
if(lc($disk->{alerts}->{realloc_enabled}) eq "y") { if(lc($disk->{alerts}->{realloc_enabled} || "") eq "y") {
if(! -x $disk->{alerts}->{realloc_script}) { if(! -x $disk->{alerts}->{realloc_script}) {
logger("$myself: ERROR: script '$disk->{alerts}->{realloc_script}' doesn't exist or don't has execution permissions."); logger("$myself: ERROR: script '$disk->{alerts}->{realloc_script}' doesn't exist or don't has execution permissions.");
} }
} }
if(lc($disk->{alerts}->{pendsect_enabled}) eq "y") { if(lc($disk->{alerts}->{pendsect_enabled} || "") eq "y") {
if(! -x $disk->{alerts}->{pendsect_script}) { if(! -x $disk->{alerts}->{pendsect_script}) {
logger("$myself: ERROR: script '$disk->{alerts}->{pendsect_script}' doesn't exist or don't has execution permissions."); logger("$myself: ERROR: script '$disk->{alerts}->{pendsect_script}' doesn't exist or don't has execution permissions.");
} }

2
lib/system.pm
View File

@ -122,7 +122,7 @@ sub system_init {
} }
# check dependencies # check dependencies
if(lc($system->{alerts}->{loadavg_enabled}) eq "y") { if(lc($system->{alerts}->{loadavg_enabled} | "") eq "y") {
if(! -x $system->{alerts}->{loadavg_script}) { if(! -x $system->{alerts}->{loadavg_script}) {
logger("$myself: ERROR: script '$system->{alerts}->{loadavg_script}' doesn't exist or don't has execution permissions."); logger("$myself: ERROR: script '$system->{alerts}->{loadavg_script}' doesn't exist or don't has execution permissions.");
} }

12
monitorix
View File

@ -147,7 +147,7 @@ sub create_index {
} }
# Piwik tracking code # Piwik tracking code
if(lc($config{piwik_tracking}->{enabled}) eq "y") { if(lc($config{piwik_tracking}->{enabled} || "") eq "y") {
$piwik_url = $config{piwik_tracking}->{url} || ""; $piwik_url = $config{piwik_tracking}->{url} || "";
$piwik_sid = $config{piwik_tracking}->{sid} || ""; $piwik_sid = $config{piwik_tracking}->{sid} || "";
$piwik_img = $config{piwik_tracking}->{img} || ""; $piwik_img = $config{piwik_tracking}->{img} || "";
@ -230,7 +230,7 @@ EOF
print(OUT " <option value='localhost'>localhost</option>\n"); print(OUT " <option value='localhost'>localhost</option>\n");
print(OUT " </optgroup>\n"); print(OUT " </optgroup>\n");
if(scalar(my @remotehost_list = split(',', $config{multihost}->{remotehost_list})) && lc($config{multihost}->{enabled}) eq "y") { if(scalar(my @remotehost_list = split(',', $config{multihost}->{remotehost_list})) && lc($config{multihost}->{enabled} || "") eq "y") {
print(OUT " <optgroup label='Multihost'>\n"); print(OUT " <optgroup label='Multihost'>\n");
print(OUT " <option value='multihost.all'>All</option>\n"); print(OUT " <option value='multihost.all'>All</option>\n");
for($n = 0; $n < scalar(@remotehost_list); $n++) { for($n = 0; $n < scalar(@remotehost_list); $n++) {
@ -249,7 +249,7 @@ EOF
} }
} }
if(scalar(my @tal = split(',', $config{traffacct}->{list})) && lc($config{traffacct}->{enabled}) eq "y") { if(scalar(my @tal = split(',', $config{traffacct}->{list})) && lc($config{traffacct}->{enabled} || "") eq "y") {
print(OUT " <optgroup label='Traffic Accounting'>\n"); print(OUT " <optgroup label='Traffic Accounting'>\n");
print(OUT " <option value='traffacct.all'>All</option>\n"); print(OUT " <option value='traffacct.all'>All</option>\n");
for($n = 0; $n < scalar(@tal); $n++) { for($n = 0; $n < scalar(@tal); $n++) {
@ -616,7 +616,7 @@ logger("Initializing graphs.");
# check for inconsistencies between enabled graphs and defined graphs # check for inconsistencies between enabled graphs and defined graphs
foreach my $g (sort keys %{$config{graph_enable}}) { foreach my $g (sort keys %{$config{graph_enable}}) {
if(lc($config{graph_enable}->{$g}) eq "y") { if(lc($config{graph_enable}->{$g} || "") eq "y") {
if(!grep {trim($_) eq $g} (split(',', $config{graph_name}))) { if(!grep {trim($_) eq $g} (split(',', $config{graph_name}))) {
logger("WARNING: inconsitency between '<graph_enable>' and 'graph_name' options; '$g' doesn't exist."); logger("WARNING: inconsitency between '<graph_enable>' and 'graph_name' options; '$g' doesn't exist.");
} }
@ -629,9 +629,9 @@ foreach (split(',', $config{graph_name} . ", traffacct")) {
my $e = "n"; my $e = "n";
if($g eq "traffacct") { if($g eq "traffacct") {
$e = lc($config{$g}->{enabled}); $e = lc($config{$g}->{enabled} || "");
} else { } else {
$e = lc($config{graph_enable}->{$g}); $e = lc($config{graph_enable}->{$g} || "");
} }
if($e eq "y") { if($e eq "y") {