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

updates et al

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@503 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2009-11-07 02:30:38 +00:00
parent 65b8eb183e
commit 975c3a2a93
28 changed files with 303 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,7 @@
<?php
$scale_min = "0";
$data = mysql_fetch_array(mysql_query("SELECT * FROM bgpPeers AS B, devices AS D WHERE bgpPeer_id = '".$_GET['peer']."' AND D.device_id = B.device_id"));
$rrd_filename = $config['rrd_dir'] . "/" . $data['hostname'] . "/bgp-" . $data['bgpPeerIdentifier'] . ".rrd";

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

@@ -1,5 +1,9 @@
<?php
include("common.inc.php");
$scale_min = "0";
$data = mysql_fetch_array(mysql_query("SELECT * FROM bgpPeers AS B, devices AS D WHERE bgpPeer_id = '".$_GET['peer']."' AND D.device_id = B.device_id"));
$rrd_filename = $config['rrd_dir'] . "/" . $data['hostname'] . "/cbgp-" . $data['bgpPeerIdentifier'] . ".".$_GET['afi'].".".$_GET['safi'].".rrd";

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

@@ -1,9 +1,4 @@
<?php
$os = strtolower($os);
if($os == "linux" || $os == "netbsd" || $os == "freebsd" || $os == "dragonfly" || $os == "openbsd" || $os == "windows" || $os == "m0n0wall" || $os == "Voswall" || $os == "pfsense" || $os == "dragonfly" || $os == "openbsd") {
include("device_cpu_unix.inc.php");
}
?>

2
html/includes/graphs/device_processes.inc.php → html/includes/graphs/device_hrprocesses.inc.php
View File

@@ -4,7 +4,7 @@ $scale_min = "0";
include("common.inc.php");
$database = $config['rrd_dir'] . "/" . $hostname . "/sys.rrd";
$database = $config['rrd_dir'] . "/" . $hostname . "/hrSystem.rrd";
$rrd_options .= " DEF:procs=$database:procs:AVERAGE";
$rrd_options .= " COMMENT:Processes\ \ \ \ Cur\ \ \ \ \ Ave\ \ \ \ \ \ Min\ \ \ \ \ Max\\\\n";

5
html/includes/graphs/device_unixfs.inc.php → html/includes/graphs/device_hrstorage.inc.php
View File

@@ -1,5 +1,8 @@
<?php
$scale_min = "0";
$scale_max = "100";
include("common.inc.php");
$iter = "1";
@@ -13,7 +16,7 @@ include("common.inc.php");
$descr = str_pad($fs[hrStorageDescr], 14);
$descr = substr($descr,0,14);
$text = str_replace("/", "_", $fs['hrStorageDescr']);
$rrd = $config['rrd_dir'] . "/$hostname/storage-$text.rrd";
$rrd = $config['rrd_dir'] . "/$hostname/hrStorage-".$fs['hrStorageIndex'].".rrd";
$rrd_options .= " DEF:$fs[storage_id]=$rrd:used:AVERAGE";
$rrd_options .= " DEF:$fs[storage_id]s=$rrd:size:AVERAGE";
$rrd_options .= " DEF:$fs[storage_id]p=$rrd:perc:AVERAGE";

2
html/includes/graphs/device_users.inc.php → html/includes/graphs/device_hrusers.inc.php
View File

@@ -4,7 +4,7 @@ $scale_min = "0";
include("common.inc.php");
$database = $config['rrd_dir'] . "/" . $hostname . "/sys.rrd";
$database = $config['rrd_dir'] . "/" . $hostname . "/hrSystem.rrd";
$rrd_options .= " DEF:users=$database:users:AVERAGE";
$rrd_options .= " DEF:users_max=$database:users:MAX";

104
html/includes/graphs/device_icmp_informational.inc.php
View File

