$ADJACENCY) {
- if (($ADJACENCY['otvtype'] == 'adjacency') && ($ADJACENCY['index'] == $OVERLAY['index'])) {
- if ($ADJACENCY['status'] == 1) {
- $ADJ_STATUS = "
Normal";
- $GLI = "";
+ foreach ($components as $aid => $adjacency) {
+ if (($adjacency['otvtype'] == 'adjacency') && ($adjacency['index'] == $overlay['index'])) {
+ if ($adjacency['status'] == 1) {
+ $adj_status = "
Normal";
+ $gli = "";
}
else {
- $ADJ_STATUS = "
".$ADJACENCY['error']." - Alert";
- $GLI = "list-group-item-danger";
+ $adj_status = "
".$adjacency['error']." - Alert";
+ $gli = "list-group-item-danger";
}
?>
-
-
+
-
getComponents($device['device_id'],array('type'=>$MODULE));
+ $component = new component();
+ $components = $component->getComponents($device['device_id'],array('type'=>$module));
// We only care about our device id.
- $COMPONENTS = $COMPONENTS[$device['device_id']];
+ $components = $components[$device['device_id']];
// Begin our master array, all other values will be processed into this array.
$tblOTV = array();
@@ -86,92 +89,92 @@ if ($device['os_group'] == 'cisco') {
// Add each overlay to the array.
foreach ($tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.2'] as $index => $name) {
- $RESULT = array();
+ $result = array();
$message = false;
- $RESULT['index'] = $index;
- $RESULT['label'] = $name;
+ $result['index'] = $index;
+ $result['label'] = $name;
if ($tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.15'][$index] == 1) {
- $RESULT['transport'] = 'Multicast';
+ $result['transport'] = 'Multicast';
}
else {
- $RESULT['transport'] = 'Unicast';
+ $result['transport'] = 'Unicast';
}
- $RESULT['otvtype'] = 'overlay';
- $RESULT['UID'] = $RESULT['otvtype']."-".$RESULT['index'];
- $RESULT['vpn_state'] = $tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.3'][$index];
- if ($RESULT['vpn_state'] != 2) {
- $message .= "VPN Down: ".$ERROR_VPN[$tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.4'][$index]]."\n";
+ $result['otvtype'] = 'overlay';
+ $result['UID'] = $result['otvtype']."-".$result['index'];
+ $result['vpn_state'] = $tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.3'][$index];
+ if ($result['vpn_state'] != 2) {
+ $message .= "VPN Down: ".$error_vpn[$tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.4'][$index]]."\n";
}
- $RESULT['aed_state'] = $tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.13'][$index];
- if ($RESULT['aed_state'] == 2) {
- $message .= "AED Down: ".$ERROR_AED[$tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.14'][$index]]."\n";
+ $result['aed_state'] = $tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.13'][$index];
+ if ($result['aed_state'] == 2) {
+ $message .= "AED Down: ".$error_aed[$tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.14'][$index]]."\n";
}
- $RESULT['overlay_state'] = $tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.23'][$index];
- if ($RESULT['overlay_state'] == 2) {
- $message .= "Overlay Down: ".$ERROR_OVERLAY[$tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.24'][$index]]."\n";
+ $result['overlay_state'] = $tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.23'][$index];
+ if ($result['overlay_state'] == 2) {
+ $message .= "Overlay Down: ".$error_overlay[$tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.24'][$index]]."\n";
}
// If we have set a message, we have an error, activate alert.
if ($message !== false) {
- $RESULT['error'] = $message;
- $RESULT['status'] = 0;
+ $result['error'] = $message;
+ $result['status'] = 0;
}
else {
- $RESULT['error'] = "";
- $RESULT['status'] = 1;
+ $result['error'] = "";
+ $result['status'] = 1;
}
// Add the result to the parent array.
- $tblOTV[] = $RESULT;
+ $tblOTV[] = $result;
}
// Add each adjacency to the array.
foreach ($tblAdjacentDevName as $key => $value) {
- preg_match('/^1.3.6.1.4.1.9.9.810.1.3.1.1.4.(\d+).1.4.(\d+.\d+.\d+.\d+)$/', $key, $MATCHES);
- $RESULT = array();
- $RESULT['index'] = $MATCHES[1];
- $RESULT['endpoint'] = $MATCHES[2];
+ preg_match('/^1.3.6.1.4.1.9.9.810.1.3.1.1.4.(\d+).1.4.(\d+.\d+.\d+.\d+)$/', $key, $matches);
+ $result = array();
+ $result['index'] = $matches[1];
+ $result['endpoint'] = $matches[2];
$tblEndpoints[$value] = true;
- $RESULT['otvtype'] = 'adjacency';
- $RESULT['UID'] = $RESULT['otvtype']."-".$RESULT['index']."-".str_replace(' ', '', $tblAdjacencyDatabaseEntry['1.3.6.1.4.1.9.9.810.1.3.1.1.3.'.$RESULT['index'].'.1.4.'.$RESULT['endpoint']]);
- $RESULT['uptime'] = $tblAdjacencyDatabaseEntry['1.3.6.1.4.1.9.9.810.1.3.1.1.6.'.$RESULT['index'].'.1.4.'.$RESULT['endpoint']];
+ $result['otvtype'] = 'adjacency';
+ $result['UID'] = $result['otvtype']."-".$result['index']."-".str_replace(' ', '', $tblAdjacencyDatabaseEntry['1.3.6.1.4.1.9.9.810.1.3.1.1.3.'.$result['index'].'.1.4.'.$result['endpoint']]);
+ $result['uptime'] = $tblAdjacencyDatabaseEntry['1.3.6.1.4.1.9.9.810.1.3.1.1.6.'.$result['index'].'.1.4.'.$result['endpoint']];
$message = false;
- if ($tblAdjacencyDatabaseEntry['1.3.6.1.4.1.9.9.810.1.3.1.1.5.'.$RESULT['index'].'.1.4.'.$RESULT['endpoint']] != 1) {
+ if ($tblAdjacencyDatabaseEntry['1.3.6.1.4.1.9.9.810.1.3.1.1.5.'.$result['index'].'.1.4.'.$result['endpoint']] != 1) {
$message .= "Adjacency is Down\n";
}
// If we have set a message, we have an error, activate alert.
if ($message !== false) {
- $RESULT['error'] = $message;
- $RESULT['status'] = 0;
+ $result['error'] = $message;
+ $result['status'] = 0;
}
else {
- $RESULT['error'] = "";
- $RESULT['status'] = 1;
+ $result['error'] = "";
+ $result['status'] = 1;
}
// Set a default name, if for some unknown reason we cant find the parent VPN.
- $RESULT['label'] = "Unknown (".$RESULT['index'].") - ".$value;
+ $result['label'] = "Unknown (".$result['index'].") - ".$value;
// We need to search the existing array to build the name
- foreach ($tblOTV as $ITEM) {
- if (($ITEM['otvtype'] == 'overlay') && ($ITEM['index'] == $RESULT['index'])) {
- $RESULT['label'] = $ITEM['label']." - ".$value;
+ foreach ($tblOTV as $item) {
+ if (($item['otvtype'] == 'overlay') && ($item['index'] == $result['index'])) {
+ $result['label'] = $item['label']." - ".$value;
}
}
// Add the result to the parent array.
- $tblOTV[] = $RESULT;
+ $tblOTV[] = $result;
}
// We retain a list of all endpoints to tie the RRD to.
- foreach ($tblEndpoints as $K => $V) {
- $RESULT['label'] = "Endpoint: ".$K;
- $RESULT['otvtype'] = 'endpoint';
- $RESULT['endpoint'] = $K;
- $RESULT['UID'] = $RESULT['otvtype']."-".$K;
+ foreach ($tblEndpoints as $k => $v) {
+ $result['label'] = "Endpoint: ".$k;
+ $result['otvtype'] = 'endpoint';
+ $result['endpoint'] = $k;
+ $result['UID'] = $result['otvtype']."-".$k;
// Add the result to the parent array.
- $tblOTV[] = $RESULT;
+ $tblOTV[] = $result;
}
/*
@@ -181,25 +184,25 @@ if ($device['os_group'] == 'cisco') {
* Let's loop over the SNMP data to see if we need to ADD or UPDATE any components.
*/
foreach ($tblOTV as $key => $array) {
- $COMPONENT_KEY = false;
+ $component_key = false;
// Loop over our components to determine if the component exists, or we need to add it.
- foreach ($COMPONENTS as $COMPID => $CHILD) {
- if ($CHILD['UID'] === $array['UID']) {
- $COMPONENT_KEY = $COMPID;
+ foreach ($components as $compid => $child) {
+ if ($child['UID'] === $array['UID']) {
+ $component_key = $compid;
}
}
- if (!$COMPONENT_KEY) {
+ if (!$component_key) {
// The component doesn't exist, we need to ADD it - ADD.
- $NEW_COMPONENT = $COMPONENT->createComponent($device['device_id'],$MODULE);
- $COMPONENT_KEY = key($NEW_COMPONENT);
- $COMPONENTS[$COMPONENT_KEY] = array_merge($NEW_COMPONENT[$COMPONENT_KEY], $array);
+ $new_component = $component->createComponent($device['device_id'],$module);
+ $component_key = key($new_component);
+ $components[$component_key] = array_merge($new_component[$component_key], $array);
echo "+";
}
else {
// The component does exist, merge the details in - UPDATE.
- $COMPONENTS[$COMPONENT_KEY] = array_merge($COMPONENTS[$COMPONENT_KEY], $array);
+ $components[$component_key] = array_merge($components[$component_key], $array);
echo ".";
}
@@ -208,26 +211,26 @@ if ($device['os_group'] == 'cisco') {
/*
* Loop over the Component data to see if we need to DELETE any components.
*/
- foreach ($COMPONENTS as $key => $array) {
+ foreach ($components as $key => $array) {
// Guilty until proven innocent
- $FOUND = false;
+ $found = false;
foreach ($tblOTV as $k => $v) {
if ($array['UID'] == $v['UID']) {
// Yay, we found it...
- $FOUND = true;
+ $found = true;
}
}
- if ($FOUND === false) {
+ if ($found === false) {
// The component has not been found. we should delete it.
echo "-";
- $COMPONENT->deleteComponent($key);
+ $component->deleteComponent($key);
}
}
// Write the Components back to the DB.
- $COMPONENT->setComponentPrefs($device['device_id'],$COMPONENTS);
+ $component->setComponentPrefs($device['device_id'],$components);
echo "\n";
} // End if not error
diff --git a/includes/polling/cisco-otv.inc.php b/includes/polling/cisco-otv.inc.php
index 47839fa31..318d1a49b 100644
--- a/includes/polling/cisco-otv.inc.php
+++ b/includes/polling/cisco-otv.inc.php
@@ -14,59 +14,62 @@
if ($device['os_group'] == "cisco") {
// Define some error messages
- $ERROR_VPN[0] = "Other";
- $ERROR_VPN[1] = "Configuration changed";
- $ERROR_VPN[2] = "Control Group information is unavailable";
- $ERROR_VPN[3] = "Data Group range information is unavailable";
- $ERROR_VPN[4] = "Join or Source interface information is unavailable";
- $ERROR_VPN[5] = "VPN name is unavailable";
- $ERROR_VPN[6] = "IP address is missing for Join Interface";
- $ERROR_VPN[7] = "Join Interface is down";
- $ERROR_VPN[8] = "Overlay is administratively shutdown";
- $ERROR_VPN[9] = "Overlay is in delete hold down phase";
- $ERROR_VPN[10] = "VPN is reinitializing";
- $ERROR_VPN[11] = "Site ID information is unavailable";
- $ERROR_VPN[12] = "Site ID mismatch has occurred";
- $ERROR_VPN[13] = "IP address is missing for Source Interface";
- $ERROR_VPN[14] = "Source interface is down";
- $ERROR_VPN[15] = "Changing site identifier";
- $ERROR_VPN[16] = "Changing control group";
- $ERROR_VPN[17] = "Device ID information is unavailable";
- $ERROR_VPN[18] = "Changing device ID";
- $ERROR_VPN[19] = "Cleanup in progress";
+ $error_vpn = array();
+ $error_vpn[0] = "Other";
+ $error_vpn[1] = "Configuration changed";
+ $error_vpn[2] = "Control Group information is unavailable";
+ $error_vpn[3] = "Data Group range information is unavailable";
+ $error_vpn[4] = "Join or Source interface information is unavailable";
+ $error_vpn[5] = "VPN name is unavailable";
+ $error_vpn[6] = "IP address is missing for Join Interface";
+ $error_vpn[7] = "Join Interface is down";
+ $error_vpn[8] = "Overlay is administratively shutdown";
+ $error_vpn[9] = "Overlay is in delete hold down phase";
+ $error_vpn[10] = "VPN is reinitializing";
+ $error_vpn[11] = "Site ID information is unavailable";
+ $error_vpn[12] = "Site ID mismatch has occurred";
+ $error_vpn[13] = "IP address is missing for Source Interface";
+ $error_vpn[14] = "Source interface is down";
+ $error_vpn[15] = "Changing site identifier";
+ $error_vpn[16] = "Changing control group";
+ $error_vpn[17] = "Device ID information is unavailable";
+ $error_vpn[18] = "Changing device ID";
+ $error_vpn[19] = "Cleanup in progress";
- $ERROR_AED[0] = "Other";
- $ERROR_AED[1] = "Overlay is Down";
- $ERROR_AED[2] = "Site ID is not configured";
- $ERROR_AED[3] = "Site ID mismatch";
- $ERROR_AED[4] = "Version mismatch";
- $ERROR_AED[5] = "Site VLAN is Down";
- $ERROR_AED[6] = "No extended VLAN is operationally up";
- $ERROR_AED[7] = "No Overlay Adjacency is up";
- $ERROR_AED[8] = "LSPDB sync incomplete";
- $ERROR_AED[9] = "Overlay state down event in progress";
- $ERROR_AED[10] = "ISIS control group sync pending";
+ $error_aed = array();
+ $error_aed[0] = "Other";
+ $error_aed[1] = "Overlay is Down";
+ $error_aed[2] = "Site ID is not configured";
+ $error_aed[3] = "Site ID mismatch";
+ $error_aed[4] = "Version mismatch";
+ $error_aed[5] = "Site VLAN is Down";
+ $error_aed[6] = "No extended VLAN is operationally up";
+ $error_aed[7] = "No Overlay Adjacency is up";
+ $error_aed[8] = "LSPDB sync incomplete";
+ $error_aed[9] = "Overlay state down event in progress";
+ $error_aed[10] = "ISIS control group sync pending";
- $ERROR_OVERLAY[1] = "active";
- $ERROR_OVERLAY[2] = "notInService";
- $ERROR_OVERLAY[3] = "notReady";
- $ERROR_OVERLAY[4] = "createAndGo";
- $ERROR_OVERLAY[5] = "createAndWait";
- $ERROR_OVERLAY[6] = "destroy";
+ $error_overlay = array();
+ $error_overlay[1] = "active";
+ $error_overlay[2] = "notInService";
+ $error_overlay[3] = "notReady";
+ $error_overlay[4] = "createAndGo";
+ $error_overlay[5] = "createAndWait";
+ $error_overlay[6] = "destroy";
- $MODULE = 'Cisco-OTV';
+ $module = 'Cisco-OTV';
require_once 'includes/component.php';
- $COMPONENT = new component();
- $options['filter']['type'] = array('=',$MODULE);
+ $component = new component();
+ $options['filter']['type'] = array('=',$module);
$options['filter']['disabled'] = array('=',0);
- $COMPONENTS = $COMPONENT->getComponents($device['device_id'],$options);
+ $components = $component->getComponents($device['device_id'],$options);
// We only care about our device id.
- $COMPONENTS = $COMPONENTS[$device['device_id']];
+ $components = $components[$device['device_id']];
// Only collect SNMP data if we have enabled components
- if (count($COMPONENTS > 0)) {
+ if (count($components > 0)) {
// Let's gather the stats..
$tblOverlayEntry = snmpwalk_array_num($device, '.1.3.6.1.4.1.9.9.810.1.2.1.1');
$tblAdjacencyDatabaseEntry = snmpwalk_array_num($device, '.1.3.6.1.4.1.9.9.810.1.3.1.1', 0);
@@ -74,89 +77,89 @@ if ($device['os_group'] == "cisco") {
$tblVlanEdgeDevIsAed = snmpwalk_array_num($device, '.1.3.6.1.4.1.9.9.810.1.2.2.1.6', 2);
// Let's create an array of each remote OTV endpoint and the count of MAC addresses that are reachable via.
- $COUNT_MAC = array();
+ $count_mac = array();
foreach ($tblRouteNextHopAddr as $k => $v) {
- $COUNT_MAC[$v]++;
+ $count_mac[$v]++;
}
// Loop through the components and extract the data.
- foreach ($COMPONENTS as $KEY => &$ARRAY) {
+ foreach ($components as $key => &$array) {
- if ($ARRAY['otvtype'] == 'overlay') {
+ if ($array['otvtype'] == 'overlay') {
// Let's check the varius status' of the overlay
$message = false;
- $vpn_state = $tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.3'][$ARRAY['index']];
+ $vpn_state = $tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.3'][$array['index']];
if ($vpn_state != 2) {
- $message .= "VPN Down: ".$ERROR_VPN[$tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.4'][$ARRAY['index']]];
+ $message .= "VPN Down: ".$error_vpn[$tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.4'][$array['index']]];
}
- $aed_state = $tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.13'][$ARRAY['index']];
+ $aed_state = $tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.13'][$array['index']];
if ($aed_state == 2) {
- $message .= "AED Down: ".$ERROR_AED[$tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.14'][$ARRAY['index']]];
+ $message .= "AED Down: ".$error_aed[$tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.14'][$array['index']]];
}
- $overlay_state = $tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.23'][$ARRAY['index']];
+ $overlay_state = $tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.23'][$array['index']];
if ($overlay_state == 2) {
- $message .= "Overlay Down: ".$ERROR_OVERLAY[$tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.24'][$ARRAY['index']]];
+ $message .= "Overlay Down: ".$error_overlay[$tblOverlayEntry['1.3.6.1.4.1.9.9.810.1.2.1.1.24'][$array['index']]];
}
// If we have set a message, we have an error, activate alert.
if ($message !== false) {
- $ARRAY['error'] = $message;
- $ARRAY['status'] = 0;
+ $array['error'] = $message;
+ $array['status'] = 0;
}
else {
- $ARRAY['error'] = "";
- $ARRAY['status'] = 1;
+ $array['error'] = "";
+ $array['status'] = 1;
}
// Time to graph the count of the active VLAN's on this overlay.
- $COUNT_VLAN = 0;
- foreach ($tblVlanEdgeDevIsAed['1.3.6.1.4.1.9.9.810.1.2.2.1.6'][$ARRAY['index']] as $v) {
+ $count_vlan = 0;
+ foreach ($tblVlanEdgeDevIsAed['1.3.6.1.4.1.9.9.810.1.2.2.1.6'][$array['index']] as $v) {
if ($v == 1) {
- $COUNT_VLAN++;
+ $count_vlan++;
}
}
- $filename = "cisco-otv-".$ARRAY['label']."-vlan.rrd";
+ $filename = "cisco-otv-".$array['label']."-vlan.rrd";
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename ($filename);
if (!file_exists ($rrd_filename)) {
rrdtool_create ($rrd_filename, " DS:count:GAUGE:600:0:U" . $config['rrd_rra']);
}
- $RRD['count'] = $COUNT_VLAN;
+ $rrd['count'] = $count_vlan;
// Update RRD
- rrdtool_update ($rrd_filename, $RRD);
+ rrdtool_update ($rrd_filename, $rrd);
}
- elseif ($ARRAY['otvtype'] == 'adjacency') {
- $ARRAY['uptime'] = $tblAdjacencyDatabaseEntry['1.3.6.1.4.1.9.9.810.1.3.1.1.6.'.$ARRAY['index'].'.1.4.'.$ARRAY['endpoint']];
+ elseif ($array['otvtype'] == 'adjacency') {
+ $array['uptime'] = $tblAdjacencyDatabaseEntry['1.3.6.1.4.1.9.9.810.1.3.1.1.6.'.$array['index'].'.1.4.'.$array['endpoint']];
$message = false;
- if ($tblAdjacencyDatabaseEntry['1.3.6.1.4.1.9.9.810.1.3.1.1.5.'.$ARRAY['index'].'.1.4.'.$ARRAY['endpoint']] != 1) {
+ if ($tblAdjacencyDatabaseEntry['1.3.6.1.4.1.9.9.810.1.3.1.1.5.'.$array['index'].'.1.4.'.$array['endpoint']] != 1) {
$message .= "Adjacency is Down\n";
}
- if ($tblAdjacencyDatabaseEntry['1.3.6.1.4.1.9.9.810.1.3.1.1.6.'.$ARRAY['index'].'.1.4.'.$ARRAY['endpoint']] < $ARRAY['uptime']) {
+ if ($tblAdjacencyDatabaseEntry['1.3.6.1.4.1.9.9.810.1.3.1.1.6.'.$array['index'].'.1.4.'.$array['endpoint']] < $array['uptime']) {
$message .= "Adjacency has been reset\n";
}
// If we have set a message, we have an error, activate alert.
if ($message !== false) {
- $ARRAY['error'] = $message;
- $ARRAY['status'] = 0;
+ $array['error'] = $message;
+ $array['status'] = 0;
}
else {
- $ARRAY['error'] = "";
- $ARRAY['status'] = 1;
+ $array['error'] = "";
+ $array['status'] = 1;
}
}
- elseif ($ARRAY['otvtype'] == 'endpoint') {
- if (isset($COUNT_MAC[$ARRAY['endpoint']])) {
- $RRD['count'] = $COUNT_MAC[$ARRAY['endpoint']];
+ elseif ($array['otvtype'] == 'endpoint') {
+ if (isset($count_mac[$array['endpoint']])) {
+ $rrd['count'] = $count_mac[$array['endpoint']];
}
else {
- $RRD['count'] = "0";
+ $rrd['count'] = "0";
}
- $filename = "cisco-otv-".$ARRAY['endpoint']."-mac.rrd";
+ $filename = "cisco-otv-".$array['endpoint']."-mac.rrd";
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename ($filename);
if (!file_exists ($rrd_filename)) {
@@ -164,18 +167,18 @@ if ($device['os_group'] == "cisco") {
}
// Update RRD
- rrdtool_update ($rrd_filename, $RRD);
+ rrdtool_update ($rrd_filename, $rrd);
} // End If
} // End foreach components
// Write the Components back to the DB.
- $COMPONENT->setComponentPrefs($device['device_id'],$COMPONENTS);
+ $component->setComponentPrefs($device['device_id'],$components);
- echo $MODULE." ";
+ echo $module." ";
} // end if count components
// Clean-up after yourself!
- unset($COMPONENTS, $COMPONENT, $MODULE);
+ unset($components, $component, $module);
}
\ No newline at end of file
diff --git a/includes/snmp.inc.php b/includes/snmp.inc.php
index cee0032cc..7707b18fe 100644
--- a/includes/snmp.inc.php
+++ b/includes/snmp.inc.php
@@ -1293,9 +1293,9 @@ function register_mibs($device, $mibs, $included_by)
* @internal param $string
* @return array
*/
-function snmpwalk_array_num($device,$OID,$indexes=1) {
+function snmpwalk_array_num($device,$oid,$indexes=1) {
$array = array();
- $string = snmp_walk($device, $OID, '-Osqn');
+ $string = snmp_walk($device, $oid, '-Osqn');
if ( $string === false) {
// False means: No Such Object.