clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-22 02:48:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert change changing mempool/storage format

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@3091 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong 2012-04-26 16:15:11 +00:00
parent 77d055f9d6
commit 22dad0dae4
11 changed files with 144 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
html/includes/graphs/device/bits.inc.php
View File

@ -55,7 +55,7 @@ $colours_in ='greens';
$multiplier = "8";
$colours_out = 'blues';
$nototal = 1;
#$nototal = 1;
$ds_in = "INOCTETS";
$ds_out = "OUTOCTETS";
@ -68,8 +68,7 @@ $colour_area_in = "91B13C";
$colour_area_out = "8080BD";
include("includes/graphs/generic_multi_seperated.inc.php");
#include("includes/graphs/generic_multi_bits_separated.inc.php");
#include("includes/graphs/generic_multi_data.inc.php");
#include("includes/graphs/generic_multi_data_separated.inc.php");
?>

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

@ -18,7 +18,7 @@ foreach (dbFetchRows("SELECT * FROM `mempools` where `device_id` = ?", array($id
$descr = substr(str_pad(short_hrDeviceDescr($mempool['mempool_descr']), 22),0,22);
$descr = str_replace(":", "\:", $descr);
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("mempoolX-".$mempool['mempool_type']."-".$mempool['mempool_index'].".rrd");
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("mempool-".$mempool['mempool_type']."-".$mempool['mempool_index'].".rrd");
if (is_file($rrd_filename))
{

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

@ -19,7 +19,7 @@ foreach (dbFetchRows("SELECT * FROM storage where device_id = ?", array($id)) as
$descr = substr(str_pad($storage[storage_descr], 12),0,12);
$descr = str_replace(":","\:",$descr);
$rrd = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("storageX-".$storage['storage_mib']."-".$storage['storage_descr'].".rrd");
$rrd = $config['rrd_dir'] . "/".$device['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,+";

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

@ -39,7 +39,6 @@ foreach ($rrd_list as $rrd)
$descr = str_replace(":", "\:", substr(str_pad($rrd['descr'], $descr_len),0,$descr_len)) . " In";
}
$descr_out = str_replace(":", "\:", substr(str_pad($rrd['descr_out'], $descr_len),0,$descr_len)). " Out";
$descr = str_replace("'", "", $descr);
$descr_out = str_replace("'", "", $descr_out);

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

@ -98,8 +98,8 @@ if ($i)
{
$rrd_options .= " AREA:in".$format."X#99999999:";
$rrd_options .= " AREA:dout".$format."X#99999999:";
$rrd_options .= " LINE1.25:in".$format."X#666666:";
$rrd_options .= " LINE1.25:dout".$format."X#666666:";
$rrd_options .= " LINE1:in".$format."X#666666:";
$rrd_options .= " LINE1:dout".$format."X#666666:";
}
}

171
html/includes/graphs/generic_multi_seperated.inc.php
View File

@ -7,15 +7,15 @@ $units_descr = substr(str_pad($units_descr, 18),0,18);
if($format == "octets" || $format == "bytes")
{
$units = "Bps";
$format = "octets";
$format = "bits";
} else {
$units = "bps";
$format = "bits";
}
$i = 0;
$rrd_options .= " COMMENT:'$units_descr Current Average Maximum\\n'";
if (!$nototal) { $rrd_options .= " COMMENT:' Tot'"; }
$rrd_options .= " COMMENT:'$units_descr Current Average Maximum'";
if (!$nototal) { $rrd_options .= " COMMENT:'Total'"; }
$rrd_options .= " COMMENT:'\\n'";
foreach ($rrd_list as $rrd)
@ -28,21 +28,22 @@ foreach ($rrd_list as $rrd)
if ($rrd['colour_area_in']) { $colour_in = $rrd['colour_area_in']; }
if ($rrd['colour_area_out']) { $colour_out = $rrd['colour_area_out']; }
$rrd_options .= " DEF:in".$i."=".$rrd['filename'].":".$rrd['ds_in'].":AVERAGE ";
$rrd_options .= " DEF:out".$i."=".$rrd['filename'].":".$rrd['ds_out'].":AVERAGE ";
$rrd_options .= " CDEF:inB".$i."=in".$i.",$multiplier,* ";
$rrd_options .= " CDEF:outB".$i."=out".$i.",$multiplier,*";
$rrd_options .= " CDEF:outB".$i."_neg=outB".$i.",-1,*";
$rrd_options .= " DEF:inB".$i."=".$rrd['filename'].":".$rrd['ds_in'].":AVERAGE ";
$rrd_options .= " DEF:outB".$i."=".$rrd['filename'].":".$rrd['ds_out'].":AVERAGE ";
$rrd_options .= " CDEF:octets".$i."=inB".$i.",outB".$i.",+";
$rrd_options .= " CDEF:inbits".$i."=inB".$i.",$multiplier,* ";
$rrd_options .= " CDEF:outbits".$i."=outB".$i.",$multiplier,*";
$rrd_options .= " CDEF:outbits".$i."_neg=outbits".$i.",-1,*";
$rrd_options .= " CDEF:bits".$i."=inbits".$i.",outbits".$i.",+";
if ($_GET['previous'])
{
$rrd_options .= " DEF:".$in."octets" . $i . "X=".$rrd['filename'].":".$ds_in.":AVERAGE:start=".$prev_from.":end=".$from;
$rrd_options .= " DEF:".$out."octets" . $i . "X=".$rrd['filename'].":".$ds_out.":AVERAGE:start=".$prev_from.":end=".$from;
$rrd_options .= " SHIFT:".$in."octets" . $i . "X:$period";
$rrd_options .= " SHIFT:".$out."octets" . $i . "X:$period";
$in_thingX .= $seperatorX . "inoctets" . $i . "X,UN,0," . "inoctets" . $i . "X,IF";
$out_thingX .= $seperatorX . "outoctets" . $i . "X,UN,0," . "outoctets" . $i . "X,IF";
$rrd_options .= " DEF:inB" . $i . "X=".$rrd['filename'].":".$ds_in.":AVERAGE:start=".$prev_from.":end=".$from;
$rrd_options .= " DEF:outB" . $i . "X=".$rrd['filename'].":".$ds_out.":AVERAGE:start=".$prev_from.":end=".$from;
$rrd_options .= " SHIFT:inB" . $i . "X:$period";
$rrd_options .= " SHIFT:outB" . $i . "X:$period";
$in_thingX .= $seperatorX . "inB" . $i . "X,UN,0," . "inB" . $i . "X,IF";
$out_thingX .= $seperatorX . "outB" . $i . "X,UN,0," . "outB" . $i . "X,IF";
$plusesX .= $plusX;
$seperatorX = ",";
$plusX = ",+";
@ -50,53 +51,133 @@ foreach ($rrd_list as $rrd)
if (!$args['nototal'])
{
$rrd_options .= " VDEF:totin".$i."=inB".$i.",TOTAL";
$rrd_options .= " VDEF:totout".$i."=outB".$i.",TOTAL";
$in_thing .= $seperator . "inB" . $i . ",UN,0," . "inB" . $i . ",IF";
$out_thing .= $seperator . "outB" . $i . ",UN,0," . "outB" . $i . ",IF";
$pluses .= $plus;
$seperator = ",";
$plus = ",+";
$rrd_options .= " VDEF:totinB".$i."=inB".$i.",TOTAL";
$rrd_options .= " VDEF:totoutB".$i."=outB".$i.",TOTAL";
$rrd_options .= " VDEF:tot".$i."=octets".$i.",TOTAL";
}
if ($i) { $stack="STACK"; }
$rrd_options .= " AREA:inB".$i."#" . $colour_in . ":'" . substr(str_pad($rrd['descr'], 10),0,10) . "In ':$stack";
$rrd_options .= " GPRINT:inB".$i.":LAST:%6.2lf%s";
$rrd_options .= " GPRINT:inB".$i.":AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:inB".$i.":MAX:%6.2lf%s";
$rrd_options .= " AREA:inbits".$i."#" . $colour_in . ":'" . substr(str_pad($rrd['descr'], 10),0,10) . "In ':$stack";
$rrd_options .= " GPRINT:inbits".$i.":LAST:%6.2lf%s";
$rrd_options .= " GPRINT:inbits".$i.":AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:inbits".$i.":MAX:%6.2lf%s";
if (!$nototal) { $rrd_options .= " GPRINT:totin".$i.":%6.2lf%s$total_units"; }
if (!$nototal) { $rrd_options .= " GPRINT:totinB".$i.":%6.2lf%s$total_units"; }
$rrd_options .= " COMMENT:'\\n'";
$rrd_optionsb .= " AREA:outB".$i."_neg#" . $colour_out . "::$stack";
$rrd_optionsb .= " AREA:outbits".$i."_neg#" . $colour_out . "::$stack";
$rrd_options .= " HRULE:999999999999999#" . $colour_out . ":'" . substr(str_pad('', 10),0,10) . "Out':";
$rrd_options .= " GPRINT:outB".$i.":LAST:%6.2lf%s";
$rrd_options .= " GPRINT:outB".$i.":AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:outB".$i.":MAX:%6.2lf%s";
$rrd_options .= " GPRINT:outbits".$i.":LAST:%6.2lf%s";
$rrd_options .= " GPRINT:outbits".$i.":AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:outbits".$i.":MAX:%6.2lf%s";
if (!$nototal) { $rrd_options .= " GPRINT:totout".$i.":%6.2lf%s$total_unit"; }
if (!$nototal) { $rrd_options .= " GPRINT:totoutB".$i.":%6.2lf%s$total_units"; }
$rrd_options .= " COMMENT:'\\n'";
$i++; $iter++;
}
if ($_GET['previous'] == "yes")
{
$rrd_options .= " CDEF:".$in."octetsX=" . $in_thingX . $plusesX;
$rrd_options .= " CDEF:".$out."octetsX=" . $out_thingX . $plusesX;
$rrd_options .= " CDEF:doutoctetsX=outoctetsX,-1,*";
$rrd_options .= " CDEF:inbitsX=inoctetsX,8,*";
$rrd_options .= " CDEF:outbitsX=outoctetsX,8,*";
$rrd_options .= " CDEF:doutbitsX=doutoctetsX,8,*";
$rrd_options .= " VDEF:95thinX=inbitsX,95,PERCENT";
$rrd_options .= " VDEF:95thoutX=outbitsX,95,PERCENT";
$rrd_options .= " VDEF:d95thoutX=doutbitsX,5,PERCENT";
}
if ($_GET['previous'] == "yes")
{
$rrd_options .= " CDEF:inBX=" . $in_thingX . $plusesX;
$rrd_options .= " CDEF:outBX=" . $out_thingX . $plusesX;
$rrd_options .= " CDEF:octetsX=inBX,outBX,+";
$rrd_options .= " CDEF:doutBX=outBX,-1,*";
$rrd_options .= " CDEF:inbitsX=inBX,8,*";
$rrd_options .= " CDEF:outbitsX=outBX,8,*";
$rrd_options .= " CDEF:bitsX=inbitsX,outbitsX,+";
$rrd_options .= " CDEF:doutbitsX=doutBX,8,*";
$rrd_options .= " VDEF:95thinX=inbitsX,95,PERCENT";
$rrd_options .= " VDEF:95thoutX=outbitsX,95,PERCENT";
$rrd_options .= " VDEF:d95thoutX=doutbitsX,5,PERCENT";
}
if ($_GET['previous'] == "yes")
{
$rrd_options .= " AREA:in".$format."X#99999999:";
$rrd_options .= " AREA:dout".$format."X#99999999:";
$rrd_options .= " LINE1.25:in".$format."X#666666:";
$rrd_options .= " LINE1.25:dout".$format."X#666666:";
}
if ($_GET['previous'] == "yes")
{
$rrd_options .= " AREA:in".$format."X#99999999:";
$rrd_optionsb .= " AREA:dout".$format."X#99999999:";
$rrd_options .= " LINE1.25:in".$format."X#666666:";
$rrd_optionsb .= " LINE1.25:dout".$format."X#666666:";
}
if (!$args['nototal'])
{
$rrd_options .= " CDEF:inB=" . $in_thing . $pluses;
$rrd_options .= " CDEF:outB=" . $out_thing . $pluses;
$rrd_options .= " CDEF:octets=inB,outB,+";
$rrd_options .= " CDEF:doutB=outB,-1,*";
$rrd_options .= " CDEF:inbits=inB,8,*";
$rrd_options .= " CDEF:outbits=outB,8,*";
$rrd_options .= " CDEF:bits=inbits,outbits,+";
$rrd_options .= " CDEF:doutbits=doutB,8,*";
$rrd_options .= " VDEF:95thin=inbits,95,PERCENT";
$rrd_options .= " VDEF:95thout=outbits,95,PERCENT";
$rrd_options .= " VDEF:d95thout=doutbits,5,PERCENT";
$rrd_options .= " VDEF:totin=inB,TOTAL";
$rrd_options .= " VDEF:avein=inbits,AVERAGE";
$rrd_options .= " VDEF:totout=outB,TOTAL";
$rrd_options .= " VDEF:aveout=outbits,AVERAGE";
$rrd_options .= " VDEF:tot=octets,TOTAL";
$rrd_options .= " COMMENT:' \\n'";
$rrd_options .= " HRULE:999999999999999#FFFFFF:'" . substr(str_pad('Total', 10),0,10) . "In ':";
$rrd_options .= " GPRINT:inbits:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:inbits:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:inbits:MAX:%6.2lf%s";
$rrd_options .= " GPRINT:totin:%6.2lf%s$total_units";
$rrd_options .= " COMMENT:'\\n'";
$rrd_options .= " HRULE:999999999999990#FFFFFF:'" . substr(str_pad('', 10),0,10) . "Out':";
$rrd_options .= " GPRINT:outbits:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:outbits:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:outbits:MAX:%6.2lf%s";
$rrd_options .= " GPRINT:totout:%6.2lf%s$total_units";
$rrd_options .= " COMMENT:'\\n'";
$rrd_options .= " HRULE:999999999999990#FFFFFF:'" . substr(str_pad('', 10),0,10) . "Agg':";
$rrd_options .= " GPRINT:bits:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:bits:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:bits:MAX:%6.2lf%s";
$rrd_options .= " GPRINT:tot:%6.2lf%s$total_units";
$rrd_options .= " COMMENT:'\\n'";
}
if (!$args['nototal'] && $_GET['previous'] == "yes")
{
$rrd_options .= " VDEF:totinX=inBX,TOTAL";
$rrd_options .= " VDEF:totoutX=outBX,TOTAL";
$rrd_options .= " VDEF:totX=octetsX,TOTAL";
$rrd_options .= " COMMENT:' \\n'";
$rrd_options .= " HRULE:999999999999999#aaaaaa:'" . substr(str_pad('Total', 10),0,10) . "In ':";
$rrd_options .= " GPRINT:inbitsX:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:inbitsX:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:inbitsX:MAX:%6.2lf%s";
$rrd_options .= " GPRINT:totinX:%6.2lf%s$total_units";
$rrd_options .= " COMMENT:'\\n'";
$rrd_options .= " HRULE:999999999999990#aaaaaa:'" . substr(str_pad('', 10),0,10) . "Out':";
$rrd_options .= " GPRINT:outbitsX:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:outbitsX:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:outbitsX:MAX:%6.2lf%s";
$rrd_options .= " GPRINT:totoutX:%6.2lf%s$total_units";
$rrd_options .= " COMMENT:'\\n'";
$rrd_options .= " HRULE:999999999999990#aaaaaa:'" . substr(str_pad('', 10),0,10) . "Agg':";
$rrd_options .= " GPRINT:bitsX:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:bitsX:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:bitsX:MAX:%6.2lf%s";
$rrd_options .= " GPRINT:totX:%6.2lf%s$total_units";
$rrd_options .= " COMMENT:'\\n'";
}
$rrd_options .= $rrd_optionsb;
$rrd_options .= " HRULE:0#999999";

2
html/includes/graphs/mempool/auth.inc.php
View File

@ -7,7 +7,7 @@ if (is_numeric($id))
if (is_numeric($mempool['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($mempool['device_id'])))
{
$device = device_by_id_cache($mempool['device_id']);
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("mempoolX-".$mempool['mempool_type']."-".$mempool['mempool_index'].".rrd");
$rrd_filename = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("mempool-".$mempool['mempool_type']."-".$mempool['mempool_index'].".rrd");
$title = generate_device_link($device);
$title .= " :: Memory Pool :: " . htmlentities($mempool['mempool_descr']);
$auth = TRUE;

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

@ -7,7 +7,7 @@ if (is_numeric($id))
if (is_numeric($storage['device_id']) && ($config['allow_unauth_graphs'] || device_permitted($storage['device_id'])))
{
$device = device_by_id_cache($storage['device_id']);
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("storageX-" . $storage['storage_mib'] . "-" . $storage['storage_descr'] . ".rrd");
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("storage-" . $storage['storage_mib'] . "-" . $storage['storage_descr'] . ".rrd");
$title = generate_device_link($device);
$title .= " :: Storage :: " . htmlentities($storage['storage_descr']);

5
includes/defaults.inc.php
View File

@ -113,7 +113,10 @@ $config['ports_page_default'] = "details"; ## eg "details" or "basic"
$config['snmp']['community'][0] = "public"; # Communities to try during adding hosts and discovery
$config['snmp']['transports'] = array('udp', 'udp6', 'tcp', 'tcp6');
### RRD Settings
### RRD Format Settings
### These should not normally be changed
### Though one could conceivably increase or decrease the size of each RRA if one had performance problems
### Or if one had a very fast I/O subsystem with no performance worries.
$config['rrd_rra'] = " RRA:AVERAGE:0.5:1:2016 RRA:AVERAGE:0.5:6:1440 RRA:AVERAGE:0.5:24:1440 RRA:AVERAGE:0.5:288:1440 ";
$config['rrd_rra'] .= " RRA:MIN:0.5:6:1440 RRA:MIN:0.5:24:775 RRA:MIN:0.5:288:797 ";

6
includes/polling/mempools.inc.php
View File

@ -4,7 +4,7 @@ foreach (dbFetchRows("SELECT * FROM mempools WHERE device_id = ?", array($device
{
echo("Mempool ". $mempool['mempool_descr'] . ": ");
$mempool_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("mempoolX-" . $mempool['mempool_type'] . "-" . $mempool['mempool_index'] . ".rrd");
$mempool_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("mempool-" . $mempool['mempool_type'] . "-" . $mempool['mempool_index'] . ".rrd");
$file = $config['install_dir']."/includes/polling/mempools/".$mempool['mempool_type'].".inc.php";
if (is_file($file))
@ -27,9 +27,9 @@ foreach (dbFetchRows("SELECT * FROM mempools WHERE device_id = ?", array($device
if (!is_file($mempool_rrd))
{
rrdtool_create($mempool_rrd, "--step 300 DS:used:GAUGE:600:0:U DS:free:GAUGE:600:0:U DS:size:GAUGE:600:0:U DS:perc:GAUGE:600:0:100 ".$config['rrd_rra']);
rrdtool_create($mempool_rrd, "--step 300 DS:used:GAUGE:600:0:U DS:free:GAUGE:600:0:U ".$config['rrd_rra']);
}
rrdtool_update($mempool_rrd,"N:".$mempool['used'].":".$mempool['free'].":".$mempool['total'].":".$percent);
rrdtool_update($mempool_rrd,"N:".$mempool['used'].":".$mempool['free']);
dbUpdate(array('mempool_used' => $mempool['used'], 'mempool_perc' => $percent, 'mempool_free' => $mempool['free'],
'mempool_total' => $mempool['total'], 'mempool_largestfree' => $mempool['largestfree'], 'mempool_lowestfree' => $mempool['lowestfree']),

6
includes/polling/storage.inc.php
View File

@ -6,11 +6,11 @@ foreach (dbFetchRows("SELECT * FROM storage WHERE device_id = ?", array($device[
{
echo("Storage ".$storage['storage_descr'] . ": ");
$storage_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("storageX-" . $storage['storage_mib'] . "-" . safename($storage['storage_descr']) . ".rrd");
$storage_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("storage-" . $storage['storage_mib'] . "-" . safename($storage['storage_descr']) . ".rrd");
if (!is_file($storage_rrd))
{
rrdtool_create($storage_rrd, "--step 300 DS:used:GAUGE:600:0:U DS:free:GAUGE:600:0:U DS:size:GAUGE:600:0:U DS:perc:GAUGE:600:0:100 ".$config['rrd_rra']);
rrdtool_create($storage_rrd, "--step 300 DS:used:GAUGE:600:0:U DS:free:GAUGE:600:0:U ".$config['rrd_rra']);
}
$file = $config['install_dir']."/includes/polling/storage-".$storage['storage_mib'].".inc.php";
@ -34,7 +34,7 @@ foreach (dbFetchRows("SELECT * FROM storage WHERE device_id = ?", array($device[
echo($percent."% ");
rrdtool_update($storage_rrd,"N:".$storage['used'].":".$storage['free'].":".$storage['size'].":".$percent);
rrdtool_update($storage_rrd,"N:".$storage['used'].":".$storage['free']);
$update = dbUpdate(array('storage_used' => $storage['used'], 'storage_free' => $storage['free'], 'storage_size' => $storage['size'], 'storage_units' => $storage['units'], 'storage_perc' => $percent),
'storage', '`storage_id` = ?', array($storage['storage_id']));