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

syntaxer run

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@3117 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2012-05-02 22:02:30 +00:00
parent 944130f0bb
commit 613e8b1e29
31 changed files with 66 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/defaults.inc.php
+2 -2
View File
@@ -55,7 +55,7 @@ $config['dot'] = "/usr/bin/dot";
$config['unflatten'] = "/usr/bin/unflatten";
$config['neato'] = "/usr/bin/neato";
$config['sfdp'] = "/usr/bin/sfdp";
$config['svn'] = "/usr/bin/svn";
$config['svn'] = "/usr/bin/svn";
### Memcached - Keep immediate statistics
@@ -143,7 +143,7 @@ $config['email_smtp_port'] = 25; ## The port to con
$config['email_smtp_timeout'] = 10; ## SMTP connection timeout in seconds.
$config['email_smtp_secure'] = NULL; ## Enable encryption. Use 'tls' or 'ssl'
$config['email_smtp_auth'] = FALSE; ## Whether or not to use SMTP authentication.
$config['email_smtp_username'] = NULL; ## SMTP username.
$config['email_smtp_username'] = NULL; ## SMTP username.
$config['email_smtp_password'] = NULL; ## Password for SMTP authentication.
### Alerting Settings
includes/discovery/cisco-pw.inc.php
+4 -5
View File
@@ -9,7 +9,7 @@ if ($config['enable_pseudowires'] && $device['os_group'] == "cisco")
/// Pre-cache the existing state of pseudowires for this device from the database
$pws_db_raw = dbFetchRows("SELECT * FROM `pseudowires` WHERE `device_id` = ?", array($device['device_id']));
foreach($pws_db_raw as $pw_db)
foreach ($pws_db_raw as $pw_db)
{
$device['pws_db'][$pw_db['cpwVcID']] = $pw_db['pseudowire_id'];
}
@@ -24,8 +24,7 @@ if ($config['enable_pseudowires'] && $device['os_group'] == "cisco")
/// For MPLS pseudowires
$pws = snmpwalk_cache_oid($device, "cpwVcMplsPeerLdpID", $pws, "CISCO-IETF-PW-MPLS-MIB");
foreach($pws as $pw_id => $pw)
foreach ($pws as $pw_id => $pw)
{
list($cpw_remote_id) = explode(":", $pw['cpwVcMplsPeerLdpID']);
$cpw_remote_device = @mysql_result(mysql_query("SELECT device_id FROM ipv4_addresses AS A, ports AS I WHERE A.ipv4_address = '".$cpw_remote_id."' AND A.interface_id = I.interface_id"),0);
@@ -46,9 +45,9 @@ if ($config['enable_pseudowires'] && $device['os_group'] == "cisco")
}
/// Cycle the list of pseudowires we cached earlier and make sure we saw them again.
foreach($device['pws_db'] as $pw_id => $pseudowire_id)
foreach ($device['pws_db'] as $pw_id => $pseudowire_id)
{
if(empty($device['pws'][$pw_id]))
if (empty($device['pws'][$pw_id]))
{
dbDelete('vlans', "`pseudowire_id` = ?", array($pseudowire_id));
}
includes/discovery/humidity/pcoweb.inc.php
+1 -1
View File
@@ -34,7 +34,7 @@ lhAlarmThrsh.0 = INTEGER: 30 rH%
smDehumSetp.0 = INTEGER: 75 rH%
smHumidSetp.0 = INTEGER: 35 rH%
*/
}
?>
includes/discovery/os/linux.inc.php
+2 -2
View File
@@ -11,7 +11,7 @@ if (!$os)
## Check for QNAP Systems TurboNAS
$entPhysicalMfgName = snmp_get($device, "ENTITY-MIB::entPhysicalMfgName.1", "-Osqnv");
if(strstr($sysObjectId, ".1.3.6.1.4.1.5528.100.20.10.2014")) { $os = "netbotz"; }
if (strstr($sysObjectId, ".1.3.6.1.4.1.5528.100.20.10.2014")) { $os = "netbotz"; }
elseif (strstr($sysDescr, "endian")) { $os = "endian"; }
elseif (preg_match("/Cisco Small Business/", $sysDescr)) { $os = "ciscosmblinux"; }
elseif (strpos($entPhysicalMfgName, "QNAP") !== FALSE) { $os = "qnap"; }
@@ -25,7 +25,7 @@ if (!$os)
{
## Check for Carel PCOweb
$roomTemp = trim(snmp_get($device,"roomTemp.0", "-OqvU", "CAREL-ug40cdz-MIB"));
if (is_numeric($roomTemp))
{
$os = "pcoweb";
includes/discovery/temperatures/pcoweb.inc.php
+1 -1
View File
@@ -54,7 +54,7 @@ radcoolSpDX.0 = INTEGER: 280 degrees C
delTempLimit.0 = INTEGER: 14 degrees C x10
dtAutChgMLT.0 = INTEGER: 20 degrees C
*/
}
?>
includes/discovery/vlans.inc.php
+4 -5
View File
@@ -4,7 +4,7 @@ echo("VLANs:\n");
/// Pre-cache the existing state of VLANs for this device from the database
$vlans_db_raw = dbFetchRows("SELECT * FROM `vlans` WHERE `device_id` = ?", array($device['device_id']));
foreach($vlans_db_raw as $vlan_db)
foreach ($vlans_db_raw as $vlan_db)
{
$vlans_db[$vlan_db['vlan_domain']][$vlan_db['vlan_vlan']] = $vlan_db;
}
@@ -75,12 +75,11 @@ foreach ($device['vlans'] as $domain_id => $vlans)
}
}
foreach($vlans_db as $domain_id => $vlans)
foreach ($vlans_db as $domain_id => $vlans)
{
foreach($vlans as $vlan_id => $vlan)
foreach ($vlans as $vlan_id => $vlan)
{
if(empty($device['vlans'][$domain_id][$vlan_id]))
if (empty($device['vlans'][$domain_id][$vlan_id]))
{
dbDelete('vlans', "`device_id` = ? AND vlan_domain = ? AND vlan_vlan = ?", array($device['device_id'], $domain_id, $vlan_id));
}
includes/discovery/vlans/cisco-vtp.inc.php
+1 -1
View File
@@ -13,7 +13,7 @@ if ($device['os_group'] == "cisco")
$vtpdomains = snmpwalk_cache_oid($device, "vlanManagementDomains", array(), "CISCO-VTP-MIB");
$vlans = snmpwalk_cache_twopart_oid($device, "vtpVlanEntry", array(), "CISCO-VTP-MIB");
foreach($vtpdomains as $vtpdomain_id => $vtpdomain)
foreach ($vtpdomains as $vtpdomain_id => $vtpdomain)
{
echo("VTP Domain ".$vtpdomain_id." ".$vtpdomain['managementDomainName']." ");
foreach ($vlans[$vtpdomain_id] as $vlan_id => $vlan)
includes/functions.php
+2 -1
View File
@@ -17,6 +17,7 @@ include_once($config['install_dir'] . "/includes/snmp.inc.php");
include_once($config['install_dir'] . "/includes/services.inc.php");
include_once($config['install_dir'] . "/includes/dbFacile.php");
include_once($config['install_dir'] . "/includes/console_colour.php");
if ($config['alerts']['email']['enable'])
{
include_once($config['install_dir'] . "/includes/phpmailer/class.phpmailer.php");
@@ -589,7 +590,7 @@ function notify($device,$title,$message)
break;
}
// Sending email
if(!$mail->Send()) { echo "Mailer Error: " . $mail->ErrorInfo . "\n"; }
if (!$mail->Send()) { echo "Mailer Error: " . $mail->ErrorInfo . "\n"; }
}
}
}
includes/polling/applications/drbd.inc.php
+2 -2
View File
@@ -27,9 +27,9 @@ $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/app-drbd-".$
}
$ds_list = array('ns','nr','dw','dr','al','bm','lo','pe','ua','ap','oos');
foreach($ds_list as $ds)
foreach ($ds_list as $ds)
{
if(empty($drbd[$ds])) { $drbd[$ds] = "U"; }
if (empty($drbd[$ds])) { $drbd[$ds] = "U"; }
}
rrdtool_update($rrd_filename, "N:".$drbd['ns'].":".$drbd['nr'].":".$drbd['dw'].":".$drbd['dr'].":".$drbd['al'].":".$drbd['bm'].":".$drbd['lo'].":".$drbd['pe'].":".$drbd['ua'].":".$drbd['ap'].":".$drbd['oop']);
includes/polling/applications/memcached.inc.php
+1 -2
View File
@@ -33,12 +33,11 @@ echo("memcached(".$app['app_instance'].") ");
'connection_structures','bytes','cmd_get','cmd_set','get_hits','get_misses','evictions','bytes_read','bytes_written');
$values = array();
foreach ($dslist as $ds)
foreach ($dslist as $ds)
{
$values[] = isset($data[$ds]) ? $data[$ds] : -1;
}
rrdtool_update($rrd_filename, "N:".implode(":", $values));
?>
includes/polling/applications/mysql.inc.php
-1
View File
@@ -241,5 +241,4 @@ if (!is_file($mysql_status_rrd))
rrdtool_update($mysql_status_rrd, "N:$string");
?>
includes/polling/functions.inc.php
+1 -1
View File
@@ -139,7 +139,7 @@ function poll_device($device, $options)
if ($options['m'])
{
foreach(explode(",", $options['m']) as $module)
foreach (explode(",", $options['m']) as $module)
{
if (is_file("includes/polling/".$module.".inc.php"))
{
includes/polling/unix-agent.inc.php
+4 -4
View File
@@ -40,11 +40,11 @@ if($device['os_group'] == "unix")
list($section, $data) = explode(">>>", $section);
list($sa, $sb) = explode("-", $section, 2);
if($section == "apache") { $sa = "app"; $sb = "apache"; }
if($section == "mysql") { $sa = "app"; $sb = "mysql"; }
# if($section == "drbd") { $sa = "app"; $sb = "drbd"; }
if ($section == "apache") { $sa = "app"; $sb = "apache"; }
if ($section == "mysql") { $sa = "app"; $sb = "mysql"; }
# if ($section == "drbd") { $sa = "app"; $sb = "drbd"; }
if(!empty($sa) && !empty($sb))
if (!empty($sa) && !empty($sb))
{
$agent_data[$sa][$sb] = trim($data);
} else {
includes/versioncheck.inc.php
+1 -2
View File
@@ -19,7 +19,6 @@ $stat_serial = base64_encode(serialize($stats));
$url = "http://www.observium.org/latest.php?i=".$stats['ports']."&d=".$stats['devices']."&stats=".$stat_serial."&v=".$config['version'];
$dataHandle = fopen($url, r);
if ($dataHandle)
{
while (!feof($dataHandle))
@@ -44,7 +43,7 @@ if ($dataHandle)
{
echo("Current Revision : $cur_revision\n");
if ($omnipotence > $cur_revision)
if ($omnipotence > $cur_revision)
{
echo("New Revision : $omnipotence\n");
}