From 5263fa92389880af1e45bb5480290c6d27a0fcfa Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Mon, 26 Jul 2010 20:05:14 +0000 Subject: [PATCH] fix front page. fix port poller and port descr parser a little. git-svn-id: http://www.observium.org/svn/observer/trunk@1486 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/pages/front/jt.php | 36 +++++++++++++++--------------- includes/defaults.inc.php | 1 - includes/polling/ports.inc.php | 14 +++++------- includes/port-descr-parser.inc.php | 2 ++ poll-reachability.php | 1 + 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/html/pages/front/jt.php b/html/pages/front/jt.php index 20c32fffb..8fd6284f8 100644 --- a/html/pages/front/jt.php +++ b/html/pages/front/jt.php @@ -139,11 +139,11 @@ if($_SESSION['userlevel'] >= '5') if($ports['peering'] && $ports['transit']) { echo("
\ - \ + \ + \ ', CENTER, LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 150);\" onmouseout=\"return nd();\" >". "
Aggregate Internet Traffic
". - "
"); } @@ -154,22 +154,22 @@ if($_SESSION['userlevel'] >= '5') if($ports['transit']) { echo("
\ - \ + \ + \ ', CENTER, LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 150);\" onmouseout=\"return nd();\" >". "
Internet Transit
". - "
"); } if($ports['peering']) { echo("
\ - \ + \ + \ ', CENTER, LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 150);\" onmouseout=\"return nd();\" >". "
Internet Peering
". - "
"); } @@ -180,11 +180,11 @@ if($_SESSION['userlevel'] >= '5') if($ports['broadband'] && $ports['wave_broadband'] && $ports['new_broadband']) { echo("
\ - \ + \ + \ ', CENTER, LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 150);\" onmouseout=\"return nd();\" >". "
Aggregate Broadband Traffic
". - "
"); } @@ -195,11 +195,11 @@ if($_SESSION['userlevel'] >= '5') if($ports['broadband']) { echo("
\ - \ + \ + \ ', LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 150);\" onmouseout=\"return nd();\" >". "
Jersey Broadband ATM
". - "
"); } @@ -208,11 +208,11 @@ if($_SESSION['userlevel'] >= '5') if($ports['new_broadband']) { echo("
\ - \ + \ + \ ', LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 150);\" onmouseout=\"return nd();\" >". "
Jersey Broadband NGN
". - "
"); + ""); } echo(""); diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php index 07f2f5b59..d1a7f4890 100644 --- a/includes/defaults.inc.php +++ b/includes/defaults.inc.php @@ -136,7 +136,6 @@ $config['billing']['customer_autoadd'] = 0; # Enable Auto-add bill per customer $config['billing']['circuit_autoadd'] = 0; # Enable Auto-add bill per circuit_id $config['billing']['bill_autoadd'] = 0; # Enable Auto-add bill per bill_id - ### External Integration #$config['rancid_configs'] = '/var/lib/rancid/network/configs/'; diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php index 8ca7be596..66a0128ba 100755 --- a/includes/polling/ports.inc.php +++ b/includes/polling/ports.inc.php @@ -124,20 +124,18 @@ /// Parse description (usually ifAlias) if config option set - if(isset($config['port_descr_parser'])) + if(isset($config['port_descr_parser']) && is_file($config['install_dir'] . "/" . $config['port_descr_parser'])) { + $port_attribs = array('type','descr','circuit','speed','notes'); - include($config['port_descr_parser']); + include($config['install_dir'] . "/" . $config['port_descr_parser']); foreach ($port_attribs as $attrib) { $attrib_key = "port_descr_".$attrib; - if($port_ifAlias[$attrib]) + if($port_ifAlias[$attrib] != $port[$attrib_key]) { - if($port_ifAlias[$attrib] != $port[$attrib_key]) - { - $update .= ", `".$attrib_key."` = '".$port_ifAlias[$attrib]."'"; - log_event($attrib . ": ".$port[$attrib_key]." -> " . $port_ifAlias[$attrib], $device['device_id'], 'interface', $port['interface_id']); - } + $update .= ", `".$attrib_key."` = '".$port_ifAlias[$attrib]."'"; + log_event($attrib . ": ".$port[$attrib_key]." -> " . $port_ifAlias[$attrib], $device['device_id'], 'interface', $port['interface_id']); } } } diff --git a/includes/port-descr-parser.inc.php b/includes/port-descr-parser.inc.php index 3e18e02a1..d258507c1 100644 --- a/includes/port-descr-parser.inc.php +++ b/includes/port-descr-parser.inc.php @@ -14,6 +14,8 @@ $descr = trim($descr); if($type && $descr) { + + $type = strtolower($type); $port_ifAlias['type'] = $type; $port_ifAlias['descr'] = $descr; $port_ifAlias['circuit'] = $circuit; diff --git a/poll-reachability.php b/poll-reachability.php index 91a0908d4..27704a834 100755 --- a/poll-reachability.php +++ b/poll-reachability.php @@ -22,6 +22,7 @@ while ($device = mysql_fetch_array($device_query)) { if(strstr($status, "alive")) { $pos = shell_exec($config['snmpget'] . " -m SNMPv2-MIB -$snmpver -c $community -t 1 $hostname:$port sysDescr.0"); + echo($config['snmpget'] . " -m SNMPv2-MIB -$snmpver -c $community -t 1 $hostname:$port sysDescr.0"); if($pos == '') { $status='0'; } else {