mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

many small fixes, hacky way to ignore no more variables, fix up supermicro sensor limits, loosen automatic sensor limit settings a bit

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1675 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2010-08-13 13:17:53 +00:00
parent 61412a70f1
commit a1bf48e63e
9 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
html/includes/graphs/device/mempools.inc.php
View File

@@ -8,12 +8,12 @@ include("includes/graphs/common.inc.php");
$rrd_options .= " -u 100 -l 0 -E -b 1024 ";
$iter = "1"; $i=1;
$rrd_options .= " COMMENT:' Cur Max\\n'";
$rrd_options .= " COMMENT:' Min Cur Max\\n'";
while($mempool = mysql_fetch_array($query)) {
if($iter=="1") {$colour="CC0000";} elseif($iter=="2") {$colour="008C00";} elseif($iter=="3") {$colour="4096EE";
} elseif($iter=="4") {$colour="73880A";} elseif($iter=="5") {$colour="D01F3C";} elseif($iter=="6") {$colour="36393D";
} elseif($iter=="7") {$colour="FF0084"; unset($iter); }
$descr = substr(str_pad(short_hrDeviceDescr($mempool['mempool_descr']), 28),0,28);
$descr = substr(str_pad(short_hrDeviceDescr($mempool['mempool_descr']), 22),0,22);
$descr = str_replace(":", "\:", $descr);
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("mempool-".$mempool['mempool_type']."-".$mempool['mempool_index'].".rrd");
if(is_file($rrd_filename))
@@ -22,8 +22,9 @@ while($mempool = mysql_fetch_array($query)) {
$rrd_options .= " DEF:mempoolused$i=$rrd_filename:used:AVERAGE ";
$rrd_options .= " CDEF:mempooltotal$i=mempoolused$i,mempoolused$i,mempoolfree$i,+,/,100,* ";
$rrd_options .= " LINE1:mempooltotal$i#" . $colour . ":'" . $descr . "' ";
$rrd_options .= " GPRINT:mempooltotal$i:LAST:%3.0lf";
$rrd_options .= " GPRINT:mempooltotal$i:MAX:%3.0lf\\\l ";
$rrd_options .= " GPRINT:mempooltotal$i:MIN:%3.0lf%%";
$rrd_options .= " GPRINT:mempooltotal$i:LAST:%3.0lf%%";
$rrd_options .= " GPRINT:mempooltotal$i:MAX:%3.0lf%%\\\l ";
$iter++; $i++;
}
}

2
html/includes/graphs/device/storage.inc.php
View File

@@ -9,7 +9,7 @@ $device = device_by_id_cache($id);
$iter = "1";
$sql = mysql_query("SELECT * FROM storage where device_id = '$id'");
$rrd_options .= " COMMENT:' Size Used %age\\l'";
$rrd_options .= " COMMENT:' Size Used %age\\l'";
while($storage = mysql_fetch_array($sql)) {
if($iter=="1") {$colour="CC0000";} elseif($iter=="2") {$colour="008C00";} elseif($iter=="3") {$colour="4096EE";
} elseif($iter=="4") {$colour="73880A";} elseif($iter=="5") {$colour="D01F3C";} elseif($iter=="6") {$colour="36393D";