nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-01 00:24:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix RRD format for storage RRDS. we need to look at these rrd formats, i think, some might SUCK.

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@953 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-02-25 21:40:50 +00:00
parent 74235000be
commit 2ef0c85ffd
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/pages/device/health/storage.inc.php
+3 -3
View File
@@ -18,9 +18,9 @@ while($drive = mysql_fetch_array($query)) {
if(is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; } if(is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
$total = $drive['storage_size'] * $drive['storage_units']; $total = $drive['storage_size'];
$used = $drive['storage_used'] * $drive['storage_units']; $used = $drive['storage_used'];
$free = $total - $drive['storage_used'] * $drive['storage_units']; $free = $drive['storage_free'];
$perc = round($drive['storage_perc'], 0); $perc = round($drive['storage_perc'], 0);
$used = formatStorage($used); $used = formatStorage($used);
$total = formatStorage($total); $total = formatStorage($total);
includes/polling/storage.inc.php
+2 -2
View File
@@ -12,8 +12,8 @@ while($storage = mysql_fetch_array($storage_data)) {
if (!is_file($storage_rrd)) { if (!is_file($storage_rrd)) {
rrdtool_create($storage_rrd, "--step 300 \ rrdtool_create($storage_rrd, "--step 300 \
DS:used:GAUGE:600:-273:100000000000 \ DS:used:GAUGE:600:0:U \
DS:free:GAUGE:600:-273:100000000000 \ DS:free:GAUGE:600:0:U \
RRA:AVERAGE:0.5:1:600 \ RRA:AVERAGE:0.5:1:600 \
RRA:AVERAGE:0.5:6:700 \ RRA:AVERAGE:0.5:6:700 \
RRA:AVERAGE:0.5:24:775 \ RRA:AVERAGE:0.5:24:775 \
includes/rrdtool.inc.php
+1 -1
View File
@@ -33,7 +33,7 @@ function rrdtool_lastupdate($rrdfile, $rrdupdate)
function rrdtool($command, $file, $options) function rrdtool($command, $file, $options)
{ {
global $config; global $debug; global $config; global $debug;
if ($config['debug']) { echo($config['rrdtool'] . " $command $file $options \n"); } if ($debug) { echo($config['rrdtool'] . " $command $file $options \n"); }
return shell_exec($config['rrdtool'] . " $command $file $options"); return shell_exec($config['rrdtool'] . " $command $file $options");
} }