@@ -4,50 +4,64 @@ include('common.inc.php');
$rrd_filename = $config['rrd_dir'] . "/" . $hostname . "/netstats-icmp.rrd";
$rrd_options .= " DEF:sqIn=$rrd_filename:icmpInSrcQuenchs:AVERAGE";
$rrd_options .= " DEF:sqOut=$rrd_filename:icmpOutSrcQuenchs:AVERAGE";
$rrd_options .= " DEF:redirIn=$rrd_filename:icmpInRedirects:AVERAGE";
$rrd_options .= " DEF:redirOut=$rrd_filename:icmpOutRedirects:AVERAGE";
$rrd_options .= " DEF:maskIn=$rrd_filename:icmpInAddrMasks:AVERAGE";
$rrd_options .= " DEF:maskOut=$rrd_filename:icmpOutAddrMasks:AVERAGE";
$rrd_options .= " DEF:maskrepIn=$rrd_filename:icmpInAddrMaskReps:AVERAGE";
$rrd_options .= " DEF:maskrepOut=$rrd_filename:icmpOutAddrMaskReps:AVERAGE";
$rrd_options .= " CDEF:sqOutInv=sqOut,-1,*";
$rrd_options .= " CDEF:redirOutInv=redirOut,-1,*";
$rrd_options .= " CDEF:maskOutInv=maskOut,-1,*";
$rrd_options .= " CDEF:maskrepOutInv=maskrepOut,-1,*";
$rrd_options .= " AREA:sqIn#00ff00:'Source Quenches In '";
$rrd_options .= " GPRINT:sqIn:AVERAGE:'Avg \\: %8.2lf %s'";
$rrd_options .= " GPRINT:sqIn:MIN:'Min \\: %8.2lf %s'";
$rrd_options .= " GPRINT:sqIn:MAX:'Max \\: %8.2lf %s\\n'";
$rrd_options .= " STACK:redirIn#0000ff:'Redirects In '";
$rrd_options .= " GPRINT:redirIn:AVERAGE:'Avg \\: %8.2lf %s'";
$rrd_options .= " GPRINT:redirIn:MIN:'Min \\: %8.2lf %s'";
$rrd_options .= " GPRINT:redirIn:MAX:'Max \\: %8.2lf %s\\n'";
$rrd_options .= " STACK:maskIn#ff00b4:'Mask Requests In '";
$rrd_options .= " GPRINT:maskIn:AVERAGE:'Avg \\: %8.2lf %s'";
$rrd_options .= " GPRINT:maskIn:MIN:'Min \\: %8.2lf %s'";
$rrd_options .= " GPRINT:maskIn:MAX:'Max \\: %8.2lf %s\\n'";
$rrd_options .= " STACK:maskrepIn#00ff72:'Mask Replies In '";
$rrd_options .= " GPRINT:maskrepIn:AVERAGE:'Avg \\: %8.2lf %s'";
$rrd_options .= " GPRINT:maskrepIn:MIN:'Min \\: %8.2lf %s'";
$rrd_options .= " GPRINT:maskrepIn:MAX:'Max \\: %8.2lf %s\\n'";
$rrd_options .= " COMMENT:'\\n'";
$rrd_options .= " AREA:sqOut#00ff00:'Source Quenches Out'";
$rrd_options .= " GPRINT:sqOut:AVERAGE:'Avg \\: %8.2lf %s'";
$rrd_options .= " GPRINT:sqOut:MIN:'Min \\: %8.2lf %s'";
$rrd_options .= " GPRINT:sqOut:MAX:'Max \\: %8.2lf %s\\n'";
$rrd_options .= " STACK:redirOut#0000ff:'Redirects Out '";
$rrd_options .= " GPRINT:redirOut:AVERAGE:'Avg \\: %8.2lf %s'";
$rrd_options .= " GPRINT:redirOut:MIN:'Min \\: %8.2lf %s'";
$rrd_options .= " GPRINT:redirOut:MAX:'Max \\: %8.2lf %s\\n'";
$rrd_options .= " STACK:maskOut#ff00b4:'Mask Requests Out '";
$rrd_options .= " GPRINT:maskOut:AVERAGE:'Avg \\: %8.2lf %s'";
$rrd_options .= " GPRINT:maskOut:MIN:'Min \\: %8.2lf %s'";
$rrd_options .= " GPRINT:maskOut:MAX:'Max \\: %8.2lf %s\\n'";
$rrd_options .= " STACK:maskrepOut#00ff72:'Mask Replies Out '";
$rrd_options .= " GPRINT:maskrepOut:AVERAGE:'Avg \\: %8.2lf %s'";
$rrd_options .= " GPRINT:maskrepOut:MIN:'Min \\: %8.2lf %s'";
$rrd_options .= " GPRINT:maskrepOut:MAX:'Max \\: %8.2lf %s'";
$rrd_options .= " DEF:InSrcQuenchs=$rrd_filename:icmpInSrcQuenchs:AVERAGE";
$rrd_options .= " DEF:OutSrcQuenchs=$rrd_filename:icmpOutSrcQuenchs:AVERAGE";
$rrd_options .= " DEF:InRedirects=$rrd_filename:icmpInRedirects:AVERAGE";
$rrd_options .= " DEF:OutRedirects=$rrd_filename:icmpOutRedirects:AVERAGE";
$rrd_options .= " DEF:InAddrMasks=$rrd_filename:icmpInAddrMasks:AVERAGE";
$rrd_options .= " DEF:OutAddrMasks=$rrd_filename:icmpOutAddrMasks:AVERAGE";
$rrd_options .= " DEF:InAddrMaskReps=$rrd_filename:icmpInAddrMaskReps:AVERAGE";
$rrd_options .= " DEF:OutAddrMaskReps=$rrd_filename:icmpOutAddrMaskReps:AVERAGE";
$rrd_options .= " DEF:InSrcQuenchs_m=$rrd_filename:icmpInSrcQuenchs:MAX";
$rrd_options .= " DEF:OutSrcQuenchs_m=$rrd_filename:icmpOutSrcQuenchs:MAX";
$rrd_options .= " DEF:InRedirects_m=$rrd_filename:icmpInRedirects:MAX";
$rrd_options .= " DEF:OutRedirects_m=$rrd_filename:icmpOutRedirects:MAX";
$rrd_options .= " DEF:InAddrMasks_m=$rrd_filename:icmpInAddrMasks:MAX";
$rrd_options .= " DEF:OutAddrMasks_m=$rrd_filename:icmpOutAddrMasks:MAX";
$rrd_options .= " DEF:InAddrMaskReps_m=$rrd_filename:icmpInAddrMaskReps:MAX";
$rrd_options .= " DEF:OutAddrMaskReps_m=$rrd_filename:icmpOutAddrMaskReps:MAX";
$rrd_options .= " CDEF:OutSrcQuenchs_Inv=OutSrcQuenchs,-1,*";
$rrd_options .= " CDEF:OutRedirects_Inv=OutRedirects,-1,*";
$rrd_options .= " CDEF:OutAddrMasks_Inv=OutAddrMasks,-1,*";
$rrd_options .= " CDEF:OutAddrMaskReps_Inv=OutAddrMaskReps,-1,*";
$rrd_options .= " COMMENT:Packets/sec\ \ \ \ Current\ \ \ \ Average\ \ \ Maximum\\\\n";
$rrd_options .= " LINE1.25:InSrcQuenchs#00cc00:'InSrcQuenchs '";
$rrd_options .= " GPRINT:InSrcQuenchs:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:InSrcQuenchs:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:InSrcQuenchs_m:MAX:%6.2lf%s\\\\n";
$rrd_options .= " LINE1.25:OutSrcQuenchs_Inv#006600:'OutSrcQuenchs '";
$rrd_options .= " GPRINT:OutSrcQuenchs:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:OutSrcQuenchs:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:OutSrcQuenchs_m:MAX:%6.2lf%s\\\\n";
$rrd_options .= " LINE1.25:InRedirects#cc0000:'InRedirects '";
$rrd_options .= " GPRINT:InRedirects:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:InRedirects:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:InRedirects_m:MAX:'%6.2lf%s\\n'";
$rrd_options .= " LINE1.25:OutRedirects_Inv#660000:'OutRedirects '";
$rrd_options .= " GPRINT:OutRedirects:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:OutRedirects:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:OutRedirects_m:MAX:'%6.2lf%s\\n'";
$rrd_options .= " LINE1.25:InAddrMasks#0066cc:'InAddrMasks '";
$rrd_options .= " GPRINT:InAddrMasks:LAST:'%6.2lf%s'";
$rrd_options .= " GPRINT:InAddrMasks:AVERAGE:'%6.2lf%s'";
$rrd_options .= " GPRINT:InAddrMasks:MAX:'%6.2lf%s\\n'";
$rrd_options .= " LINE1.25:OutAddrMasks_Inv#003399:'OutAddrMasks '";
$rrd_options .= " GPRINT:OutAddrMasks:LAST:'%6.2lf%s'";
$rrd_options .= " GPRINT:OutAddrMasks:AVERAGE:'%6.2lf%s'";
$rrd_options .= " GPRINT:OutAddrMasks_m:MAX:'%6.2lf%s\\n'";
$rrd_options .= " LINE1.25:InAddrMaskReps#cc00cc:'InAddrMaskReps '";
$rrd_options .= " GPRINT:InAddrMaskReps:LAST:'%6.2lf%s'";
$rrd_options .= " GPRINT:InAddrMaskReps:AVERAGE:'%6.2lf%s'";
$rrd_options .= " GPRINT:InAddrMaskReps:MAX:'%6.2lf%s\\n'";
$rrd_options .= " LINE1.25:OutAddrMaskReps_Inv#990099:'OutAddrMaskReps'";
$rrd_options .= " GPRINT:OutAddrMaskReps:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:OutAddrMaskReps:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:OutAddrMaskReps_m:MAX:%6.2lf%s\\\\n";
?>

