tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2011-10-28 Sergio Martin <sergio.martin@artica.es> 

* extensions/snmp_explorer.php: Improved snmp explorer to use
	description of the interfaces when name doesnt exist



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5095 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2011-10-28 09:30:14 +00:00
parent 56e24ddacd
commit 22b31d5208
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2011-10-28 Sergio Martin <sergio.martin@artica.es>
* extensions/snmp_explorer.php: Improved snmp explorer to use
description of the interfaces when name doesnt exist
2011-10-27 Javier Lanz <javier.lanz@artica.es>
* operation/events/events_list.php: Added group name label to the

19
pandora_console/extensions/snmp_explorer.php
View File

@ -145,6 +145,12 @@ function snmp_explorer() {
$result = false;
foreach($id_snmp as $id) {
if (isset($interfaces[$id]['ifName']) && $interfaces[$id]['ifName']['value'] != ""){
$ifname = $interfaces[$id]['ifName']['value'];
}
else if (isset($interfaces[$id]['ifDescr']) && $interfaces[$id]['ifDescr']['value'] != ""){
$ifname = $interfaces[$id]['ifDescr']['value'];
}
foreach($modules as $module) {
$oid_array = explode('.',$module);
@ -153,7 +159,7 @@ function snmp_explorer() {
// Get the name
$name_array = explode('::',$oid_array[0]);
$name = $name_array[1] . "_" . $interfaces[$id]['ifName']['value'];
$name = $name_array[1] . "_" . $ifname;
// Clean the name
$name = str_replace ( "\"" , "" , $name);
@ -209,10 +215,17 @@ function snmp_explorer() {
$interfaces_list = array();
foreach($interfaces as $interface){
// Get the interface name, removing " " characters and avoid "blank" interfaces
if (!isset($interface['ifName']) || $interface['ifName']['value'] == "")
if (isset($interface['ifName']) && $interface['ifName']['value'] != ""){
$ifname = $interface['ifName']['value'];
}
else if (isset($interface['ifDescr']) && $interface['ifDescr']['value'] != ""){
$ifname = $interface['ifDescr']['value'];
}
else {
continue;
}
$interfaces_list[$interface['ifIndex']['value']] = str_replace ( "\"" , "" , $interface['ifName']['value']);
$interfaces_list[$interface['ifIndex']['value']] = str_replace ( "\"" , "" , $ifname);
}