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

storage fixes, moving things from graphing page, ironware dynamic memory pool (static!)

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@947 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-02-25 00:56:13 +00:00
parent 17fe4219c2
commit 81eb203abe
17 changed files with 138 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
html/includes/graphs/device_processors.inc.php Normal file
View File

@@ -0,0 +1,36 @@
<?php
$query = mysql_query("SELECT * FROM `processors` where `device_id` = '".mres($device_id)."'");
$i=0;
while($proc = mysql_fetch_array($query)) {
$rrd_filename = $config['rrd_dir'] . "/$hostname/" . safename("processor-" . $proc['processor_type'] . "-" . $proc['processor_index'] . ".rrd");
if(is_file($rrd_filename)) {
$descr = short_hrDeviceDescr($proc['processor_descr']);
$rrd_list[$i]['filename'] = $rrd_filename;
$rrd_list[$i]['descr'] = $descr;
$rrd_list[$i]['rra'] = "usage";
$i++;
}
}
$unit_text = "Load %";
$units='%';
$total_units='%';
$colours='mixed';
$scale_min = "0";
$scale_max = "100";
$nototal = 1;
if ($rrd_list) {
include ("generic_multi_line.inc.php");
}
?>

2
html/includes/graphs/device_storage.inc.php
View File

@@ -14,7 +14,7 @@ include("common.inc.php");
} elseif($iter=="7") {$colour="FF0084"; $iter = "0"; }
$descr = substr(str_pad($storage[storage_descr], 12),0,12);
$descr = str_replace(":","\:",$descr);
$rrd = $config['rrd_dir'] . "/$hostname/" . safename("storage-".$storage['storage_mib']."-".$storage['storage_index'].".rrd");
$rrd = $config['rrd_dir'] . "/$hostname/" . safename("storage-".$storage['storage_mib']."-".$storage['storage_descr'].".rrd");
$rrd_options .= " DEF:$storage[storage_id]used=$rrd:used:AVERAGE";
$rrd_options .= " DEF:$storage[storage_id]free=$rrd:free:AVERAGE";
$rrd_options .= " CDEF:$storage[storage_id]size=$storage[storage_id]used,$storage[storage_id]free,+";

55
html/includes/graphs/device_voltages.inc.php Normal file
View File

@@ -0,0 +1,55 @@
<?php
include("common.inc.php");
$rrd_options .= " -l 0 -E ";
$iter = "1";
$sql = mysql_query("SELECT * FROM voltage where device_id = '$device_id'");
$rrd_options .= " COMMENT:' Cur Min Max\\n'";
while($voltage = mysql_fetch_array($sql))
{
switch ($iter)
{
case "1":
$colour= "CC0000";
break;
case "2":
$colour= "008C00";
break;
case "3":
$colour= "4096EE";
break;
case "4":
$colour= "73880A";
break;
case "5":
$colour= "D01F3C";
break;
case "6":
$colour= "36393D";
break;
case "7":
default:
$colour= "FF0084";
unset($iter);
break;
}
$hostname = gethostbyid($voltage['device_id']);
$descr = substr(str_pad($voltage['volt_descr'], 17),0,17);
$rrd_filename = $config['rrd_dir'] . "/".$hostname."/" . safename("volt-" . $voltage['volt_descr'] . ".rrd");
$volt_id = $voltage['volt_id'];
$rrd_options .= " DEF:volt$volt_id=$rrd_filename:volt:AVERAGE";
$rrd_options .= " LINE1:volt$volt_id#".$colour.":'" . $descr . "'";
$rrd_options .= " GPRINT:volt$volt_id:AVERAGE:%5.2lfV";
$rrd_options .= " GPRINT:volt$volt_id:MIN:%5.2lfV";
$rrd_options .= " GPRINT:volt$volt_id:MAX:%5.2lfV\\\\l";
$iter++;
}
?>

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

@@ -17,7 +17,7 @@ $rrd_options .= " -b 1024";
} elseif($iter=="7") {$colour="FF0084"; $iter = "0"; }
$descr = substr(str_pad($storage[storage_descr], 12),0,12);
$descr = str_replace(":","\:",$descr);
$rrd = $config['rrd_dir'] . "/" . $hostname . "/" . safename("storage-" . $storage['storage_mib'] . "-" . $storage['storage_index'] . ".rrd");
$rrd = $config['rrd_dir'] . "/" . $hostname . "/" . safename("storage-" . $storage['storage_mib'] . "-" . $storage['storage_descr'] . ".rrd");
$rrd_options .= " DEF:$storage[storage_id]used=$rrd:used:AVERAGE";
$rrd_options .= " DEF:$storage[storage_id]free=$rrd:free:AVERAGE";
$rrd_options .= " CDEF:$storage[storage_id]size=$storage[storage_id]used,$storage[storage_id]free,+";