49
html/includes/graphs/device_ipfrag.inc.php → html/includes/graphs/device_ip_fragmented.inc.php
View File

@@ -30,22 +30,37 @@ $rrd_options .= " CDEF:MReasmFails=MipReasmFails,ipInDelivers,/,100,*";
$rrd_options .= " CDEF:MFragOKs=MipFragOKs,ipInDelivers,/,100,*";
$rrd_options .= " CDEF:MFragFails=MipFragFails,ipInDelivers,/,100,*";
$rrd_options .= " CDEF:MFragCreates=MipFragCreates,ipInDelivers,/,100,*";
$rrd_options .= " LINE1:FragOKs#00ff00:'Fragmentation OK'";
$rrd_options .= " LINE2:FragFails#ff0000:'Fragmentation Fail'";
$rrd_options .= " LINE1:ReasmOKs#0033aa:'Reassembly OK'";
$rrd_options .= " LINE2:ReasmFails#000000:'Reassembly Fail'";
$rrd_options .= " GPRINT:ReasmReqds:AVERAGE:Avg\ ReasmReqd\ %1.2lf\ %%";
$rrd_options .= " GPRINT:MReasmReqds:MAX:Max\ ReasmReqd\ %1.2lf\ %%";
$rrd_options .= " GPRINT:ReasmOKs:AVERAGE:Avg\ ReasmOK\ %1.2lf\ %%";
$rrd_options .= " GPRINT:MReasmOKs:MAX:Max\ ReasmOK\ %1.2lf\ %%";
$rrd_options .= " GPRINT:ReasmFails:AVERAGE:Avg\ ReasmFail\ %1.2lf\ %%";
$rrd_options .= " GPRINT:MReasmFails:MAX:Max\ ReasmFail\ %1.2lf\ %%";
$rrd_options .= " GPRINT:FragOKs:AVERAGE:Avg\ FragOK\ %1.2lf\ %%";
$rrd_options .= " GPRINT:MFragOKs:MAX:Max\ FragOK\ %1.2lf\ %%";
$rrd_options .= " GPRINT:FragFails:AVERAGE:Avg\ FragFail\ %1.2lf\ %%";
$rrd_options .= " GPRINT:MFragFails:MAX:Max\ FragFail\ %1.2lf\ %%";
$rrd_options .= " GPRINT:FragCreates:AVERAGE:Avg\ FragCreate\ %1.2lf\ %%";
$rrd_options .= " GPRINT:MFragCreates:MAX:Max\ FragCreate\ %1.2lf\ %%";
$rrd_options .= " COMMENT:' Calculated as a % of ipInDelivers'"
$rrd_options .= " COMMENT:'% ipInDelivers Current Average Maximum\\n'";
$rrd_options .= " LINE1.25:FragOKs#00cc00:'Frag OK '";
$rrd_options .= " GPRINT:FragOKs:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:FragOKs:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:MFragOKs:MAX:%6.2lf%s\\\\n";
$rrd_options .= " LINE1.25:FragFails#cc0000:'Frag Fail '";
$rrd_options .= " GPRINT:FragFails:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:FragFails:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:MFragFails:MAX:%6.2lf%s\\\\n";
$rrd_options .= " LINE1.25:ReasmOKs#006600:'Reasm OK '";
$rrd_options .= " GPRINT:ReasmOKs:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:ReasmOKs:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:MReasmOKs:MAX:%6.2lf%s\\\\n";
$rrd_options .= " LINE1.25:ReasmFails#660000:'Reasm Fail '";
$rrd_options .= " GPRINT:ReasmFails:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:ReasmFails:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:MReasmFails:MAX:%6.2lf%s\\\\n";
$rrd_options .= " LINE1.25:FragCreates#00cc:'Frag Create '";
$rrd_options .= " GPRINT:FragCreates:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:FragCreates:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:MFragCreates:MAX:%6.2lf%s\\\\n";
$rrd_options .= " LINE1.25:ReasmReqds#000066:'Reasm Reqd '";
$rrd_options .= " GPRINT:ReasmReqds:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:ReasmReqds:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:MReasmReqds:MAX:%6.2lf%s\\\\n";
?>

