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

clean, clean, clean, all i have to do is clean

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1855 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-03-15 15:27:14 +00:00
parent 6b0c5c183f
commit a8d60662d2
6 changed files with 151 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/port-descr-parser.inc.php
+4 -4
View File
@@ -13,8 +13,8 @@
list(,$speed) = preg_split("/[\[\]]/", $this_port['ifAlias']);
$descr = trim($descr);
if($type && $descr) {
if ($type && $descr)
{
$type = strtolower($type);
$port_ifAlias['type'] = $type;
$port_ifAlias['descr'] = $descr;
@@ -22,10 +22,10 @@
$port_ifAlias['speed'] = $speed;
$port_ifAlias['notes'] = $notes;
if($debug) {
if ($debug)
{
print_r($port_ifAlias);
}
}
unset ($port_type, $port_descr, $port_circuit, $port_notes, $port_speed);
includes/snmp.inc.php
+52 -25
View File
@@ -4,13 +4,15 @@ function snmp_get_multi($device, $oids, $options = "-OQUs", $mib = NULL, $mibdir
{
global $debug,$config,$runtime_stats,$mibs_loaded;
if (is_numeric($device['timeout']) && $device['timeout'] > 0) {
if (is_numeric($device['timeout']) && $device['timeout'] > 0)
{
$timeout = $device['timeout'];
} elseif (isset($config['snmp']['timeout'])) {
$timeout = $config['snmp']['timeout'];
}
if (is_numeric($device['retries']) && $device['retries'] > 0) {
if (is_numeric($device['retries']) && $device['retries'] > 0)
{
$retries = $device['retries'];
} elseif (isset($config['snmp']['retries'])) {
$retries = $config['snmp']['retries'];
@@ -78,13 +80,15 @@ function snmp_get($device, $oid, $options = NULL, $mib = NULL, $mibdir = NULL)
{
global $debug,$config,$runtime_stats,$mibs_loaded;
if (is_numeric($device['timeout']) && $device['timeout'] > 0) {
if (is_numeric($device['timeout']) && $device['timeout'] > 0)
{
$timeout = $device['timeout'];
} elseif (isset($config['snmp']['timeout'])) {
$timeout = $config['snmp']['timeout'];
}
if (is_numeric($device['retries']) && $device['retries'] > 0) {
if (is_numeric($device['retries']) && $device['retries'] > 0)
{
$retries = $device['retries'];
} elseif (isset($config['snmp']['retries'])) {
$retries = $config['snmp']['retries'];
@@ -143,13 +147,16 @@ function snmp_walk($device, $oid, $options = NULL, $mib = NULL, $mibdir = NULL)
{
global $debug,$config,$runtime_stats;
if (is_numeric($device['timeout']) && $device['timeout'] > 0) {
if (is_numeric($device['timeout']) && $device['timeout'] > 0)
{
$timeout = $device['timeout'];
} elseif (isset($config['snmp']['timeout'])) {
} elseif (isset($config['snmp']['timeout']))
{
$timeout = $config['snmp']['timeout'];
}
if (is_numeric($device['retries']) && $device['retries'] > 0) {
if (is_numeric($device['retries']) && $device['retries'] > 0)
{
$retries = $device['retries'];
} elseif (isset($config['snmp']['retries'])) {
$retries = $config['snmp']['retries'];
@@ -200,13 +207,15 @@ function snmpwalk_cache_cip($device, $oid, $array, $mib = 0)
{
global $config;
if (is_numeric($device['timeout']) && $device['timeout'] > 0) {
if (is_numeric($device['timeout']) && $device['timeout'] > 0)
{
$timeout = $device['timeout'];
} elseif (isset($config['snmp']['timeout'])) {
$timeout = $config['snmp']['timeout'];
}
if (is_numeric($device['retries']) && $device['retries'] > 0) {
if (is_numeric($device['retries']) && $device['retries'] > 0)
{
$retries = $device['retries'];
} elseif (isset($config['snmp']['retries'])) {
$retries = $config['snmp']['retries'];
@@ -263,13 +272,15 @@ function snmp_cache_ifIndex($device)
// FIXME: this has no internal version, and is not yet using our own snmp_*
global $config;
if (is_numeric($device['timeout']) && $device['timeout'] > 0) {
if (is_numeric($device['timeout']) && $device['timeout'] > 0)
{
$timeout = $device['timeout'];
} elseif (isset($config['snmp']['timeout'])) {
$timeout = $config['snmp']['timeout'];
}
if (is_numeric($device['retries']) && $device['retries'] > 0) {
if (is_numeric($device['retries']) && $device['retries'] > 0)
{
$retries = $device['retries'];
} elseif (isset($config['snmp']['retries'])) {
$retries = $config['snmp']['retries'];
@@ -380,7 +391,9 @@ function snmpwalk_cache_double_oid($device, $oid, $array, $mib = NULL, $mibdir =
function snmpwalk_cache_triple_oid($device, $oid, $array, $mib = NULL, $mibdir = NULL)
{
$data = snmp_walk($device, $oid, "-OQUs", $mib, $mibdir);
foreach(explode("\n", $data) as $entry) {
foreach (explode("\n", $data) as $entry)
{
list($oid,$value) = explode("=", $entry);
$oid = trim($oid); $value = trim($value);
list($oid, $first, $second, $third) = explode(".", $oid);
@@ -400,13 +413,15 @@ function snmpwalk_cache_twopart_oid($device, $oid, $array, $mib = 0)
{
global $config;
if (is_numeric($device['timeout']) && $device['timeout'] > 0) {
if (is_numeric($device['timeout']) && $device['timeout'] > 0)
{
$timeout = $device['timeout'];
} elseif (isset($config['snmp']['timeout'])) {
$timeout = $config['snmp']['timeout'];
}
if (is_numeric($device['retries']) && $device['retries'] > 0) {
if (is_numeric($device['retries']) && $device['retries'] > 0)
{
$retries = $device['retries'];
} elseif (isset($config['snmp']['retries'])) {
$retries = $config['snmp']['retries'];
@@ -447,13 +462,15 @@ function snmpwalk_cache_threepart_oid($device, $oid, $array, $mib = 0)
{
global $config, $debug;
if (is_numeric($device['timeout']) && $device['timeout'] > 0) {
if (is_numeric($device['timeout']) && $device['timeout'] > 0)
{
$timeout = $device['timeout'];
} elseif (isset($config['snmp']['timeout'])) {
$timeout = $config['snmp']['timeout'];
}
if (is_numeric($device['retries']) && $device['retries'] > 0) {
if (is_numeric($device['retries']) && $device['retries'] > 0)
{
$retries = $device['retries'];
} elseif (isset($config['snmp']['retries'])) {
$retries = $config['snmp']['retries'];
@@ -497,13 +514,15 @@ function snmp_cache_slotport_oid($oid, $device, $array, $mib = 0)
{
global $config;
if (is_numeric($device['timeout']) && $device['timeout'] > 0) {
if (is_numeric($device['timeout']) && $device['timeout'] > 0)
{
$timeout = $device['timeout'];
} elseif (isset($config['snmp']['timeout'])) {
$timeout = $config['snmp']['timeout'];
}
if (is_numeric($device['retries']) && $device['retries'] > 0) {
if (is_numeric($device['retries']) && $device['retries'] > 0)
{
$retries = $device['retries'];
} elseif (isset($config['snmp']['retries'])) {
$retries = $config['snmp']['retries'];
@@ -553,13 +572,15 @@ function snmp_cache_port_oids($oids, $port, $device, $array, $mib=0)
{
global $config;
if (is_numeric($device['timeout']) && $device['timeout'] > 0) {
if (is_numeric($device['timeout']) && $device['timeout'] > 0)
{
$timeout = $device['timeout'];
} elseif (isset($config['snmp']['timeout'])) {
$timeout = $config['snmp']['timeout'];
}
if (is_numeric($device['retries']) && $device['retries'] > 0) {
if (is_numeric($device['retries']) && $device['retries'] > 0)
{
$retries = $device['retries'];
} elseif (isset($config['snmp']['retries'])) {
$retries = $config['snmp']['retries'];
@@ -583,7 +604,8 @@ function snmp_cache_port_oids($oids, $port, $device, $array, $mib=0)
$values = explode("\n", $data);
#echo("Caching: ifIndex $port\n");
foreach ($oids as $oid){
if (!strstr($values[$x], "at this OID")) {
if (!strstr($values[$x], "at this OID"))
{
$array[$port][$oid] = $values[$x];
}
$x++;
@@ -596,13 +618,15 @@ function snmp_cache_portIfIndex($device, $array)
{
global $config;
if (is_numeric($device['timeout']) && $device['timeout'] > 0) {
if (is_numeric($device['timeout']) && $device['timeout'] > 0)
{
$timeout = $device['timeout'];
} elseif (isset($config['snmp']['timeout'])) {
$timeout = $config['snmp']['timeout'];
}
if (is_numeric($device['retries']) && $device['retries'] > 0) {
if (is_numeric($device['retries']) && $device['retries'] > 0)
{
$retries = $device['retries'];
} elseif (isset($config['snmp']['retries'])) {
$retries = $config['snmp']['retries'];
@@ -633,13 +657,15 @@ function snmp_cache_portName($device, $array)
{
global $config;
if (is_numeric($device['timeout']) && $device['timeout'] > 0) {
if (is_numeric($device['timeout']) && $device['timeout'] > 0)
{
$timeout = $device['timeout'];
} elseif (isset($config['snmp']['timeout'])) {
$timeout = $config['snmp']['timeout'];
}
if (is_numeric($device['retries']) && $device['retries'] > 0) {
if (is_numeric($device['retries']) && $device['retries'] > 0)
{
$retries = $device['retries'];
} elseif (isset($config['snmp']['retries'])) {
$retries = $config['snmp']['retries'];
@@ -669,4 +695,5 @@ function snmp_cache_portName($device, $array)
return $array;
}
?>
includes/syslog.php
+2 -2
View File
@@ -12,7 +12,8 @@ function process_syslog ($entry, $update)
}
}
if(strstr($entry['msg'], "diskio.c: don't know how to handle") !== FALSE) {
if (strstr($entry['msg'], "diskio.c: don't know how to handle") !== FALSE)
{
$delete = 1;
}
@@ -86,7 +87,6 @@ function process_syslog ($entry, $update)
} else { print_r($entry); echo("D-$delete"); }
return $entry;
}
?>
irc.php
+2 -2
View File
@@ -54,9 +54,9 @@ $irc->setUseSockets( TRUE );
$irc->registerActionhandler( SMARTIRC_TYPE_CHANNEL, '!device', $bot, 'device_info' );
$irc->registerActionhandler( SMARTIRC_TYPE_CHANNEL, '!port', $bot, 'port_info' );
$irc->connect( $host, $port );
$irc->connect($host, $port));
$irc->login($nick, 'Observium Bot', 0, $nick );
$irc->join( array( $chan ) );
$irc->join(array($chan))));
$irc->listen();
$irc->disconnect();
scan-snmp.php
+7 -3
View File
@@ -9,15 +9,19 @@ $search = $argv[1] . "$";
$data = trim(`cat ips-scanned.txt | grep alive | cut -d" " -f 1 | egrep $search`);
foreach( explode("\n", $data) as $ip) {
foreach (explode("\n", $data) as $ip)
{
$snmp = shell_exec("snmpget -t 0.2 -v2c -c ".$config['community']." $ip sysName.0");
if(strstr($snmp, "STRING")) {
if (strstr($snmp, "STRING"))
{
$hostname = trim(str_replace("SNMPv2-MIB::sysName.0 = STRING: ","", $snmp));
if(mysql_result(mysql_query("SELECT COUNT(device_id) FROM devices WHERE hostname = '$hostname'"),0) == '0') {
if (mysql_result(mysql_query("SELECT COUNT(device_id) FROM devices WHERE hostname = '$hostname'"),0) == '0')
{
if (gethostbyname($hostname) == gethostbyname($hostname.".".$config['mydomain'])) { $hostname = $hostname . ".".$config['mydomain']; }
addHost($hostname, $community, 'v2c');
echo("Adding $hostname \n");
}
}
}
?>
syslog.php
+2 -1
View File
@@ -9,7 +9,8 @@ include("includes/common.php");
$i = "1";
$s = fopen('php://stdin','r');
while($line=fgets($s)){
while ($line = fgets($s))
{
list($entry['host'],$entry['facility'],$entry['priority'], $entry['level'], $entry['tag'], $entry['timestamp'], $entry['msg']) = explode("||", trim($line));
process_syslog($entry, 1);
unset($entry); unset($line);