mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

moar restructure

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1859 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-15 15:41:57 +00:00
parent d077282444
commit 0a86e1c675
6 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
includes/functions.php
View File

@@ -9,7 +9,6 @@ include_once("Net/IPv6.php");
include_once($config['install_dir'] . "/includes/common.php");
include_once($config['install_dir'] . "/includes/rrdtool.inc.php");
include_once($config['install_dir'] . "/includes/print-functions.php");
include_once($config['install_dir'] . "/includes/billing.php");
include_once($config['install_dir'] . "/includes/cisco-entities.php");
include_once($config['install_dir'] . "/includes/syslog.php");
@@ -263,7 +262,7 @@ function delete_device($id)
$host = mysql_result(mysql_query("SELECT hostname FROM devices WHERE device_id = '$id'"), 0);
mysql_query("DELETE FROM `devices` WHERE `device_id` = '$id'");
$int_query = mysql_query("SELECT * FROM `ports` WHERE `device_id` = '$id'");
while($int_data = mysql_fetch_array($int_query))
while ($int_data = mysql_fetch_array($int_query))
{
$int_if = $int_data['ifDescr'];
$int_id = $int_data['interface_id'];
@@ -408,7 +407,7 @@ function isValidInterface($if)
global $config;
$if = strtolower($if);
$nullintf = 0;
foreach($config['bad_if'] as $bi)
foreach ($config['bad_if'] as $bi)
{
$pos = strpos($if, $bi);
if ($pos !== FALSE)

2
includes/rewrites.php
View File

@@ -819,7 +819,7 @@ $rewrite_ios_features = array(
// Specific rewrite functions
function makeshortif ($if)
function makeshortif($if)
{
global $rewrite_shortif;

2
includes/rrdtool.inc.php
View File

@@ -42,7 +42,7 @@ function rrdtool($command, $file, $options)
global $config; global $debug;
$command = $config['rrdtool'] . " $command $file $options";
if($config['rrdcached'])
if ($config['rrdcached'])
{
$command .= " --daemon " . $config['rrdcached'];
}

26
includes/snmptrap/linkDown.inc.php
View File

@@ -2,19 +2,21 @@
$interface = mysql_fetch_array(mysql_query("SELECT * FROM `ports` WHERE `device_id` = '".$device['device_id']."' AND `ifIndex` = '".$entry[2]."'"));
if(!$interface) {exit;}
if (!$interface) { exit; }
$ifOperStatus = "down";
#$ifAdminStatus = "down";
$ifOperStatus = "down";
#$ifAdminStatus = "down";
log_event("SNMP Trap: linkDown " . $interface['ifDescr'], $device, "interface", $interface['interface_id']);
log_event("SNMP Trap: linkDown " . $interface['ifDescr'], $device, "interface", $interface['interface_id']);
#if($ifAdminStatus != $interface['ifAdminStatus']) {
# log_event("Interface Disabled : " . $interface['ifDescr'] . " (TRAP)", $device, "interface", $interface['interface_id']);
#}
if($ifOperStatus != $interface['ifOperStatus']) {
log_event("Interface went Down : " . $interface['ifDescr'] . " (TRAP)", $device, "interface", $interface['interface_id']);
mysql_query("UPDATE `ports` SET ifOperStatus = 'down' WHERE `interface_id` = '".$interface['interface_id']."'");
}
#if ($ifAdminStatus != $interface['ifAdminStatus'])
#{
# log_event("Interface Disabled : " . $interface['ifDescr'] . " (TRAP)", $device, "interface", $interface['interface_id']);
#}
if ($ifOperStatus != $interface['ifOperStatus'])
{
log_event("Interface went Down : " . $interface['ifDescr'] . " (TRAP)", $device, "interface", $interface['interface_id']);
mysql_query("UPDATE `ports` SET ifOperStatus = 'down' WHERE `interface_id` = '".$interface['interface_id']."'");
}
?>
?>

29
includes/snmptrap/linkUp.inc.php
View File

@@ -2,21 +2,24 @@
$interface = mysql_fetch_array(mysql_query("SELECT * FROM `ports` WHERE `device_id` = '".$device['device_id']."' AND `ifIndex` = '".$entry[2]."'"));
if(!$interface) {exit;}
if (!$interface) { exit; }
$ifOperStatus = "up";
$ifAdminStatus = "up";
$ifOperStatus = "up";
$ifAdminStatus = "up";
log_event("SNMP Trap: linkUp $ifAdminStatus/$ifOperStatus " . $interface['ifDescr'], $device, "interface", $interface['interface_id']);
log_event("SNMP Trap: linkUp $ifAdminStatus/$ifOperStatus " . $interface['ifDescr'], $device, "interface", $interface['interface_id']);
if($ifAdminStatus != $interface['ifAdminStatus']) {
log_event("Interface Enabled : " . $interface['ifDescr'] . " (TRAP)", $device, "interface", $interface['interface_id']);
mysql_query("UPDATE `ports` SET ifAdminStatus = 'up' WHERE `interface_id` = '".$interface['interface_id']."'");
}
if($ifOperStatus != $interface['ifOperStatus']) {
log_event("Interface went Up : " . $interface['ifDescr'] . " (TRAP)", $device, "interface", $interface['interface_id']);
mysql_query("UPDATE `ports` SET ifOperStatus = 'up' WHERE `interface_id` = '".$interface['interface_id']."'");
if ($ifAdminStatus != $interface['ifAdminStatus'])
{
log_event("Interface Enabled : " . $interface['ifDescr'] . " (TRAP)", $device, "interface", $interface['interface_id']);
mysql_query("UPDATE `ports` SET ifAdminStatus = 'up' WHERE `interface_id` = '".$interface['interface_id']."'");
}
}
if ($ifOperStatus != $interface['ifOperStatus'])
{
log_event("Interface went Up : " . $interface['ifDescr'] . " (TRAP)", $device, "interface", $interface['interface_id']);
mysql_query("UPDATE `ports` SET ifOperStatus = 'up' WHERE `interface_id` = '".$interface['interface_id']."'");
?>
}
?>

10
includes/static-config.php
View File

@@ -767,24 +767,24 @@ if (isset($config['enable_printers']) && $config['enable_printers'])
$config['version'] = "0.10";
if(isset($config['rrdgraph_def_text']))
if (isset($config['rrdgraph_def_text']))
{
$config['rrdgraph_def_text'] = str_replace(" ", " ", $config['rrdgraph_def_text']);
$config['rrd_opts_array'] = explode(" ", trim($config['rrdgraph_def_text']));
}
if(!isset($config['log_file']))
if (!isset($config['log_file']))
{
$config['log_file'] = $config['install_dir'] . "/observium.log";
}
if(!isset($config['mibdir']))
if (!isset($config['mibdir']))
{
$config['mibdir'] = $config['install_dir']."/mibs/";
}
$config['mib_dir'] = $config['mibdir'];
if(isset($config['enable_nagios']) && $config['enable_nagios']) {
if (isset($config['enable_nagios']) && $config['enable_nagios']) {
$nagios_link = mysql_connect($config['nagios_db_host'], $config['nagios_db_user'], $config['nagios_db_pass']);
if (!$nagios_link) {
echo("<h2>Nagios MySQL Error</h2>");
@@ -794,7 +794,7 @@ $nagios_db = mysql_select_db($config['nagios_db_name'], $nagios_link);
}
# If we're on SSL, let's properly detect it
if(isset($_SERVER['HTTPS']))
if (isset($_SERVER['HTTPS']))
{
$config['base_url'] = preg_replace('/^http:/','https:', $config['base_url']);
}