44
html/includes/graphs/device_load_unix.inc.php
View File

@@ -2,29 +2,29 @@
include("common.inc.php");
$rrd_filename = $config['rrd_dir'] . "/" . $_GET['device'] . "/uptime.rrd";
$rrd_filename = $config['rrd_dir'] . "/" . $hostname . "/load.rrd";
$options .= " DEF:1min=$rrd_filename:1min:AVERAGE";
$options .= " DEF:5min=$rrd_filename:5min:AVERAGE";
$options .= " DEF:15min=$rrd_filename:15min:AVERAGE";
$options .= " CDEF:a=1min,100,/";
$options .= " CDEF:b=5min,100,/";
$options .= " CDEF:c=15min,100,/";
$options .= " CDEF:cdefd=a,b,c,+,+";
$options .= " COMMENT:Load\ Average\ \ Current\ \ \ \ Average\ \ \ \ Maximum\\\\n";
$options .= " AREA:a#ffeeaa:1\ Min:";
$options .= " LINE1:a#c5aa00:";
$options .= " GPRINT:a:LAST:\ \ \ \ %7.2lf";
$options .= " GPRINT:a:AVERAGE:\ \ %7.2lf";
$options .= " GPRINT:a:MAX:\ \ %7.2lf\\\\n";
$options .= " LINE1.25:b#ea8f00:5\ Min:";
$options .= " GPRINT:b:LAST:\ \ \ \ %7.2lf";
$options .= " GPRINT:b:AVERAGE:\ \ %7.2lf";
$options .= " GPRINT:b:MAX:\ \ %7.2lf\\\\n";
$options .= " LINE1.25:c#cc0000:15\ Min";
$options .= " GPRINT:c:LAST:\ \ \ %7.2lf";
$options .= " GPRINT:c:AVERAGE:\ \ %7.2lf";
$options .= " GPRINT:c:MAX:\ \ %7.2lf\\\\n";
$rrd_options .= " DEF:1min=$rrd_filename:1min:AVERAGE";
$rrd_options .= " DEF:5min=$rrd_filename:5min:AVERAGE";
$rrd_options .= " DEF:15min=$rrd_filename:15min:AVERAGE";
$rrd_options .= " CDEF:a=1min,100,/";
$rrd_options .= " CDEF:b=5min,100,/";
$rrd_options .= " CDEF:c=15min,100,/";
$rrd_options .= " CDEF:cdefd=a,b,c,+,+";
$rrd_options .= " COMMENT:Load\ Average\ \ Current\ \ \ \ Average\ \ \ \ Maximum\\\\n";
$rrd_options .= " AREA:a#ffeeaa:1\ Min:";
$rrd_options .= " LINE1:a#c5aa00:";
$rrd_options .= " GPRINT:a:LAST:\ \ \ \ %7.2lf";
$rrd_options .= " GPRINT:a:AVERAGE:\ \ %7.2lf";
$rrd_options .= " GPRINT:a:MAX:\ \ %7.2lf\\\\n";
$rrd_options .= " LINE1.25:b#ea8f00:5\ Min:";
$rrd_options .= " GPRINT:b:LAST:\ \ \ \ %7.2lf";
$rrd_options .= " GPRINT:b:AVERAGE:\ \ %7.2lf";
$rrd_options .= " GPRINT:b:MAX:\ \ %7.2lf\\\\n";
$rrd_options .= " LINE1.25:c#cc0000:15\ Min";
$rrd_options .= " GPRINT:c:LAST:\ \ \ %7.2lf";
$rrd_options .= " GPRINT:c:AVERAGE:\ \ %7.2lf";
$rrd_options .= " GPRINT:c:MAX:\ \ %7.2lf\\\\n";
?>

