clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-22 02:48:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor cleanups + hopefully allow adding of ipv6-only hosts with fping6

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1924 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans 2011-03-18 15:38:13 +00:00
parent 104a166d72
commit 781d7debb9
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
includes/defaults.inc.php
View File

@ -12,6 +12,7 @@ $config['log_file'] = $config['install_dir'] . "/observium.log";
$config['rrdtool'] = "/usr/bin/rrdtool";
$config['fping'] = "/usr/bin/fping";
$config['fping6'] = "/usr/bin/fping6";
$config['snmpwalk'] = "/usr/bin/snmpwalk";
$config['snmpget'] = "/usr/bin/snmpget";
$config['snmpbulkwalk'] = "/usr/bin/snmpbulkwalk";

4
includes/discovery/cisco-pw.inc.php
View File

@ -2,8 +2,8 @@
if ($config['enable_pseudowires'] && $device['os_group'] == "ios")
{
unset( $cpw_count );
unset( $cpw_exists );
unset($cpw_count);
unset($cpw_exists);
echo("Cisco Pseudowires : ");

4
includes/discovery/cisco-vrf.inc.php
View File

@ -2,7 +2,7 @@
if ($device['os_group'] == "ios" || $device['os_group'] == "junos" || $device['os'] == "ironware")
{
unset( $vrf_count );
unset($vrf_count);
echo("VRFs : ");
@ -16,7 +16,7 @@ if ($device['os_group'] == "ios" || $device['os_group'] == "junos" || $device['o
$oids = str_replace("\"", "", $oids);
$oids = trim($oids);
foreach ( explode("\n", $oids) as $oid )
foreach (explode("\n", $oids) as $oid)
{
if ($oid)
{

8
includes/functions.php
View File

@ -400,7 +400,13 @@ function isPingable($hostname)
{
return TRUE;
} else {
return FALSE;
$status = shell_exec($config['fping6'] . " $hostname");
if (strstr($status, "alive"))
{
return TRUE;
} else {
return FALSE;
}
}
}