only display routing menu when we have routing. update readme and changelog

git-svn-id: http://www.observium.org/svn/observer/trunk@2250 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-05-05 14:23:09 +00:00
parent 65c4c63efc
commit bd56d2e3fe
3 changed files with 7 additions and 19 deletions

View File

@@ -2,8 +2,12 @@ For more granular updates check:
http://www.observium.org/websvn/listing.php?repname=observer
SVN 0.10-current
0.10.5.2248 ( 5th May 2011 )
* Improve poller/discovery
* Improve option bar option highlighting
* Add support for OSPF discovery
* Add support for CEF switching statistics
* Add support for UDP6 transport (and others) for SNMP.
* Improved Microsoft Windows detection.
* Juniper ScreenOS CPU/Memory.

11
README
View File

@@ -21,16 +21,7 @@ Introduction
Observium is an auto-discovering network monitoring system.
It's designed to be an easily-navigable interface to the health of your network.
Planned Features
----------------
* CollectD Integration * In Progress
* Full IPv6 capabilities * In Progress
* Pseudowire (MPLS/L2TP) tracking * In Progress
* MPLS IP-VPN tracking * In Progress
* 95th and metered usage tracking * In Progress
* Nagios Integration * Too scary for contemplation
It's not designed to be a Nagios replacement.
Installation
------------

View File

@@ -274,18 +274,11 @@ foreach (array_keys($menu_sensors) as $item)
<?php
$routing_count['bgp'] = mysql_result(mysql_query("SELECT COUNT(*) from `bgpPeers`"), 0);
if ($routing_count['bgp']) { $datas[] = 'bgp'; }
$routing_count['ospf'] = mysql_result(mysql_query("SELECT COUNT(*) FROM `ospf_instances` WHERE `ospfAdminStat` = 'enabled'"), 0);
if ($routing_count['ospf']) { $datas[] = 'ospf'; }
$routing_count['cef'] = mysql_result(mysql_query("SELECT COUNT(*) from `cef_switching`"), 0);
if ($routing_count['cef']) { $datas[] = 'cef'; }
$routing_count['vrf'] = @mysql_result(mysql_query("SELECT COUNT(*) from `vrfs`"), 0);
if($routing_count['vrf']) { $datas[] = 'vrf'; }
if ($_SESSION['userlevel'] >= '5')
if ($_SESSION['userlevel'] >= '5' && ($routing_count['bgp']+$routing_count['ospf']+$routing_count['cef']+$routing_count['vrf']) > "0")
{
echo('
<li><a class="menu2four" href="routing/"><img src="images/16/arrow_branch.png" border="0" align="absmiddle" /> Routing</a>