5
html/includes/graphs/device_memory.inc.php
View File

@@ -1,9 +1,4 @@
<?php
$os = strtolower($os);
if($os == "linux" || $os == "netbsd" || $os == "freebsd" || $os == "dragonfly" || $os == "openbsd" || $os == "windows" || $os == "m0n0wall" || $os == "Voswall" || $os == "pfsense" || $os == "dragonfly" || $os == "openbsd") {
include("device_memory_unix.inc.php");
}
?>

18
html/includes/graphs/device_memory_ios.inc.php
View File

@@ -5,7 +5,7 @@ include("common.inc.php");
$rrd_options .= " -l 0 -E -b 1024 -u 100 -r";
$iter = "1";
$rrd_options .= " COMMENT:' Cur Max\\n'";
$rrd_options .= " COMMENT:' Currently Used Max\\n'";
$sql = mysql_query("SELECT * FROM `cempMemPool` where `device_id` = '$device_id'");
while($mempool = mysql_fetch_array($sql)) {
@@ -18,16 +18,20 @@ include("common.inc.php");
$mempool['descr_fixed'] = str_replace("Routing Processor", "RP", $mempool['descr_fixed']);
$mempool['descr_fixed'] = str_replace("Switching Processor", "SP", $mempool['descr_fixed']);
$mempool['descr_fixed'] = str_replace("Processor", "Proc", $mempool['descr_fixed']);
$mempool['descr_fixed'] = str_pad($mempool['descr_fixed'], 28);
$mempool['descr_fixed'] = substr($mempool['descr_fixed'],0,28);
$mempool['descr_fixed'] = str_pad($mempool['descr_fixed'], 20);
$mempool['descr_fixed'] = substr($mempool['descr_fixed'],0,20);
$oid = $mempool['entPhysicalIndex'] . "." . $mempool['Index'];
$rrd = $config['rrd_dir'] . "/$hostname/cempMemPool-$oid.rrd";
$rrd_options .= " DEF:mempool" . $iter . "free=$rrd:free:AVERAGE ";
$rrd_options .= " DEF:mempool" . $iter . "used=$rrd:used:AVERAGE ";
$rrd_options .= " DEF:mempool" . $iter . "free=$rrd:free:AVERAGE";
$rrd_options .= " DEF:mempool" . $iter . "used=$rrd:used:AVERAGE";
$rrd_options .= " DEF:mempool" . $iter . "free_m=$rrd:free:MAX";
$rrd_options .= " DEF:mempool" . $iter . "used_m=$rrd:used:MAX";
$rrd_options .= " CDEF:mempool" . $iter . "total=mempool" . $iter . "used,mempool" . $iter . "used,mempool" . $iter . "free,+,/,100,* ";
$rrd_options .= " LINE1:mempool" . $iter . "total#" . $colour . ":'" . $mempool['descr_fixed'] . "' ";
$rrd_options .= " GPRINT:mempool" . $iter . "total:LAST:%3.0lf";
$rrd_options .= " GPRINT:mempool" . $iter . "total:MAX:%3.0lf\\\l ";
$rrd_options .= " GPRINT:mempool" . $iter . "used:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:mempool" . $iter . "total:LAST:%3.0lf%%";
$rrd_options .= " GPRINT:mempool" . $iter . "total:MAX:%3.0lf%%\\\\n";
$iter++;
}

