enable previous period button in graph browser for all graphs. doesn't work everywhere yet. add drbd icon. add apps menu.

git-svn-id: http://www.observium.org/svn/observer/trunk@3064 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2012-04-20 10:36:59 +00:00
parent ee65ae5350
commit 483b86d92f
3 changed files with 34 additions and 5 deletions

BIN
html/images/icons/drbd.png Normal file
View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 349 B

View File

@@ -1,5 +1,7 @@
<?php
## FIXME - this could do with some performance improvements, i think. possible rearranging some tables and setting flags at poller time (nothing changes outside of then anyways)
$service_alerts = dbFetchCell("SELECT COUNT(service_id) FROM services WHERE service_status = '0'");
$if_alerts = dbFetchCell("SELECT COUNT(interface_id) FROM `ports` WHERE `ifOperStatus` = 'down' AND `ifAdminStatus` = 'up' AND `ignore` = '0'");
@@ -387,6 +389,34 @@ foreach (array_keys($menu_sensors) as $item)
<?php
$app_count = dbFetchCell("SELECT COUNT(`app_id`) FROM `applications`");
if ($_SESSION['userlevel'] >= '5' && ($app_count) > "0")
{
?>
<li><a href="apps/" class="drop"><img src="images/icons/apps.png" border="0" align="absmiddle" /> Apps</a><!-- Begin Home Item -->
<div class="dropdown_1column"><!-- Begin 1 column container -->
<ul>
<?php
$rows = dbFetchRows("SELECT `app_type` FROM `applications` GROUP BY `app_type` ORDER BY `app_type`");
foreach ($rows as $row)
{
echo('
<li><a href="applications/app='.$row['app_type'].'/"><img src="images/icons/'.$row['app_type'].'.png" border="0" align="absmiddle" /> '.$row['app_type'].' </a></li>');
}
?>
</ul>
</div>
</li>
<?php
}
$routing_count['bgp'] = dbFetchCell("SELECT COUNT(bgpPeer_id) from `bgpPeers`");
$routing_count['ospf'] = dbFetchCell("SELECT COUNT(ospf_instance_id) FROM `ospf_instances` WHERE `ospfAdminStat` = 'enabled'");
$routing_count['cef'] = dbFetchCell("SELECT COUNT(cef_switching_id) from `cef_switching`");
@@ -398,11 +428,10 @@ if ($_SESSION['userlevel'] >= '5' && ($routing_count['bgp']+$routing_count['ospf
?>
<li><a href="routing/" class="drop"><img src="images/16/arrow_branch.png" border="0" align="absmiddle" /> Routing</a><!-- Begin Home Item -->
<div class="dropdown_1column"><!-- Begin 1 column container -->
<ul>
<?php
$separator = 0;

View File

@@ -231,8 +231,8 @@ if (!$auth)
}
### FIXME : do this properly
if($type == "port" && $subtype == "bits")
{
# if($type == "port" && $subtype == "bits")
# {
echo(' | ');
if ($vars['previous'] == "yes")
{
@@ -240,7 +240,7 @@ if (!$auth)
} else {
echo(generate_link("Show Previous",$vars, array('page' => "graphs", 'previous' => "yes")));
}
}
# }
echo('<div style="float: right;">');