clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-23 11:29:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up some graphing for new juniper stuff

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@913 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong 2010-02-21 05:40:26 +00:00
parent d2829eee47
commit bd570454bd
4 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
html/includes/graphs/device_cpu.inc.php
View File

@ -10,7 +10,6 @@ while($proc = mysql_fetch_array($query)) {
if(is_file($rrd_filename)) {
$descr = short_hrDeviceDescr($proc['processor_descr']);
$descr = str_replace(":", "\:", $descr);
$rrd_list[$i]['filename'] = $rrd_filename;
$rrd_list[$i]['descr'] = $descr;

25
html/includes/graphs/device_cpu_junos.inc.php
View File

@ -1,25 +0,0 @@
<?php
$unit_text = "Load %";
$units='%';
$total_units='%';
$colours='mixed';
$scale_min = "0";
$scale_max = "100";
$nototal = 1;
include("common.inc.php");
$database = $config['rrd_dir'] . "/" . $hostname . "/junos-cpu.rrd";
$rrd_options .= " DEF:load=$database:LOAD:AVERAGE";
$rrd_options .= " DEF:load_max=$database:LOAD:MAX";
$rrd_options .= " DEF:load_min=$database:LOAD:MIN";
$rrd_options .= " COMMENT:\ \ \ \ \ \ \ \ \ \ Current\ \ Minimum\ \ Maximum\ \ Average\\\\n";
$rrd_options .= " AREA:load#ffee99: LINE1.25:load#aa2200:Load\ %";
$rrd_options .= " GPRINT:load:LAST:%6.2lf\ GPRINT:load_min:AVERAGE:%6.2lf\ ";
$rrd_options .= " GPRINT:load_max:MAX:%6.2lf\ GPRINT:load:AVERAGE:%6.2lf\\\\n";
?>

4
html/includes/graphs/generic_multi_line.inc.php
View File

@ -19,8 +19,8 @@
$rra = $rrd['rra'];
$filename = $rrd['filename'];
$descr = $rrd['descr'];
$descr = substr(str_pad(short_hrDeviceDescr($rrd['descr']), 10),0,10);
$descr = substr(str_pad($descr, 10),0,10);
$descr = str_replace(":", "\:", $descr);
$id = $rra."_".$i;

6
html/includes/graphs/processor.inc.php
View File

@ -13,11 +13,11 @@ include("common.inc.php");
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); }
$proc['descr_fixed'] = substr(str_pad(short_hrDeviceDescr($proc['hrDeviceDescr']), 28),0,28);
$proc['descr_fixed'] = str_replace(":", "\:", $proc['descr_fixed']);
$descr = substr(str_pad(short_hrDeviceDescr($proc['processor_descr']), 28),0,28);
$descr = str_replace(":", "\:", $descr);
$rrd = $config['rrd_dir'] . "/".$proc['hostname']."/" . safename("processor-" . $proc['processor_type'] . "-" . $proc['processor_index'] . ".rrd");
$rrd_options .= " DEF:proc" . $proc['hrDeviceIndex'] . "=$rrd:usage:AVERAGE ";
$rrd_options .= " LINE1:proc" . $proc['hrDeviceIndex'] . "#" . $colour . ":'" . $proc['descr_fixed'] . "' ";
$rrd_options .= " LINE1:proc" . $proc['hrDeviceIndex'] . "#" . $colour . ":'" . $descr . "' ";
$rrd_options .= " GPRINT:proc" . $proc['hrDeviceIndex'] . ":LAST:%3.0lf";
$rrd_options .= " GPRINT:proc" . $proc['hrDeviceIndex'] . ":MAX:%3.0lf\\\l ";
$iter++;