mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
fix memory graphs on health, add headers to memory and processor, make health menu entries singular
git-svn-id: http://www.observium.org/svn/observer/trunk@2077 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
@ -206,16 +206,16 @@ if ($deleted_ports) { echo('<li><a href="ports/deleted/"><img src="images/16/cro
|
||||
<!--[if IE 7]><!--></a><!--<![endif]-->
|
||||
<table><tr><td>
|
||||
<ul>
|
||||
<li><a href="health/processors/"><img src="images/icons/processor.png" border="0" align="absmiddle" /> Processors</a></li>
|
||||
<li><a href="health/memory/"><img src="images/icons/memory.png" border="0" align="absmiddle" /> Memory</a></li>
|
||||
<li><a href="health/processor/"><img src="images/icons/processor.png" border="0" align="absmiddle" /> Processor</a></li>
|
||||
<li><a href="health/mempool/"><img src="images/icons/memory.png" border="0" align="absmiddle" /> Memory</a></li>
|
||||
<li><a href="health/storage/"><img src="images/icons/storage.png" border="0" align="absmiddle" /> Storage</a></li>
|
||||
<li><hr width=140 /></li>
|
||||
<li><a href="health/temperature/"><img src="images/icons/temperature.png" border="0" align="absmiddle" /> Temperatures</a></li>
|
||||
<li><a href="health/temperature/"><img src="images/icons/temperature.png" border="0" align="absmiddle" /> Temperature</a></li>
|
||||
<li><a href="health/humidity/"><img src="images/icons/humidity.png" border="0" align="absmiddle" /> Humidity</a></li>
|
||||
<li><a href="health/fanspeed/"><img src="images/icons/fanspeed.png" border="0" align="absmiddle" /> Fans</a></li>
|
||||
<li><a href="health/fanspeed/"><img src="images/icons/fanspeed.png" border="0" align="absmiddle" /> Fanspeed</a></li>
|
||||
<li><hr width=140 /></li>
|
||||
<li><a href="health/voltage/"><img src="images/icons/voltage.png" border="0" align="absmiddle" /> Voltages</a></li>
|
||||
<li><a href="health/frequency/"><img src="images/icons/frequency.png" border="0" align="absmiddle" /> Frequencies</a></li>
|
||||
<li><a href="health/voltage/"><img src="images/icons/voltage.png" border="0" align="absmiddle" /> Voltage</a></li>
|
||||
<li><a href="health/frequency/"><img src="images/icons/frequency.png" border="0" align="absmiddle" /> Frequency</a></li>
|
||||
<li><a href="health/current/"><img src="images/icons/current.png" border="0" align="absmiddle" /> Current</a></li>
|
||||
</ul>
|
||||
</td></tr></table>
|
||||
|
@ -73,7 +73,7 @@ print_optionbar_end();
|
||||
switch ($_GET['opta'])
|
||||
{
|
||||
case 'processor':
|
||||
case 'memory':
|
||||
case 'mempool':
|
||||
case 'storage':
|
||||
case 'temperature':
|
||||
case 'humidity':
|
||||
|
@ -4,6 +4,15 @@ $graph_type = "mempool_usage";
|
||||
|
||||
echo("<div style='margin-top: 5px; padding: 0px;'>");
|
||||
echo("<table width=100% cellpadding=6 cellspacing=0>");
|
||||
|
||||
echo("<tr class=tablehead>
|
||||
<th width=280>Device</th>
|
||||
<th>Memory</th>
|
||||
<th width=100></th>
|
||||
<th width=280>Usage</th>
|
||||
<th width=50>Used</th>
|
||||
</tr>");
|
||||
|
||||
$i = '1';
|
||||
$mempools = mysql_query("SELECT * FROM `mempools` AS M, `devices` as D WHERE D.device_id = M.device_id ORDER BY D.hostname");
|
||||
while ($mempool = mysql_fetch_assoc($mempools))
|
||||
|
@ -4,6 +4,14 @@ $graph_type = "processor_usage";
|
||||
|
||||
echo("<div style='margin-top: 5px; padding: 0px;'>");
|
||||
echo(" <table width=100% cellpadding=6 cellspacing=0>");
|
||||
|
||||
echo("<tr class=tablehead>
|
||||
<th width=280>Device</th>
|
||||
<th>Processor</th>
|
||||
<th width=100></th>
|
||||
<th width=280>Usage</th>
|
||||
</tr>");
|
||||
|
||||
$i = '1';
|
||||
$procs = mysql_query("SELECT * FROM `processors` AS P, `devices` AS D WHERE D.device_id = P.device_id ORDER BY D.hostname");
|
||||
while ($proc = mysql_fetch_assoc($procs))
|
||||
|
Reference in New Issue
Block a user