nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-12 16:06:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

tidied things

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@252 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2008-09-25 13:54:58 +00:00
parent d0f2fddd02
commit 8a059f80d3
10 changed files with 74 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/functions.php
+30 -24
View File
@@ -395,29 +395,30 @@ function humanmedia($media) {
function humanspeed($speed) {
$speed = preg_replace("/^0$/", "-", $speed);
$speed = preg_replace("/^9000$/", "9Kbps", $speed);
$speed = preg_replace("/^48000$/", "48Kbps", $speed);
$speed = preg_replace("/^56000$/", "56Kbps", $speed);
$speed = preg_replace("/^64000$/", "64Kbps", $speed);
$speed = preg_replace("/^128000$/", "128Kbps", $speed);
$speed = preg_replace("/^256000$/", "256Kbps", $speed);
$speed = preg_replace("/^448000$/", "448Kbps", $speed);
$speed = preg_replace("/^512000$/", "512Kbps", $speed);
$speed = preg_replace("/^768000$/", "768Kbps", $speed);
$speed = preg_replace("/^1024000$/", "1Mbps", $speed);
$speed = preg_replace("/^2048000$/", "2Mbps", $speed);
$speed = preg_replace("/^4192000$/", "4Mbps", $speed);
$speed = preg_replace("/^10000000$/", "10Mbps", $speed);
$speed = preg_replace("/^34000000$/", "34Mbps", $speed);
$speed = preg_replace("/^45000000$/", "45Mbps", $speed);
$speed = preg_replace("/^54000000$/", "54Mbps", $speed);
$speed = preg_replace("/^100000000$/", "100Mbps", $speed);
$speed = preg_replace("/^155000000$/", "155Mbps", $speed);
$speed = preg_replace("/^622000000$/", "622Mbps", $speed);
$speed = preg_replace("/^1000000000$/", "1Gbps", $speed);
$speed = preg_replace("/^10000000000$/", "10Gbps", $speed);
$speed = preg_replace("/^4294967295$/", "", $speed);
# $speed = preg_replace("/^0$/", "-", $speed);
# $speed = preg_replace("/^9000$/", "9Kbps", $speed);
# $speed = preg_replace("/^48000$/", "48Kbps", $speed);
# $speed = preg_replace("/^56000$/", "56Kbps", $speed);
# $speed = preg_replace("/^64000$/", "64Kbps", $speed);
# $speed = preg_replace("/^128000$/", "128Kbps", $speed);
# $speed = preg_replace("/^256000$/", "256Kbps", $speed);
# $speed = preg_replace("/^448000$/", "448Kbps", $speed);
# $speed = preg_replace("/^512000$/", "512Kbps", $speed);
# $speed = preg_replace("/^768000$/", "768Kbps", $speed);
# $speed = preg_replace("/^1024000$/", "1Mbps", $speed);
# $speed = preg_replace("/^2048000$/", "2Mbps", $speed);
# $speed = preg_replace("/^4192000$/", "4Mbps", $speed);
# $speed = preg_replace("/^10000000$/", "10Mbps", $speed);
# $speed = preg_replace("/^34000000$/", "34Mbps", $speed);
# $speed = preg_replace("/^45000000$/", "45Mbps", $speed);
# $speed = preg_replace("/^54000000$/", "54Mbps", $speed);
# $speed = preg_replace("/^100000000$/", "100Mbps", $speed);
# $speed = preg_replace("/^155000000$/", "155Mbps", $speed);
# $speed = preg_replace("/^622000000$/", "622Mbps", $speed);
# $speed = preg_replace("/^1000000000$/", "1Gbps", $speed);
# $speed = preg_replace("/^10000000000$/", "10Gbps", $speed);
# $speed = preg_replace("/^4294967295$/", "", $speed);
$speed = formatRates($speed);
if($speed == "") { $speed = "-"; }
return $speed;
}
@@ -559,6 +560,7 @@ function fixifName ($inf) {
$inf = str_replace("vlan", "Vlan", $inf);
$inf = str_replace("ether", "Ether", $inf);
$inf = str_replace("-802.1q Vlan subif", "", $inf);
$inf = str_replace("-802.1q", "", $inf);
$inf = str_replace("tunnel", "Tunnel", $inf);
$inf = str_replace("serial", "Serial", $inf);
$inf = str_replace("-aal5 layer", " aal5", $inf);
@@ -575,8 +577,10 @@ function fixifName ($inf) {
function fixIOSFeatures($features){
$features = preg_replace("/^PK9S$/", "IP w/SSH LAN Only", $features);
$features = str_replace("LANBASEK9", "Lan Base Crypto", $features);
$features = str_replace("LANBASE", "Lan Base", $features);
$features = str_replace("ADVENTERPRISEK9", "Advanced Enterprise Crypto", $features);
$features = str_replace("ADVSECURITYK9", "Advanced Security Crypto", $features);
$features = str_replace("K91P", "Provider Crypto", $features);
$features = str_replace("K4P", "Provider Crypto", $features);
@@ -584,13 +588,15 @@ function fixIOSFeatures($features){
$features = str_replace("ADVIPSERVICES", "Adv IP Services", $features);
$features = str_replace("IK9P", "IP Plus Crypto", $features);
$features = str_replace("SPSERVICESK9", "SP Services Crypto", $features);
$features = str_replace("PK9SV", "Provider Crypto", $features);
$features = preg_replace("/^PK9SV$/", "IP MPLS/IPV6 W/SSH + BGP", $features);
$features = str_replace("IS", "IP Plus", $features);
$features = str_replace("IPSERVICESK9", "IP Services Crypto", $features);
$features = str_replace("BROADBAND", "Broadband", $features);
$features = str_replace("IPBASE", "IP Base", $features);
$features = str_replace("IPSERVICE", "IP Services", $features);
$features = preg_replace("/^P$/", "Service Provider", $features);
$features = preg_replace("/^P11$/", "Broadband Router", $features);
$features = preg_replace("/^G4P5$/", "NRP", $features);
$features = str_replace("JK9S", "Enterprise Plus Crypto", $features);
$features = str_replace("IK9S", "IP Plus Crypto", $features);
$features = str_replace("I6Q4L2", "Layer 2", $features);
includes/polling/bgpPeer.inc.php
+4 -3
View File
@@ -14,10 +14,11 @@ while($peer = mysql_fetch_array($peers)) {
$peer_cmd = $config['snmpget'] . " -Ovq -" . $device['snmpver'] . " -c" . $device['community'] . " " . $device['hostname'] . " ";
$peer_cmd .= "bgpPeerState." . $peer['bgpPeerIdentifier'] . " bgpPeerAdminStatus." . $peer['bgpPeerIdentifier'] . " bgpPeerInUpdates." . $peer['bgpPeerIdentifier'] . " bgpPeerOutUpdates." . $peer['bgpPeerIdentifier'] . " bgpPeerInTotalMessages." . $peer['bgpPeerIdentifier'] . " ";
$peer_cmd .= "bgpPeerOutTotalMessages." . $peer['bgpPeerIdentifier'] . " bgpPeerFsmEstablishedTime." . $peer['bgpPeerIdentifier'] . " bgpPeerInUpdateElapsedTime." . $peer['bgpPeerIdentifier'] . "";
$peer_cmd .= "bgpPeerOutTotalMessages." . $peer['bgpPeerIdentifier'] . " bgpPeerFsmEstablishedTime." . $peer['bgpPeerIdentifier'] . " bgpPeerInUpdateElapsedTime." . $peer['bgpPeerIdentifier'] . " ";
$peer_cmd .= "bgpPeerLocalAddr." . $peer['bgpPeerIdentifier'] . "";
$peer_data = trim(`$peer_cmd`);
list($bgpPeerState, $bgpPeerAdminStatus, $bgpPeerInUpdates, $bgpPeerOutUpdates, $bgpPeerInTotalMessages, $bgpPeerOutTotalMessages, $bgpPeerFsmEstablishedTime, $bgpPeerInUpdateElapsedTime) = explode("\n", $peer_data);
list($bgpPeerState, $bgpPeerAdminStatus, $bgpPeerInUpdates, $bgpPeerOutUpdates, $bgpPeerInTotalMessages, $bgpPeerOutTotalMessages, $bgpPeerFsmEstablishedTime, $bgpPeerInUpdateElapsedTime, $bgpLocalAddr) = explode("\n", $peer_data);
$peerrrd = $rrd_dir . "/" . $device['hostname'] . "/bgp-" . $peer['bgpPeerIdentifier'] . ".rrd";
@@ -37,7 +38,7 @@ while($peer = mysql_fetch_array($peers)) {
rrdtool_update($peerrrd, "N:$bgpPeerOutUpdates:$bgpPeerInUpdates:$bgpPeerOutTotalMessages:$bgpPeerInTotalMesages:$bgpPeerFsmEstablishedTime");
$update = "UPDATE bgpPeers SET bgpPeerState = '$bgpPeerState', bgpPeerAdminStatus = '$bgpPeerAdminStatus', ";
$update .= "bgpPeerFsmEstablishedTime = '$bgpPeerFsmEstablishedTime', bgpPeerInUpdates = '$bgpPeerInUpdates' , bgpPeerOutUpdates = '$bgpPeerOutUpdates'";
$update .= "bgpPeerFsmEstablishedTime = '$bgpPeerFsmEstablishedTime', bgpPeerInUpdates = '$bgpPeerInUpdates' , bgpLocalAddr = '$bgpLocalAddr' , bgpPeerOutUpdates = '$bgpPeerOutUpdates'";
$update .= " WHERE `device_id` = '".$device['device_id']."' AND bgpPeerIdentifier = '" . $peer['bgpPeerIdentifier'] . "'";
mysql_query($update);