10
html/includes/graphs/device_uptime.inc.php
View File

@@ -1,8 +1,14 @@
<?php
$scale_min = "0";
include("common.inc.php");
$rrd_filename = $config['rrd_dir'] . "/" . $hostname . "/uptime.rrd";
if (is_file($config['rrd_dir'] . "/" . $hostname . "/hrSystem.rrd")) {
$rrd_filename = $config['rrd_dir'] . "/" . $hostname . "/hrSystem.rrd";
} else {
$rrd_filename = $config['rrd_dir'] . "/" . $hostname . "/uptime.rrd";
}
$rrd_options .= " DEF:uptime=$rrd_filename:uptime:AVERAGE";
$rrd_options .= " CDEF:cuptime=uptime,86400,/";
@@ -12,6 +18,4 @@ $rrd_filename = $config['rrd_dir'] . "/" . $hostname . "/uptime.rrd";
$rrd_options .= " GPRINT:cuptime:LAST:%6.2lf\ GPRINT:cuptime:AVERAGE:%6.2lf\ ";
$rrd_options .= " GPRINT:cuptime:MAX:%6.2lf\ GPRINT:cuptime:AVERAGE:%6.2lf\\\\n";
$scale_min = "0";
?>

2
html/includes/graphs/unixfs.inc.php → html/includes/graphs/hrstorage.inc.php
View File

@@ -17,7 +17,7 @@ $rrd_options .= " -b 1024";
$descr = str_pad($fs[hrStorageDescr], 12);
$descr = substr($descr,0,12);
$text = str_replace("/", "_", $fs['hrStorageDescr']);
$rrd = $config['rrd_dir'] . "/$hostname/storage-$text.rrd";
$rrd = $config['rrd_dir'] . "/$hostname/hrStorage-".$fs['hrStorageIndex'].".rrd";
$rrd_options .= " DEF:$fs[storage_id]=$rrd:used:AVERAGE";
$rrd_options .= " DEF:$fs[storage_id]s=$rrd:size:AVERAGE";
$rrd_options .= " DEF:$fs[storage_id]p=$rrd:perc:AVERAGE";