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

fixes to things, use *only* junos and junose mibdir for those things

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1586 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-07-31 19:12:40 +00:00
parent 811d3ca6a1
commit ec74c22e3b
14 changed files with 55 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/graphs/device/ucd_io.inc.php
+2
View File
@@ -6,6 +6,8 @@ $rrd_filename_out = $config['rrd_dir'] . "/" . $device['hostname'] . "/ucd_ssIOR
$rra_in = "value";
$rra_out = "value";
$multiplier = 512;
include("includes/graphs/generic_bits.inc.php");
html/includes/graphs/device/ucd_swap_io.inc.php
+2
View File
@@ -6,6 +6,8 @@ $rrd_filename_out = $config['rrd_dir'] . "/" . $device['hostname'] . "/ucd_ssRaw
$rra_in = "value";
$rra_out = "value";
$multiplier = 512;
include("includes/graphs/generic_bits.inc.php");
html/includes/graphs/generic_bits.inc.php
+26 -8
View File
@@ -5,25 +5,43 @@
include("includes/graphs/common.inc.php");
if($rrd_filename) { $rrd_filename_out = $rrd_filename; $rrd_filename_in = $rrd_filename; }
if($inverse) { $in = 'out'; $out = 'in'; } else { $in = 'in'; $out = 'out'; }
$rrd_options .= " DEF:".$out."octets=".$rrd_filename.":".$rra_out.":AVERAGE";
$rrd_options .= " DEF:".$in."octets=".$rrd_filename.":".$rra_in.":AVERAGE";
$rrd_options .= " DEF:".$out."octets_max=".$rrd_filename.":".$rra_out.":MAX";
$rrd_options .= " DEF:".$in."octets_max=".$rrd_filename.":".$rra_in.":MAX";
if($multiplier)
{
$rrd_options .= " DEF:p".$out."octets=".$rrd_filename_out.":".$rra_out.":AVERAGE";
$rrd_options .= " DEF:p".$in."octets=".$rrd_filename_in.":".$rra_in.":AVERAGE";
$rrd_options .= " DEF:p".$out."octets_max=".$rrd_filename_out.":".$rra_out.":MAX";
$rrd_options .= " DEF:p".$in."octets_max=".$rrd_filename_in.":".$rra_in.":MAX";
$rrd_options .= " CDEF:inoctets=pinoctets,$multiplier,*";
$rrd_options .= " CDEF:outoctets=poutoctets,$multiplier,*";
$rrd_options .= " CDEF:inoctets_max=pinoctets_max,$multiplier,*";
$rrd_options .= " CDEF:outoctets_max=poutoctets_max,$multiplier,*";
} else {
$rrd_options .= " DEF:".$out."octets=".$rrd_filename_out.":".$rra_out.":AVERAGE";
$rrd_options .= " DEF:".$in."octets=".$rrd_filename_in.":".$rra_in.":AVERAGE";
$rrd_options .= " DEF:".$out."octets_max=".$rrd_filename_out.":".$rra_out.":MAX";
$rrd_options .= " DEF:".$in."octets_max=".$rrd_filename_in.":".$rra_in.":MAX";
}
$rrd_options .= " CDEF:octets=inoctets,outoctets,+";
$rrd_options .= " CDEF:doutoctets=outoctets,-1,*";
$rrd_options .= " CDEF:inbits=inoctets,8,*";
$rrd_options .= " CDEF:inbits_max=inoctets_max,8,*";
$rrd_options .= " CDEF:outbits=outoctets,8,*";
$rrd_options .= " CDEF:outbits_max=outoctets_max,8,*";
$rrd_options .= " CDEF:doutoctets_max=outoctets_max,-1,*";
$rrd_options .= " CDEF:doutbits_max=doutoctets_max,8,*";
$rrd_options .= " CDEF:outbits=outoctets,8,*";
$rrd_options .= " CDEF:doutbits=doutoctets,8,*";
$rrd_options .= " CDEF:doutbits_max=doutoctets_max,8,*";
$rrd_options .= " CDEF:inbits=inoctets,8,*";
$rrd_options .= " CDEF:inbits_max=inoctets_max,8,*";
$rrd_options .= " VDEF:totin=inoctets,TOTAL";
$rrd_options .= " VDEF:totout=outoctets,TOTAL";
$rrd_options .= " VDEF:tot=octets,TOTAL";
$rrd_options .= " VDEF:95thin=inbits,95,PERCENT";
$rrd_options .= " VDEF:95thout=outbits,95,PERCENT";
$rrd_options .= " VDEF:d95thout=doutbits,5,PERCENT";
html/includes/graphs/generic_simplex.inc.php
+3 -3
View File
@@ -5,8 +5,8 @@
include("includes/graphs/common.inc.php");
$unit_text = str_pad(truncate($unit_text,10),10);
$unit_text = str_pad(truncate($unit_text,18,''),18);
$line_text = str_pad(truncate($line_text,12,''),12);
$rrd_options .= " DEF:".$rra."=".$rrd_filename.":".$rra.":AVERAGE";
$rrd_options .= " DEF:".$rra."_max=".$rrd_filename.":".$rra.":MAX";
@@ -28,7 +28,7 @@ if($percentile) {
$rrd_options .= " ".$percentile."th %";
}
$rrd_options .= "\\n'";
$rrd_options .= " LINE1.25:".$rra."#".$colour_line.":In\ ";
$rrd_options .= " LINE1.25:".$rra."#".$colour_line.":'".$line_text."'";
$rrd_options .= " GPRINT:".$rra.":LAST:%6.2lf%s";
$rrd_options .= " GPRINT:".$rra.":AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:".$rra."_max:MAX:%6.2lf%s";