diff --git a/config.php.default b/config.php.default index 3f8dc2c165..fb2aa9e98f 100755 --- a/config.php.default +++ b/config.php.default @@ -52,7 +52,7 @@ $config['mono_font'] = $config['install_dir'] . "/fonts/DejaVuSansMono.ttf"; $config['favicon'] = "favicon.ico"; $config['header_color'] = "#1F334E"; -$config['page_refresh'] = "30"; ## Refresh the page every xx seconds +$config['page_refresh'] = "0"; ## Refresh the page every xx seconds $config['front_page'] = "pages/front/default.php"; $config['email_default'] = "you@yourdomain"; diff --git a/html/graph.php b/html/graph.php index 947159e0c8..a55f68560b 100644 --- a/html/graph.php +++ b/html/graph.php @@ -9,8 +9,10 @@ if($_GET['debug']) { } include("../config.php"); - include("../includes/functions.php"); + include("../includes/common.php"); + include("../includes/graphing.php"); include("includes/authenticate.inc"); + if(!$_SESSION['authenticated']) { echo("not authenticated"); exit; } if($_GET['params']) { diff --git a/includes/common.php b/includes/common.php new file mode 100644 index 0000000000..7c17d00621 --- /dev/null +++ b/includes/common.php @@ -0,0 +1,57 @@ + diff --git a/includes/functions.php b/includes/functions.php index 32d9095dc0..a866a0ce70 100755 --- a/includes/functions.php +++ b/includes/functions.php @@ -7,6 +7,8 @@ include_once("Net/IPv6.php"); ## Observer Includes +include_once($config['install_dir'] . "/includes/common.php"); + include_once($config['install_dir'] . "/includes/generic.php"); include_once($config['install_dir'] . "/includes/procurve.php"); include_once($config['install_dir'] . "/includes/graphing.php"); @@ -22,36 +24,6 @@ require('collectd/config.php'); require('collectd/functions.php'); require('collectd/definitions.php'); -function entPhysical_scale($value, $scale) { - - switch ($scale) { - case "nano": - $value = $value / 1000000000; - break; - case "micro": - $value = $value / 1000000; - break; - case "milli": - $value = $value / 1000; - break; - case "units": - break; - case "kilo": - $value = $value * 1000; - break; - case "mega": - $value = $value * 1000000; - break; - case "giga": - $value = $value * 1000000000; - break; - } - - return $value; - -} - - function mac_clean_to_readable($mac){ $r = substr($mac, 0, 2); @@ -143,21 +115,6 @@ function getHostOS($hostname, $community, $snmpver, $port) { } - -function strgen ($length = 16) -{ - $entropy = array(0,1,2,3,4,5,6,7,8,9,'a','A','b','B','c','C','d','D','e', - 'E','f','F','g','G','h','H','i','I','j','J','k','K','l','L','m','M','n', - 'N','o','O','p','P','q','Q','r','R','s','S','t','T','u','U','v','V','w', - 'W','x','X','y','Y','z','Z'); - $string = ""; - for ($i=0; $i<$length; $i++) { - $key = mt_rand(0,61); - $string .= $entropy[$key]; - } - return $string; -} - function billpermitted($bill_id) { global $_SESSION; @@ -677,48 +634,12 @@ function hoststatus($id) { return $result; } -function gethostbyid($id) { - $sql = mysql_query("SELECT `hostname` FROM `devices` WHERE `device_id` = '$id'"); - $result = @mysql_result($sql, 0); - return $result; -} - function getifhost($id) { $sql = mysql_query("SELECT `device_id` from `interfaces` WHERE `interface_id` = '$id'"); $result = @mysql_result($sql, 0); return $result; } -function getpeerhost($id) { - $sql = mysql_query("SELECT `device_id` from `bgpPeers` WHERE `bgpPeer_id` = '$id'"); - $result = @mysql_result($sql, 0); - return $result; -} - -function getifindexbyid($id) { - $sql = mysql_query("SELECT `ifIndex` FROM `interfaces` WHERE `interface_id` = '$id'"); - $result = @mysql_result($sql, 0); - return $result; -} - -function getifbyid($id) { - $sql = mysql_query("SELECT `ifDescr` FROM `interfaces` WHERE `interface_id` = '$id'"); - $result = @mysql_result($sql, 0); - return $result; -} - -function getidbyname($domain){ - $sql = mysql_query("SELECT `device_id` FROM `devices` WHERE `hostname` = '$domain'"); - $result = @mysql_result($sql, 0); - return $result; -} - -function gethostosbyid($id) { - $sql = mysql_query("SELECT `os` FROM `devices` WHERE `device_id` = '$id'"); - $result = @mysql_result($sql, 0); - return $result; -} - function match_network ($nets, $ip, $first=false) { $return = false; if (!is_array ($nets)) $nets = array ($nets); diff --git a/includes/rewrites.php b/includes/rewrites.php index 214e585b5b..25c13bfd16 100644 --- a/includes/rewrites.php +++ b/includes/rewrites.php @@ -1,69 +1,104 @@ 'C', + 'unknown' => '', + 'specialEnum' => 'C', + 'watts' => 'W', + 'truthvalue' => '', +); - $translate_ifOperStatus = array( - "1" => "up", - "2" => "down", - "3" => "testing", - "4" => "unknown", - "5" => "dormant", - "6" => "notPresent", - "7" => "lowerLayerDown", - ); - function translate_ifOperStatus ($ifOperStatus) { - global $translate_ifOperStatus; - if($translate_ifOperStatus['$ifOperStatus']) { - $ifOperStatus = $translate_ifOperStatus['$ifOperStatus']; - } - return $ifOperStatus; +function entPhysical_scale($value, $scale) { + + switch ($scale) { + case "nano": + $value = $value / 1000000000; + break; + case "micro": + $value = $value / 1000000; + break; + case "milli": + $value = $value / 1000; + break; + case "units": + break; + case "kilo": + $value = $value * 1000; + break; + case "mega": + $value = $value * 1000000; + break; + case "giga": + $value = $value * 1000000000; + break; } - $translate_ifAdminStatus = array( - "1" => "up", - "2" => "down", - "3" => "testing", - ); + return $value; - function translate_ifAdminStatus ($ifAdminStatus) { - global $translate_ifAdminStatus; - if($translate_ifAdminStatus['$ifAdminStatus']) { - $ifAdminStatus = $translate_ifAdminStatus['$ifAdminStatus']; - } - return $ifAdminStatus; +} + +$translate_ifOperStatus = array( + "1" => "up", + "2" => "down", + "3" => "testing", + "4" => "unknown", + "5" => "dormant", + "6" => "notPresent", + "7" => "lowerLayerDown", +); + +function translate_ifOperStatus ($ifOperStatus) { + global $translate_ifOperStatus; + if($translate_ifOperStatus['$ifOperStatus']) { + $ifOperStatus = $translate_ifOperStatus['$ifOperStatus']; } + return $ifOperStatus; +} +$translate_ifAdminStatus = array( + "1" => "up", + "2" => "down", + "3" => "testing", +); +function translate_ifAdminStatus ($ifAdminStatus) { + global $translate_ifAdminStatus; + if($translate_ifAdminStatus['$ifAdminStatus']) { + $ifAdminStatus = $translate_ifAdminStatus['$ifAdminStatus']; + } + return $ifAdminStatus; +} - $rewrite_ios_features = array( - "PK9S" => "IP w/SSH LAN Only", - "LANBASEK9" => "Lan Base Crypto", - "LANBASE" => "Lan Base", - "ADVENTERPRISEK9" => "Advanced Enterprise Crypto", - "ADVSECURITYK9" => "Advanced Security Crypto", - "K91P" => "Provider Crypto", - "K4P" => "Provider Crypto", - "ADVIPSERVICESK9" => "Adv IP Services Crypto", - "ADVIPSERVICES" => "Adv IP Services", - "IK9P" => "IP Plus Crypto", - "K9O3SY7" => "IP ADSL FW IDS Plus IPSEC 3DES", - "SPSERVICESK9" => "SP Services Crypto", - "PK9SV" => "IP MPLS/IPV6 W/SSH + BGP", - "IS" => "IP Plus", - "IPSERVICESK9" => "IP Services Crypto", - "BROADBAND" => "Broadband", - "IPBASE" => "IP Base", - "IPSERVICE" => "IP Services", - "P" => "Service Provider", - "P11" => "Broadband Router", - "G4P5" => "NRP", - "JK9S" => "Enterprise Plus Crypto", - "IK9S" => "IP Plus Crypto", - "JK" => "Enterprise Plus", - "I6Q4L2" => "Layer 2", - "I6K2L2Q4" => "Layer 2 Crypto", - "C3H2S" => "Layer 2 SI/EI", - "_WAN" => " + WAN", +$rewrite_ios_features = array( + "PK9S" => "IP w/SSH LAN Only", + "LANBASEK9" => "Lan Base Crypto", + "LANBASE" => "Lan Base", + "ADVENTERPRISEK9" => "Advanced Enterprise Crypto", + "ADVSECURITYK9" => "Advanced Security Crypto", + "K91P" => "Provider Crypto", + "K4P" => "Provider Crypto", + "ADVIPSERVICESK9" => "Adv IP Services Crypto", + "ADVIPSERVICES" => "Adv IP Services", + "IK9P" => "IP Plus Crypto", + "K9O3SY7" => "IP ADSL FW IDS Plus IPSEC 3DES", + "SPSERVICESK9" => "SP Services Crypto", + "PK9SV" => "IP MPLS/IPV6 W/SSH + BGP", + "IS" => "IP Plus", + "IPSERVICESK9" => "IP Services Crypto", + "BROADBAND" => "Broadband", + "IPBASE" => "IP Base", + "IPSERVICE" => "IP Services", + "P" => "Service Provider", + "P11" => "Broadband Router", + "G4P5" => "NRP", + "JK9S" => "Enterprise Plus Crypto", + "IK9S" => "IP Plus Crypto", + "JK" => "Enterprise Plus", + "I6Q4L2" => "Layer 2", + "I6K2L2Q4" => "Layer 2 Crypto", + "C3H2S" => "Layer 2 SI/EI", + "_WAN" => " + WAN", ); @@ -131,34 +166,34 @@ function makeshortif($if) { - global $rewrite_shortif; - $if = fixifName ($if); - $if = strtolower($if); - $if = array_str_replace($rewrite_shortif, $if); - return $if; + global $rewrite_shortif; + $if = fixifName ($if); + $if = strtolower($if); + $if = array_str_replace($rewrite_shortif, $if); + return $if; } function rewrite_ios_features ($features) { - global $rewrite_ios_features; - $type = array_preg_replace($rewrite_ios_features, $features); - return ($features); + global $rewrite_ios_features; + $type = array_preg_replace($rewrite_ios_features, $features); + return ($features); } function fixiftype ($type) { - global $rewrite_iftype; - $type = array_preg_replace($rewrite_iftype, $type); - return ($type); + global $rewrite_iftype; + $type = array_preg_replace($rewrite_iftype, $type); + return ($type); } function fixifName ($inf) { - global $rewrite_ifname; - $inf = strtolower($inf); - $inf = array_str_replace($rewrite_ifname, $inf); - return $inf; + global $rewrite_ifname; + $inf = strtolower($inf); + $inf = array_str_replace($rewrite_ifname, $inf); + return $inf; } diff --git a/process-syslog.php b/process-syslog.php index 0d78943c76..b3488d41e2 100755 --- a/process-syslog.php +++ b/process-syslog.php @@ -2,7 +2,8 @@