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

move percentage colour mappings to function. make graphs for memory/storage match percentage colours (should we do this for others?)

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2160 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong 2011-04-25 17:15:36 +00:00
parent e5fe2fb0ec
commit efd9d30ee7
18 changed files with 82 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
database-update.sql
View File

@ -37,3 +37,4 @@ ALTER TABLE `mac_accounting` CHANGE `peer_mac` `mac` VARCHAR( 32 ) CHARACTER
ALTER TABLE `mac_accounting` DROP `peer_ip`, DROP `peer_desc`, DROP `peer_asn`;
UPDATE sensors SET sensor_class='frequency' WHERE sensor_class='freq';
ALTER TABLE `cef_switching` ADD `cef_switching_id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST;
ALTER TABLE `mempools` ADD `mempool_perc` INT NOT NULL AFTER `device_id`;

15
html/includes/functions.inc.php
View File

@ -1,5 +1,18 @@
<?php
function get_percentage_colours($percentage)
{
if ($percentage > '90') { $background['left']='c4323f'; $background['right']='C96A73'; }
elseif ($percentage > '75') { $background['left']='bf5d5b'; $background['right']='d39392'; }
elseif ($percentage > '50') { $background['left']='bf875b'; $background['right']='d3ae92'; }
elseif ($percentage > '25') { $background['left']='5b93bf'; $background['right']='92b7d3'; }
else { $background['left']='9abf5b'; $background['right']='bbd392'; }
return($background);
}
function generate_device_link($device, $text=0, $linksuffix="", $start=0, $end=0)
{
global $twoday, $day, $now, $config;
@ -388,4 +401,4 @@ function getlocations()
return $locations;
}
?>
?>

28
html/includes/graphs/mempool/usage.inc.php
View File

@ -8,21 +8,23 @@ $iter = "1";
$rrd_options .= " COMMENT:' Used\\n'";
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); }
$colour="CC0000";
$colour_area="ffaaaa";
$descr = substr(str_pad(short_hrDeviceDescr($mempool['mempool_descr']), 24),0,24);
$descr = str_replace(":", "\:", $descr);
$rrd_options .= " DEF:mempoolfree=$rrd_filename:free:AVERAGE ";
$rrd_options .= " DEF:mempoolused=$rrd_filename:used:AVERAGE ";
$rrd_options .= " CDEF:mempooltotal=mempoolused,mempoolfree,+ ";
$rrd_options .= " CDEF:mempoolperc=mempoolused,mempoolused,mempoolfree,+,/,100,* ";
$rrd_options .= " LINE1:mempoolperc#" . $colour . ":'" . $descr . "' ";
$rrd_options .= " GPRINT:mempoolused:LAST:%6.2lf%sB";
#$rrd_options .= " GPRINT:mempooltotal:LAST:%6.2lf%sB";
$rrd_options .= " GPRINT:mempoolperc:LAST:%3.0lf%%\\\\n";
#$rrd_options .= " GPRINT:mempoolperc:MAX:%3.0lf";
$perc = round($mempool['mempool_perc'], 0);
$background = get_percentage_colours($perc);
?>
$rrd_options .= " DEF:$mempool[mempool_id]used=$rrd_filename:used:AVERAGE";
$rrd_options .= " DEF:$mempool[mempool_id]free=$rrd_filename:free:AVERAGE";
$rrd_options .= " CDEF:$mempool[mempool_id]size=$mempool[mempool_id]used,$mempool[mempool_id]free,+";
$rrd_options .= " CDEF:$mempool[mempool_id]perc=$mempool[mempool_id]used,$mempool[mempool_id]size,/,100,*";
$rrd_options .= " AREA:$mempool[mempool_id]perc#" . $background['right'] . ":";
$rrd_options .= " LINE1.25:$mempool[mempool_id]perc#" . $background['left'] . ":'$descr'";
$rrd_options .= " GPRINT:$mempool[mempool_id]size:LAST:%6.2lf%sB";
$rrd_options .= " GPRINT:$mempool[mempool_id]free:LAST:%6.2lf%sB";
$rrd_options .= " GPRINT:$mempool[mempool_id]perc:LAST:%5.2lf%%\\\\n";
?>

15
html/includes/graphs/storage/usage.inc.php
View File

@ -13,21 +13,24 @@ $rrd_options .= " COMMENT:' Size Free % Used\\n'";
$hostname = gethostbyid($storage['device_id']);
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"; $iter = "0"; }
$colour="CC0000";
$colour_area="ffaaaa";
$descr = substr(str_pad($storage[storage_descr], 12),0,12);
$descr = str_replace(":","\:",$descr);
$percentage = round($storage['storage_perc'], 0);
$background = get_percentage_colours($percentage);
$rrd_options .= " DEF:$storage[storage_id]used=$rrd_filename:used:AVERAGE";
$rrd_options .= " DEF:$storage[storage_id]free=$rrd_filename:free:AVERAGE";
$rrd_options .= " CDEF:$storage[storage_id]size=$storage[storage_id]used,$storage[storage_id]free,+";
$rrd_options .= " CDEF:$storage[storage_id]perc=$storage[storage_id]used,$storage[storage_id]size,/,100,*";
$rrd_options .= " LINE1.25:$storage[storage_id]perc#" . $colour . ":'$descr'";
$rrd_options .= " AREA:$storage[storage_id]perc#" . $background['right'] . ":";
$rrd_options .= " LINE1.25:$storage[storage_id]perc#" . $background['left'] . ":'$descr'";
$rrd_options .= " GPRINT:$storage[storage_id]size:LAST:%6.2lf%sB";
$rrd_options .= " GPRINT:$storage[storage_id]free:LAST:%6.2lf%sB";
$rrd_options .= " GPRINT:$storage[storage_id]perc:LAST:%5.2lf%%\\\\n";
$iter++;
?>
?>

9
html/pages/bill.inc.php
View File

@ -127,12 +127,9 @@ if (bill_permitted($bill_id))
<br />Transferred ".formatStorage($total_data * 1024 * 1024)." of ".formatStorage($bill_data['bill_gb'] * 1024 * 1024 * 1024)." (".$percent."%)
<br />Average rate " . formatRates($rate_average * 1000));
if ($percent > 100) { $perc = "100"; } else { $perc = $percent; }
if ($perc > '90') { $left_background='c4323f'; $right_background='C96A73';
} elseif ($perc > '75') { $left_background='bf5d5b'; $right_background='d39392';
} elseif ($perc > '50') { $left_background='bf875b'; $right_background='d3ae92';
} elseif ($perc > '25') { $left_background='5b93bf'; $right_background='92b7d3';
} else { $left_background='9abf5b'; $right_background='bbd392'; }
$background = get_percentage_colours($percent);
$right_background = $background['right'];
$left_background = $background['left'];
echo("<p>".print_percentage_bar (350, 20, $perc, NULL, "ffffff", $left_background, $percent . "%", "ffffff", $right_background)."</p>");

13
html/pages/bills.inc.php
View File

@ -153,12 +153,9 @@ if ($_GET['opta'] == "add")
$percent = round(($rate_data['total_data'] / ($bill['bill_gb'] * 1024)) * 100,2);
}
if ($percent > 100) { $perc = "100"; } else { $perc = $percent; }
if ($perc > '90') { $left_background='c4323f'; $right_background='C96A73'; }
elseif ($perc > '75') { $left_background='bf5d5b'; $right_background='d39392'; }
elseif ($perc > '50') { $left_background='bf875b'; $right_background='d3ae92'; }
elseif ($perc > '25') { $left_background='5b93bf'; $right_background='92b7d3'; }
else { $left_background='9abf5b'; $right_background='bbd392'; }
$background = get_percentage_colours($percent);
$right_background = $background['right'];
$left_background = $background['left'];
if (!is_integer($i/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
echo("
@ -169,7 +166,7 @@ if ($_GET['opta'] == "add")
<td>$type</td>
<td>$allowed</td>
<td>$used</td>
<td width=370>".print_percentage_bar (350, 20, $perc, NULL, "ffffff", $left_background, $percent . "%", "ffffff", $right_background)."</td>
<td width=370>".print_percentage_bar (350, 20, $perc, NULL, "ffffff", $background['left'], $percent . "%", "ffffff", $background['right'])."</td>
<td width=60><a href='bill/".$bill['bill_id']."/edit/'><img src='images/16/wrench.png' align=absmiddle alt='Edit'> Edit</a></td>
</tr>
");
@ -181,4 +178,4 @@ if ($_GET['opta'] == "add")
echo("</td></tr></table>");
?>
?>

8
html/pages/device/health/diskio.inc.php
View File

@ -24,12 +24,6 @@ while ($drive = mysql_fetch_assoc($query))
$fs_popup .= "</div><img src=\'graph.php?id=" . $drive['diskio_id'] . "&amp;type=diskio_ops&amp;from=$month&amp;to=$now&amp;width=400&amp;height=125\'>";
$fs_popup .= "', RIGHT, FGCOLOR, '#e5e5e5');\" onmouseout=\"return nd();\"";
if ($perc > '90') { $left_background='c4323f'; $right_background='C96A73'; }
elseif ($perc > '75') { $left_background='bf5d5b'; $right_background='d39392'; }
elseif ($perc > '50') { $left_background='bf875b'; $right_background='d3ae92'; }
elseif ($perc > '25') { $left_background='5b93bf'; $right_background='92b7d3'; }
else { $left_background='9abf5b'; $right_background='bbd392'; }
echo("<tr bgcolor='$row_colour'><th><a href='$fs_url' $fs_popup>" . $drive['diskio_descr'] . "</a></td></tr>");
$types = array("diskio_bits", "diskio_ops");
@ -51,4 +45,4 @@ while ($drive = mysql_fetch_assoc($query))
echo("</table>");
?>
?>

10
html/pages/device/health/mempool.inc.php
View File

@ -27,11 +27,9 @@ while ($mempool = mysql_fetch_assoc($mempools))
$perc = round($mempool['mempool_used'] / $mempool['mempool_total'] * 100);
if ($perc > '90') { $left_background='c4323f'; $right_background='C96A73'; }
elseif ($perc > '75') { $left_background='bf5d5b'; $right_background='d39392'; }
elseif ($perc > '50') { $left_background='bf875b'; $right_background='d3ae92'; }
elseif ($perc > '25') { $left_background='5b93bf'; $right_background='92b7d3'; }
else { $left_background='9abf5b'; $right_background='bbd392'; }
$background = get_percentage_colours($percent);
$right_background = $background['right'];
$left_background = $background['left'];
echo("<tr bgcolor=$row_colour><td class=tablehead><a href='".$mempool_url."' $mempool_popup>" . $text_descr . "</a></td>
<td width=90><a href='".$mempool_url."' $mempool_popup><img src='$mini_url'></a></td>
@ -56,4 +54,4 @@ while ($mempool = mysql_fetch_assoc($mempools))
echo("</table>");
echo("</div>");
?>
?>

12
html/pages/device/health/processor.inc.php
View File

@ -21,19 +21,15 @@ while ($proc = mysql_fetch_assoc($procs))
$proc_popup .= "</div><img src=\'graph.php?id=" . $proc['processor_id'] . "&amp;type=".$graph_type."&amp;from=$month&amp;to=$now&amp;width=400&amp;height=125\'>";
$proc_popup .= "', RIGHT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"";
$perc = round($proc['processor_usage']);
$percent = round($proc['processor_usage']);
if ($perc > '90') { $left_background='c4323f'; $right_background='C96A73';
} elseif ($perc > '75') { $left_background='bf5d5b'; $right_background='d39392';
} elseif ($perc > '50') { $left_background='bf875b'; $right_background='d3ae92';
} elseif ($perc > '25') { $left_background='5b93bf'; $right_background='92b7d3';
} else { $left_background='9abf5b'; $right_background='bbd392'; }
$background = get_percentage_colours($percent);
echo("<tr bgcolor=$row_colour>
<td class=tablehead><a href='".$proc_url."' $proc_popup>" . $text_descr . "</a></td>
<td width=90><a href='".$proc_url."' $proc_popup><img src='$mini_url'></a></td>
<td width=200><a href='".$proc_url."' $proc_popup>
".print_percentage_bar (400, 20, $perc, $perc."%", "ffffff", $left_background, (100 - $perc)."%" , "ffffff", $right_background)."
".print_percentage_bar (400, 20, $percent, $percent."%", "ffffff", $background['left'], (100 - $percent)."%" , "ffffff", $background['right'])."
</a></td>
</tr>");
@ -48,4 +44,4 @@ while ($proc = mysql_fetch_assoc($procs))
echo("</table>");
echo("</div>");
?>
?>

10
html/pages/device/health/storage.inc.php
View File

@ -34,14 +34,10 @@ while ($drive = mysql_fetch_assoc($query))
$fs_popup .= "</div><img src=\'graph.php?id=" . $drive['storage_id'] . "&amp;type=".$graph_type."&amp;from=$month&amp;to=$now&amp;width=400&amp;height=125\'>";
$fs_popup .= "', RIGHT, FGCOLOR, '#e5e5e5');\" onmouseout=\"return nd();\"";
if ($perc > '90') { $left_background='c4323f'; $right_background='C96A73'; }
elseif ($perc > '75') { $left_background='bf5d5b'; $right_background='d39392'; }
elseif ($perc > '50') { $left_background='bf875b'; $right_background='d3ae92'; }
elseif ($perc > '25') { $left_background='5b93bf'; $right_background='92b7d3'; }
else { $left_background='9abf5b'; $right_background='bbd392'; }
$background = get_percentage_colours($percent);
echo("<tr bgcolor='$row_colour'><th><a href='$fs_url' $fs_popup>" . $drive['storage_descr'] . "</a></td><td>
<a href='$fs_url' $fs_popup>".print_percentage_bar (400, 20, $perc, "$used / $total", "ffffff", $left_background, $perc . "%", "ffffff", $right_background)."</a>
<a href='$fs_url' $fs_popup>".print_percentage_bar (400, 20, $perc, "$used / $total", "ffffff", $background['left'], $perc . "%", "ffffff", $background['right'])."</a>
</td><td>" . $free . "</td><td></td></tr>");
$graph_array['id'] = $drive['storage_id'];
@ -58,4 +54,4 @@ while ($drive = mysql_fetch_assoc($query))
echo("</table>");
?>
?>

10
html/pages/device/overview/mempools.inc.php
View File

@ -15,7 +15,7 @@ if (mysql_result(mysql_query("SELECT count(*) from mempools WHERE device_id = '"
while ($mempool = mysql_fetch_assoc($mempools))
{
if (is_integer($mempool_rows/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
$perc = round($mempool['mempool_used'] / ($mempool['mempool_total']) * 100,2);
$perc = round($mempool['mempool_perc'],0);
$text_descr = rewrite_entity_descr($mempool['mempool_descr']);
@ -30,16 +30,12 @@ if (mysql_result(mysql_query("SELECT count(*) from mempools WHERE device_id = '"
$used = formatStorage($mempool['mempool_used']);
$free = formatStorage($mempool['mempool_free']);
if ($perc > '90') { $left_background='c4323f'; $right_background='C96A73'; }
elseif ($perc > '75') { $left_background='bf5d5b'; $right_background='d39392'; }
elseif ($perc > '50') { $left_background='bf875b'; $right_background='d3ae92'; }
elseif ($perc > '25') { $left_background='5b93bf'; $right_background='92b7d3'; }
else { $left_background='9abf5b'; $right_background='bbd392'; }
$background = get_percentage_colours($perc);
echo("<tr bgcolor=$row_colour><td class=tablehead><a href='".$mempool_url."' $mempool_popup>" . $text_descr . "</a></td>
<td width=90><a href='".$mempool_url."' $mempool_popup><img src='$mini_url'></a></td>
<td width=200><a href='".$mempool_url."' $mempool_popup>
".print_percentage_bar (200, 20, $perc, "$used / $total", "ffffff", $left_background, $perc . "%", "ffffff", $right_background)."
".print_percentage_bar (200, 20, $perc, "$used / $total", "ffffff", $background['left'], $perc . "%", "ffffff", $background['right'])."
</a></td>
</tr>");

10
html/pages/device/overview/processors.inc.php
View File

@ -30,18 +30,14 @@ if (mysql_result(mysql_query("SELECT count(*) from processors WHERE device_id =
# disable short hrDeviceDescr. need to make this prettier.
#$text_descr = short_hrDeviceDescr($proc['processor_descr']);
$perc = $proc['processor_usage'];
$percent = $proc['processor_usage'];
if ($perc > '90') { $left_background='c4323f'; $right_background='C96A73'; }
elseif ($perc > '75') { $left_background='bf5d5b'; $right_background='d39392'; }
elseif ($perc > '50') { $left_background='bf875b'; $right_background='d3ae92'; }
elseif ($perc > '25') { $left_background='5b93bf'; $right_background='92b7d3'; }
else { $left_background='9abf5b'; $right_background='bbd392'; }
$background = get_percentage_colours($percent);
echo("<tr bgcolor=$row_colour><td class=tablehead><a href='".$proc_url."' $proc_popup>" . $text_descr . "</a></td>
<td width=90><a href='".$proc_url."' $proc_popup><img src='$mini_url'></a></td>
<td width=200><a href='".$proc_url."' $proc_popup>
".print_percentage_bar (200, 20, $perc, NULL, "ffffff", $left_background, $perc . "%", "ffffff", $right_background)."
".print_percentage_bar (200, 20, $percent, NULL, "ffffff", $background['left'], $percent . "%", "ffffff", $background['right'])."
</a></td>
</tr>");
$processor_rows++;

10
html/pages/device/overview/storage.inc.php
View File

@ -54,15 +54,11 @@ if (mysql_result(mysql_query("SELECT count(storage_id) from storage WHERE device
$mini_graph = $config['base_url'] . "/graph.php?id=".$drive['storage_id']."&amp;type=".$graph_type."&amp;from=".$day."&amp;to=".$now."&amp;width=80&amp;height=20&amp;bg=f4f4f4";
if ($perc > '90') { $left_background='c4323f'; $right_background='C96A73'; }
elseif ($perc > '75') { $left_background='bf5d5b'; $right_background='d39392'; }
elseif ($perc > '50') { $left_background='bf875b'; $right_background='d3ae92'; }
elseif ($perc > '25') { $left_background='5b93bf'; $right_background='92b7d3'; }
else { $left_background='9abf5b'; $right_background='bbd392'; }
$background = get_percentage_colours($perc);
echo("<tr bgcolor=$row_colour><td class=tablehead><a href='".$fs_url."' $fs_popup>" . $drive['storage_descr'] . "</a></td>
<td width=90><a href='".$fs_url."' $fs_popup><img src='$mini_graph' /></a></td>
<td width=200><a href='".$fs_url."' $fs_popup>".print_percentage_bar (200, 20, $perc, "$used / $total", "ffffff", $left_background, $perc . "%", "ffffff", $right_background)."</a></td>
<td width=200><a href='".$fs_url."' $fs_popup>".print_percentage_bar (200, 20, $perc, "$used / $total", "ffffff", $background['left'], $perc . "%", "ffffff", $background['right'])."</a></td>
</tr>");
$drive_rows++;
}
@ -73,4 +69,4 @@ if (mysql_result(mysql_query("SELECT count(storage_id) from storage WHERE device
unset ($drive_rows);
?>
?>

14
html/pages/health/mempool.inc.php
View File

@ -34,22 +34,16 @@ while ($mempool = mysql_fetch_assoc($mempools))
$used = formatStorage($mempool['mempool_used']);
$free = formatStorage($mempool['mempool_free']);
$perc = round($mempool['mempool_used'] / $mempool['mempool_total'] * 100);
if ($perc > '90') { $left_background='c4323f'; $right_background='C96A73'; }
elseif ($perc > '75') { $left_background='bf5d5b'; $right_background='d39392'; }
elseif ($perc > '50') { $left_background='bf875b'; $right_background='d3ae92'; }
elseif ($perc > '25') { $left_background='5b93bf'; $right_background='92b7d3'; }
else { $left_background='9abf5b'; $right_background='bbd392'; }
$background = get_percentage_colours($mempool['mempool_perc']);
echo("<tr bgcolor=$row_colour>
<td>".generate_device_link($mempool)."</td>
<td class=tablehead><a href='".$mempool_url."' $mempool_popup>" . $text_descr . "</a></td>
<td width=90><a href='".$mempool_url."' $mempool_popup><img src='$mini_url'></a></td>
<td width=200><a href='".$mempool_url."' $mempool_popup>
".print_percentage_bar (400, 20, $perc, "$used / $total", "ffffff", $left_background, $free , "ffffff", $right_background)."
".print_percentage_bar (400, 20, $mempool['mempool_perc'], "$used / $total", "ffffff", $background['left'], $free , "ffffff", $background['right'])."
</a></td>
<td width=50>".$perc."%</td>
<td width=50>".$mempool['mempool_perc']."%</td>
</tr>");
if ($_GET['optb'] == "graphs")
@ -86,4 +80,4 @@ while ($mempool = mysql_fetch_assoc($mempools))
echo("</table>");
echo("</div>");
?>
?>

10
html/pages/health/processor.inc.php
View File

@ -39,18 +39,14 @@ while ($proc = mysql_fetch_assoc($procs))
$perc = round($proc['processor_usage']);
if ($perc > '90') { $left_background='c4323f'; $right_background='C96A73'; }
elseif ($perc > '75') { $left_background='bf5d5b'; $right_background='d39392'; }
elseif ($perc > '50') { $left_background='bf875b'; $right_background='d3ae92'; }
elseif ($perc > '25') { $left_background='5b93bf'; $right_background='92b7d3'; }
else { $left_background='9abf5b'; $right_background='bbd392'; }
$background = get_percentage_colours($perc);
echo(" <tr bgcolor=\"$row_colour\">
<td>".generate_device_link($proc)."</td>
<td class=\"tablehead\"><a href='".$proc_url."' $proc_popup>" . $text_descr . "</a></td>
<td width=\"90\"><a href=\"".$proc_url."\" $proc_popup><img src=\"$mini_url\" /></a></td>
<td width=\"200\"><a href=\"".$proc_url."\" $proc_popup>
".print_percentage_bar (400, 20, $perc, $perc."%", "ffffff", $left_background, (100 - $perc)."%" , "ffffff", $right_background));
".print_percentage_bar (400, 20, $perc, $perc."%", "ffffff", $background['left'], (100 - $perc)."%" , "ffffff", $background['right']));
echo('</a></td>
</tr>');
@ -90,4 +86,4 @@ while ($proc = mysql_fetch_assoc($procs))
echo("</table>");
echo("</div>");
?>
?>

8
html/pages/health/storage.inc.php
View File

@ -61,16 +61,12 @@ while ($drive = mysql_fetch_assoc($query))
$mini_graph = $config['base_url'] . "/graph.php?id=".$drive['storage_id']."&amp;type=".$graph_type."&amp;from=".$day."&amp;to=".$now."&amp;width=80&amp;height=20&amp;bg=f4f4f4";
if ($perc > '90') { $left_background='c4323f'; $right_background='C96A73'; }
elseif ($perc > '75') { $left_background='bf5d5b'; $right_background='d39392'; }
elseif ($perc > '50') { $left_background='bf875b'; $right_background='d3ae92'; }
elseif ($perc > '25') { $left_background='5b93bf'; $right_background='92b7d3'; }
else { $left_background='9abf5b'; $right_background='bbd392'; }
$background = get_percentage_colours($perc);
echo("<tr bgcolor='$row_colour'><td>" . generate_device_link($drive) . "</td><td class=tablehead>" . $drive['storage_descr'] . "</td>
<td><img src='$mini_graph'></td>
<td>
<a href='#' $store_popup>".print_percentage_bar (400, 20, $perc, "$used / $total", "ffffff", $left_background, $free, "ffffff", $right_background)."</a>
<a href='#' $store_popup>".print_percentage_bar (400, 20, $perc, "$used / $total", "ffffff", $background['left'], $free, "ffffff", $background['right'])."</a>
</td><td>$perc"."%</td></tr>");
if ($_GET['optb'] == "graphs")

10
html/pages/storage.inc.php
View File

@ -65,16 +65,12 @@ while ($drive = mysql_fetch_assoc($query))
$mini_graph = $config['base_url'] . "/graph.php?id=".$drive['storage_id']."&amp;type=storage&amp;from=".$day."&amp;to=".$now."&amp;width=80&amp;height=20&amp;bg=f4f4f4";
if ($perc > '90') { $left_background='c4323f'; $right_background='C96A73'; }
elseif ($perc > '75') { $left_background='bf5d5b'; $right_background='d39392'; }
elseif ($perc > '50') { $left_background='bf875b'; $right_background='d3ae92'; }
elseif ($perc > '25') { $left_background='5b93bf'; $right_background='92b7d3'; }
else { $left_background='9abf5b'; $right_background='bbd392'; }
$background = get_percentage_colours($perc);
echo("<tr bgcolor='$row_colour'><td>" . generate_device_link($drive) . "</td><td class=tablehead>" . $drive['storage_descr'] . "</td>
<td><img src='$mini_graph'></td>
<td>
<a href='#' $store_popup>".print_percentage_bar (400, 20, $perc, "$used / $total", "ffffff", $left_background, formatStorage($free), "ffffff", $right_background)."</a>
<a href='#' $store_popup>".print_percentage_bar (400, 20, $perc, "$used / $total", "ffffff", $background['left'], formatStorage($free), "ffffff", $background['right'])."</a>
</td><td>$perc"."%</td></tr>");
$row++;
@ -82,4 +78,4 @@ while ($drive = mysql_fetch_assoc($query))
echo("</table></div>");
?>
?>

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

@ -49,6 +49,7 @@ while ($mempool = mysql_fetch_assoc($mempool_data))
rrdtool_update($mempoolrrd,"N:".$mempool['used'].":".$mempool['free']);
$update_query = "UPDATE `mempools` SET `mempool_used` = '".$mempool['used']."'";
$update_query .= ", `mempool_perc` = '".$percent."'";
$update_query .= ", `mempool_free` = '".$mempool['free']."'";
$update_query .= ", `mempool_total` = '".$mempool['total']."'";
$update_query .= ", `mempool_largestfree` = '".$mempool['largestfree']."'";
@ -63,4 +64,4 @@ while ($mempool = mysql_fetch_assoc($mempool_data))
unset($mempool_cache);
?>
?>