From 8f4dbb533801a00f2e781cd057ddbd4dd3041ce3 Mon Sep 17 00:00:00 2001 From: Aaron Daniels Date: Thu, 21 Jan 2016 22:04:20 +1000 Subject: [PATCH 01/19] Cisco OTV Implements the CISCO-OTV-MIB to retrieve OTV counters from Cisco devices. This collects information on the configured Overlays and Adjacencies Statistics are collected for the amount of VLAN's on each overlay and the amount of MAC addresses available over each OTV endpoint. OTV alerts are collected and generated if the appropriate alerting rules exist. Data is displayed under routing at both the global and device level. Includes function snmpwalk_array_num, which performs a numeric SNMPWalk and returns an array containing $count indexes One Index: From: 1.3.6.1.4.1.9.9.166.1.15.1.1.27.18.655360 = 0 To: $array['1.3.6.1.4.1.9.9.166.1.15.1.1.27.18']['655360'] = 0 Two Indexes: From: 1.3.6.1.4.1.9.9.166.1.15.1.1.27.18.655360 = 0 To: $array['1.3.6.1.4.1.9.9.166.1.15.1.1.27']['18']['655360'] = 0 And so on... --- doc/Extensions/Component.md | 6 +- .../graphs/device/cisco-otv-mac.inc.php | 62 +++++ .../graphs/device/cisco-otv-vlan.inc.php | 62 +++++ html/includes/print-menubar.php | 18 +- html/pages/device.inc.php | 10 + html/pages/device/routing.inc.php | 1 + html/pages/device/routing/cisco-otv.inc.php | 94 +++++++ html/pages/routing.inc.php | 2 + html/pages/routing/cisco-otv.inc.php | 58 +++++ includes/defaults.inc.php | 2 + includes/discovery/cisco-otv.inc.php | 235 ++++++++++++++++++ includes/polling/cisco-otv.inc.php | 181 ++++++++++++++ includes/snmp.inc.php | 66 +++++ 13 files changed, 793 insertions(+), 4 deletions(-) create mode 100644 html/includes/graphs/device/cisco-otv-mac.inc.php create mode 100644 html/includes/graphs/device/cisco-otv-vlan.inc.php create mode 100644 html/pages/device/routing/cisco-otv.inc.php create mode 100644 html/pages/routing/cisco-otv.inc.php create mode 100644 includes/discovery/cisco-otv.inc.php create mode 100644 includes/polling/cisco-otv.inc.php diff --git a/doc/Extensions/Component.md b/doc/Extensions/Component.md index 235335380..13bef6b4e 100644 --- a/doc/Extensions/Component.md +++ b/doc/Extensions/Component.md @@ -307,11 +307,11 @@ To see an example of how the component module can used, please see the following - Cisco CBQoS - includes/discovery/cisco-cbqos.inc.php - - includes/poller/cisco-cbqos.inc.php + - includes/polling/cisco-cbqos.inc.php - html/includes/graphs/device/cbqos_traffic.inc.php - Cisco OTV - includes/discovery/cisco-otv.inc.php - - includes/poller/applications/cisco-otv.inc.php + - includes/polling/cisco-otv.inc.php - html/includes/graphs/device/cisco-otv-mac.inc.php - - html/pages/device/apps/cisco-otv.inc.php + - html/pages/routing/cisco-otv.inc.php diff --git a/html/includes/graphs/device/cisco-otv-mac.inc.php b/html/includes/graphs/device/cisco-otv-mac.inc.php new file mode 100644 index 000000000..5c616869e --- /dev/null +++ b/html/includes/graphs/device/cisco-otv-mac.inc.php @@ -0,0 +1,62 @@ + + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. Please see LICENSE.txt at the top level of + * the source code distribution for details. + */ + +require_once "../includes/component.php"; +$COMPONENT = new component(); +$options['filter']['type'] = array('=','Cisco-OTV'); +$COMPONENTS = $COMPONENT->getComponents($device['device_id'],$options); + +// We only care about our device id. +$COMPONENTS = $COMPONENTS[$device['device_id']]; + +include "includes/graphs/common.inc.php"; +$rrd_options .= " -l 0 -E "; +$rrd_options .= " COMMENT:'MAC Addresses Now Min Max\\n'"; +$rrd_additions = ""; + +$COUNT = 0; +foreach ($COMPONENTS as $ID => $ARRAY) { + if ($ARRAY['otvtype'] == 'endpoint') { + $rrd_filename = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename("cisco-otv-".$ARRAY['endpoint']."-mac.rrd"); + + if (file_exists($rrd_filename)) { + // Stack the area on the second and subsequent DS's + $STACK = ""; + if ($COUNT != 0) { + $STACK = ":STACK "; + } + + // Grab a color from the array. + if ( isset($config['graph_colours']['mixed'][$COUNT]) ) { + $COLOR = $config['graph_colours']['mixed'][$COUNT]; + } + else { + $COLOR = $config['graph_colours']['oranges'][$COUNT-7]; + } + + $rrd_additions .= " DEF:DS" . $COUNT . "=" . $rrd_filename . ":count:AVERAGE "; + $rrd_additions .= " AREA:DS" . $COUNT . "#" . $COLOR . ":'" . str_pad(substr($COMPONENTS[$ID]['endpoint'],0,15),15) . "'" . $STACK; + $rrd_additions .= " GPRINT:DS" . $COUNT . ":LAST:%4.0lf%s "; + $rrd_additions .= " GPRINT:DS" . $COUNT . ":MIN:%4.0lf%s "; + $rrd_additions .= " GPRINT:DS" . $COUNT . ":MAX:%4.0lf%s\\\l "; + $COUNT++; + } + } +} + +if ($rrd_additions == "") { + // We didn't add any data points. +} +else { + $rrd_options .= $rrd_additions; +} diff --git a/html/includes/graphs/device/cisco-otv-vlan.inc.php b/html/includes/graphs/device/cisco-otv-vlan.inc.php new file mode 100644 index 000000000..8ee50acf4 --- /dev/null +++ b/html/includes/graphs/device/cisco-otv-vlan.inc.php @@ -0,0 +1,62 @@ + + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. Please see LICENSE.txt at the top level of + * the source code distribution for details. + */ + +require_once "../includes/component.php"; +$COMPONENT = new component(); +$options['filter']['type'] = array('=','Cisco-OTV'); +$COMPONENTS = $COMPONENT->getComponents($device['device_id'],$options); + +// We only care about our device id. +$COMPONENTS = $COMPONENTS[$device['device_id']]; + +include "includes/graphs/common.inc.php"; +$rrd_options .= " -l 0 -E "; +$rrd_options .= " COMMENT:'VLANs Now Min Max\\n'"; +$rrd_additions = ""; + +$COUNT = 0; +foreach ($COMPONENTS as $ID => $ARRAY) { + if ($ARRAY['otvtype'] == 'overlay') { + $rrd_filename = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename("cisco-otv-".$ARRAY['label']."-vlan.rrd"); + + if (file_exists($rrd_filename)) { + // Stack the area on the second and subsequent DS's + $STACK = ""; + if ($COUNT != 0) { + $STACK = ":STACK "; + } + + // Grab a color from the array. + if ( isset($config['graph_colours']['mixed'][$COUNT]) ) { + $COLOR = $config['graph_colours']['mixed'][$COUNT]; + } + else { + $COLOR = $config['graph_colours']['oranges'][$COUNT-7]; + } + + $rrd_additions .= " DEF:DS" . $COUNT . "=" . $rrd_filename . ":count:AVERAGE "; + $rrd_additions .= " AREA:DS" . $COUNT . "#" . $COLOR . ":'" . str_pad(substr($COMPONENTS[$ID]['label'],0,15),15) . "'" . $STACK; + $rrd_additions .= " GPRINT:DS" . $COUNT . ":LAST:%4.0lf%s "; + $rrd_additions .= " GPRINT:DS" . $COUNT . ":MIN:%4.0lf%s "; + $rrd_additions .= " GPRINT:DS" . $COUNT . ":MAX:%4.0lf%s\\\l "; + $COUNT++; + } + } +} + +if ($rrd_additions == "") { + // We didn't add any data points. +} +else { + $rrd_options .= $rrd_additions; +} diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php index 74ae6f7a1..859af924f 100644 --- a/html/includes/print-menubar.php +++ b/html/includes/print-menubar.php @@ -420,7 +420,13 @@ $routing_count['ospf'] = dbFetchCell("SELECT COUNT(ospf_instance_id) FROM `ospf_ $routing_count['cef'] = dbFetchCell("SELECT COUNT(cef_switching_id) from `cef_switching`"); $routing_count['vrf'] = dbFetchCell("SELECT COUNT(vrf_id) from `vrfs`"); -if ($_SESSION['userlevel'] >= '5' && ($routing_count['bgp']+$routing_count['ospf']+$routing_count['cef']+$routing_count['vrf']) > "0") { +require_once "../includes/component.php"; +$COMPONENT = new component(); +$options['type'] = 'Cisco-OTV'; +$OTV = $COMPONENT->getComponents(null,$options); +$routing_count['cisco-otv'] = count($OTV); + +if ($_SESSION['userlevel'] >= '5' && ($routing_count['bgp']+$routing_count['ospf']+$routing_count['cef']+$routing_count['vrf']+$routing_count['cisco-otv']) > "0") { ?>
  • @@ -443,6 +449,16 @@ if ($_SESSION['userlevel'] >= '5' && ($routing_count['bgp']+$routing_count['ospf $separator++; } + // Cisco OTV Links + if ($_SESSION['userlevel'] >= '5' && $routing_count['cisco-otv']) { + if ($separator) { + echo('
    • '); + $separator = 0; + } + echo('
  • Cisco OTV
    • '); + $separator++; + } + // BGP Sessions if ($_SESSION['userlevel'] >= '5' && $routing_count['bgp']) { if ($separator) { diff --git a/html/pages/device.inc.php b/html/pages/device.inc.php index 94a296822..3de92da54 100644 --- a/html/pages/device.inc.php +++ b/html/pages/device.inc.php @@ -210,6 +210,16 @@ if (device_permitted($vars['device']) || $check_device == $vars['device']) { $routing_tabs[] = 'vrf'; } + require_once "../includes/component.php"; + $COMPONENT = new component(); + $options['type'] = 'Cisco-OTV'; + $options['filter']['device_id'] = array('=',$device['device_id']); + $OTV = $COMPONENT->getComponents(null,$options); + $device_routing_count['cisco-otv'] = count($OTV); + if ($device_routing_count['cisco-otv'] > 0) { + $routing_tabs[] = 'cisco-otv'; + } + if (is_array($routing_tabs)) { echo '
  • diff --git a/html/pages/device/routing.inc.php b/html/pages/device/routing.inc.php index e4be54617..c58fe17a8 100644 --- a/html/pages/device/routing.inc.php +++ b/html/pages/device/routing.inc.php @@ -20,6 +20,7 @@ $type_text['bgp'] = 'BGP'; $type_text['cef'] = 'CEF'; $type_text['ospf'] = 'OSPF'; $type_text['vrf'] = 'VRFs'; +$type_text['cisco-otv'] = 'OTV'; print_optionbar_start(); diff --git a/html/pages/device/routing/cisco-otv.inc.php b/html/pages/device/routing/cisco-otv.inc.php new file mode 100644 index 000000000..f29a9c9ae --- /dev/null +++ b/html/pages/device/routing/cisco-otv.inc.php @@ -0,0 +1,94 @@ +getComponents($device['device_id'],$options); +$COMPONENTS = $COMPONENTS[$device['device_id']]; + +global $config; +?> +
    +
    +

    Overlay's & Adjacencies

    +
    +
    + $OVERLAY) { + if ($OVERLAY['otvtype'] == 'overlay') { + if ($OVERLAY['status'] == 1) { + $OVERLAY_STATUS = "Normal"; + $GLI = ""; + } + else { + $OVERLAY_STATUS = "".$OVERLAY['error']." - Alert"; + $GLI = "list-group-item-danger"; + } +?> + - + + +
    +
    + +
    +
    +

    AED Enabled VLAN's

    +
    +
    + +
    +
    + +
    +
    +

    MAC Addresses

    +
    +
    + +
    +
    diff --git a/html/pages/routing.inc.php b/html/pages/routing.inc.php index 0a7fcb335..848c655e2 100644 --- a/html/pages/routing.inc.php +++ b/html/pages/routing.inc.php @@ -16,6 +16,7 @@ $type_text['bgp'] = 'BGP'; $type_text['cef'] = 'CEF'; $type_text['ospf'] = 'OSPF'; $type_text['vrf'] = 'VRFs'; +$type_text['cisco-otv'] = 'OTV'; print_optionbar_start(); @@ -53,6 +54,7 @@ switch ($vars['protocol']) { case 'vrf': case 'cef': case 'ospf': + case 'cisco-otv': include 'pages/routing/'.$vars['protocol'].'.inc.php'; break; diff --git a/html/pages/routing/cisco-otv.inc.php b/html/pages/routing/cisco-otv.inc.php new file mode 100644 index 000000000..00ca33bdd --- /dev/null +++ b/html/pages/routing/cisco-otv.inc.php @@ -0,0 +1,58 @@ +getComponents(null,$options); + +foreach ($COMPONENTS as $DEVICE_ID => $COMP) { + $LINK = generate_url(array('page' => 'device', 'device' => $DEVICE_ID, 'tab' => 'routing', 'proto' => 'cisco-otv')); +?> +
    +
    +

    - Overlay's & Adjacencies

    +
    +
    + $OVERLAY) { + if ($OVERLAY['otvtype'] == 'overlay') { + if ($OVERLAY['status'] == 1) { + $OVERLAY_STATUS = "Normal"; + $GLI = ""; + } + else { + $OVERLAY_STATUS = "".$OVERLAY['error']." - Alert"; + $GLI = "list-group-item-danger"; + } + ?> + - + + +
    +
    + + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. Please see LICENSE.txt at the top level of + * the source code distribution for details. + */ + +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_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"; + + $MODULE = 'Cisco-OTV'; + echo $MODULE.': '; + + require_once 'includes/component.php'; + $COMPONENT = new component(); + $COMPONENTS = $COMPONENT->getComponents($device['device_id'],array('type'=>$MODULE)); + + // We only care about our device id. + $COMPONENTS = $COMPONENTS[$device['device_id']]; + + // Begin our master array, all other values will be processed into this array. + $tblOTV = array(); + $tblEndpoints = array(); + + // Let's gather some data.. + $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); + $tblAdjacentDevName = snmpwalk_array_num($device, '.1.3.6.1.4.1.9.9.810.1.3.1.1.4', 0); + + /* + * False == no object found - this is not an error, there is no QOS configured + * null == timeout or something else that caused an error, there may be QOS configured but we couldn't get it. + */ + if ( is_null($tblOverlayEntry) || is_null($tblAdjacencyDatabaseEntry) || is_null($tblAdjacentDevName) ) { + // We have to error here or we will end up deleting all our components. + echo "Error\n"; + } + else { + // No Error, lets process things. + + // 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(); + $message = false; + $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'; + } + else { + $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['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"; + } + + // If we have set a message, we have an error, activate alert. + if ($message !== false) { + $RESULT['error'] = $message; + $RESULT['status'] = 0; + } + else { + $RESULT['error'] = ""; + $RESULT['status'] = 1; + } + + // Add the result to the parent array. + $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]; + $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']]; + $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) { + $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; + } + else { + $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; + // 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; + } + } + + // Add the result to the parent array. + $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; + + // Add the result to the parent array. + $tblOTV[] = $RESULT; + } + + /* + * Ok, we have our 2 array's (Components and SNMP) now we need + * to compare and see what needs to be added/updated. + * + * 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; + + // 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; + } + } + + 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); + echo "+"; + } + else { + // The component does exist, merge the details in - UPDATE. + $COMPONENTS[$COMPONENT_KEY] = array_merge($COMPONENTS[$COMPONENT_KEY], $array); + echo "."; + } + + } + + /* + * Loop over the Component data to see if we need to DELETE any components. + */ + foreach ($COMPONENTS as $key => $array) { + // Guilty until proven innocent + $FOUND = false; + + foreach ($tblOTV as $k => $v) { + if ($array['UID'] == $v['UID']) { + // Yay, we found it... + $FOUND = true; + } + } + + if ($FOUND === false) { + // The component has not been found. we should delete it. + echo "-"; + $COMPONENT->deleteComponent($key); + } + } + + // Write the Components back to the DB. + $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 new file mode 100644 index 000000000..47839fa31 --- /dev/null +++ b/includes/polling/cisco-otv.inc.php @@ -0,0 +1,181 @@ + + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. Please see LICENSE.txt at the top level of + * the source code distribution for details. + */ + +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_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"; + + $MODULE = 'Cisco-OTV'; + + require_once 'includes/component.php'; + $COMPONENT = new component(); + $options['filter']['type'] = array('=',$MODULE); + $options['filter']['disabled'] = array('=',0); + $COMPONENTS = $COMPONENT->getComponents($device['device_id'],$options); + + // We only care about our device id. + $COMPONENTS = $COMPONENTS[$device['device_id']]; + + // Only collect SNMP data if we have enabled components + 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); + $tblRouteNextHopAddr = snmpwalk_array_num($device, '.1.3.6.1.4.1.9.9.810.1.5.1.1.8', 0); + $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(); + foreach ($tblRouteNextHopAddr as $k => $v) { + $COUNT_MAC[$v]++; + } + + // Loop through the components and extract the data. + foreach ($COMPONENTS as $KEY => &$ARRAY) { + + 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']]; + 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']]]; + } + $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']]]; + } + $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']]]; + } + + // If we have set a message, we have an error, activate alert. + if ($message !== false) { + $ARRAY['error'] = $message; + $ARRAY['status'] = 0; + } + else { + $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) { + if ($v == 1) { + $COUNT_VLAN++; + } + } + + $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; + + // Update 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']]; + $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) { + $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']) { + $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; + } + else { + $ARRAY['error'] = ""; + $ARRAY['status'] = 1; + } + } + elseif ($ARRAY['otvtype'] == 'endpoint') { + if (isset($COUNT_MAC[$ARRAY['endpoint']])) { + $RRD['count'] = $COUNT_MAC[$ARRAY['endpoint']]; + } + else { + $RRD['count'] = "0"; + } + + $filename = "cisco-otv-".$ARRAY['endpoint']."-mac.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']); + } + + // Update RRD + rrdtool_update ($rrd_filename, $RRD); + + } // End If + + } // End foreach components + + // Write the Components back to the DB. + $COMPONENT->setComponentPrefs($device['device_id'],$COMPONENTS); + + echo $MODULE." "; + } // end if count components + + // Clean-up after yourself! + unset($COMPONENTS, $COMPONENT, $MODULE); +} \ No newline at end of file diff --git a/includes/snmp.inc.php b/includes/snmp.inc.php index e2d4bac01..cee0032cc 100644 --- a/includes/snmp.inc.php +++ b/includes/snmp.inc.php @@ -1268,4 +1268,70 @@ function register_mibs($device, $mibs, $included_by) } echo "\n"; + } // register_mibs + +/** + * SNMPWalk_array_num - performs a numeric SNMPWalk and returns an array containing $count indexes + * One Index: + * From: 1.3.6.1.4.1.9.9.166.1.15.1.1.27.18.655360 = 0 + * To: $array['1.3.6.1.4.1.9.9.166.1.15.1.1.27.18']['655360'] = 0 + * Two Indexes: + * From: 1.3.6.1.4.1.9.9.166.1.15.1.1.27.18.655360 = 0 + * To: $array['1.3.6.1.4.1.9.9.166.1.15.1.1.27']['18']['655360'] = 0 + * And so on... + * Think snmpwalk_cache_*_oid but for numeric data. + * + * Why is this useful? + * Some SNMP data contains a single index (eg. ifIndex in IF-MIB) and some is dual indexed + * (eg. PolicyIndex/ObjectsIndex in CISCO-CLASS-BASED-QOS-MIB). + * The resulting array allows us to easily access the top level index we want and iterate over the data from there. + * + * @param $device + * @param $OID + * @param int $indexes + * @internal param $string + * @return array + */ +function snmpwalk_array_num($device,$OID,$indexes=1) { + $array = array(); + $string = snmp_walk($device, $OID, '-Osqn'); + + if ( $string === false) { + // False means: No Such Object. + return false; + } + if ($string == "") { + // Empty means SNMP timeout or some such. + return null; + } + + // Let's turn the string into something we can work with. + foreach (explode("\n", $string) as $line) { + if ($line[0] == '.') { + // strip the leading . if it exists. + $line = substr($line,1); + } + list($key, $value) = explode(' ', $line, 2); + $prop_id = explode('.', $key); + $value = trim($value); + + // if we have requested more levels that exist, set to the max. + if ($indexes > count($prop_id)) { + $indexes = count($prop_id)-1; + } + + for ($i=0;$i<$indexes;$i++) { + // Pop the index off. + $index = array_pop($prop_id); + $value = array($index => $value); + } + + // Rebuild our key + $key = implode('.',$prop_id); + + // Add the entry to the master array + $array = array_replace_recursive($array,array($key => $value)); + } + return $array; +} From d96e2216a7137a21f4231ee456b4219458035903 Mon Sep 17 00:00:00 2001 From: Aaron Daniels Date: Thu, 28 Jan 2016 07:04:12 +1000 Subject: [PATCH 02/19] - Changed upper case variables to lower case. --- .../graphs/device/cisco-otv-mac.inc.php | 38 ++-- .../graphs/device/cisco-otv-vlan.inc.php | 38 ++-- html/includes/print-menubar.php | 6 +- html/pages/device.inc.php | 6 +- html/pages/device/routing/cisco-otv.inc.php | 40 ++-- includes/discovery/cisco-otv.inc.php | 205 +++++++++--------- includes/polling/cisco-otv.inc.php | 163 +++++++------- includes/snmp.inc.php | 4 +- 8 files changed, 253 insertions(+), 247 deletions(-) diff --git a/html/includes/graphs/device/cisco-otv-mac.inc.php b/html/includes/graphs/device/cisco-otv-mac.inc.php index 5c616869e..691bfd10d 100644 --- a/html/includes/graphs/device/cisco-otv-mac.inc.php +++ b/html/includes/graphs/device/cisco-otv-mac.inc.php @@ -12,44 +12,44 @@ */ require_once "../includes/component.php"; -$COMPONENT = new component(); +$component = new component(); $options['filter']['type'] = array('=','Cisco-OTV'); -$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']]; include "includes/graphs/common.inc.php"; $rrd_options .= " -l 0 -E "; $rrd_options .= " COMMENT:'MAC Addresses Now Min Max\\n'"; $rrd_additions = ""; -$COUNT = 0; -foreach ($COMPONENTS as $ID => $ARRAY) { - if ($ARRAY['otvtype'] == 'endpoint') { - $rrd_filename = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename("cisco-otv-".$ARRAY['endpoint']."-mac.rrd"); +$count = 0; +foreach ($components as $id => $array) { + if ($array['otvtype'] == 'endpoint') { + $rrd_filename = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename("cisco-otv-".$array['endpoint']."-mac.rrd"); if (file_exists($rrd_filename)) { // Stack the area on the second and subsequent DS's - $STACK = ""; - if ($COUNT != 0) { - $STACK = ":STACK "; + $stack = ""; + if ($count != 0) { + $stack = ":STACK "; } // Grab a color from the array. - if ( isset($config['graph_colours']['mixed'][$COUNT]) ) { - $COLOR = $config['graph_colours']['mixed'][$COUNT]; + if ( isset($config['graph_colours']['mixed'][$count]) ) { + $color = $config['graph_colours']['mixed'][$count]; } else { - $COLOR = $config['graph_colours']['oranges'][$COUNT-7]; + $color = $config['graph_colours']['oranges'][$count-7]; } - $rrd_additions .= " DEF:DS" . $COUNT . "=" . $rrd_filename . ":count:AVERAGE "; - $rrd_additions .= " AREA:DS" . $COUNT . "#" . $COLOR . ":'" . str_pad(substr($COMPONENTS[$ID]['endpoint'],0,15),15) . "'" . $STACK; - $rrd_additions .= " GPRINT:DS" . $COUNT . ":LAST:%4.0lf%s "; - $rrd_additions .= " GPRINT:DS" . $COUNT . ":MIN:%4.0lf%s "; - $rrd_additions .= " GPRINT:DS" . $COUNT . ":MAX:%4.0lf%s\\\l "; - $COUNT++; + $rrd_additions .= " DEF:DS" . $count . "=" . $rrd_filename . ":count:AVERAGE "; + $rrd_additions .= " AREA:DS" . $count . "#" . $color . ":'" . str_pad(substr($components[$id]['endpoint'],0,15),15) . "'" . $stack; + $rrd_additions .= " GPRINT:DS" . $count . ":LAST:%4.0lf%s "; + $rrd_additions .= " GPRINT:DS" . $count . ":MIN:%4.0lf%s "; + $rrd_additions .= " GPRINT:DS" . $count . ":MAX:%4.0lf%s\\\l "; + $count++; } } } diff --git a/html/includes/graphs/device/cisco-otv-vlan.inc.php b/html/includes/graphs/device/cisco-otv-vlan.inc.php index 8ee50acf4..1116e056c 100644 --- a/html/includes/graphs/device/cisco-otv-vlan.inc.php +++ b/html/includes/graphs/device/cisco-otv-vlan.inc.php @@ -12,44 +12,44 @@ */ require_once "../includes/component.php"; -$COMPONENT = new component(); +$component = new component(); $options['filter']['type'] = array('=','Cisco-OTV'); -$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']]; include "includes/graphs/common.inc.php"; $rrd_options .= " -l 0 -E "; $rrd_options .= " COMMENT:'VLANs Now Min Max\\n'"; $rrd_additions = ""; -$COUNT = 0; -foreach ($COMPONENTS as $ID => $ARRAY) { - if ($ARRAY['otvtype'] == 'overlay') { - $rrd_filename = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename("cisco-otv-".$ARRAY['label']."-vlan.rrd"); +$count = 0; +foreach ($components as $id => $array) { + if ($array['otvtype'] == 'overlay') { + $rrd_filename = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename("cisco-otv-".$array['label']."-vlan.rrd"); if (file_exists($rrd_filename)) { // Stack the area on the second and subsequent DS's - $STACK = ""; - if ($COUNT != 0) { - $STACK = ":STACK "; + $stack = ""; + if ($count != 0) { + $stack = ":STACK "; } // Grab a color from the array. - if ( isset($config['graph_colours']['mixed'][$COUNT]) ) { - $COLOR = $config['graph_colours']['mixed'][$COUNT]; + if ( isset($config['graph_colours']['mixed'][$count]) ) { + $color = $config['graph_colours']['mixed'][$count]; } else { - $COLOR = $config['graph_colours']['oranges'][$COUNT-7]; + $color = $config['graph_colours']['oranges'][$count-7]; } - $rrd_additions .= " DEF:DS" . $COUNT . "=" . $rrd_filename . ":count:AVERAGE "; - $rrd_additions .= " AREA:DS" . $COUNT . "#" . $COLOR . ":'" . str_pad(substr($COMPONENTS[$ID]['label'],0,15),15) . "'" . $STACK; - $rrd_additions .= " GPRINT:DS" . $COUNT . ":LAST:%4.0lf%s "; - $rrd_additions .= " GPRINT:DS" . $COUNT . ":MIN:%4.0lf%s "; - $rrd_additions .= " GPRINT:DS" . $COUNT . ":MAX:%4.0lf%s\\\l "; - $COUNT++; + $rrd_additions .= " DEF:DS" . $count . "=" . $rrd_filename . ":count:AVERAGE "; + $rrd_additions .= " AREA:DS" . $count . "#" . $color . ":'" . str_pad(substr($components[$id]['label'],0,15),15) . "'" . $stack; + $rrd_additions .= " GPRINT:DS" . $count . ":LAST:%4.0lf%s "; + $rrd_additions .= " GPRINT:DS" . $count . ":MIN:%4.0lf%s "; + $rrd_additions .= " GPRINT:DS" . $count . ":MAX:%4.0lf%s\\\l "; + $count++; } } } diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php index 859af924f..4c22ad08b 100644 --- a/html/includes/print-menubar.php +++ b/html/includes/print-menubar.php @@ -421,10 +421,10 @@ $routing_count['cef'] = dbFetchCell("SELECT COUNT(cef_switching_id) from `cef_s $routing_count['vrf'] = dbFetchCell("SELECT COUNT(vrf_id) from `vrfs`"); require_once "../includes/component.php"; -$COMPONENT = new component(); +$component = new component(); $options['type'] = 'Cisco-OTV'; -$OTV = $COMPONENT->getComponents(null,$options); -$routing_count['cisco-otv'] = count($OTV); +$otv = $component->getComponents(null,$options); +$routing_count['cisco-otv'] = count($otv); if ($_SESSION['userlevel'] >= '5' && ($routing_count['bgp']+$routing_count['ospf']+$routing_count['cef']+$routing_count['vrf']+$routing_count['cisco-otv']) > "0") { diff --git a/html/pages/device.inc.php b/html/pages/device.inc.php index 3de92da54..fd5900401 100644 --- a/html/pages/device.inc.php +++ b/html/pages/device.inc.php @@ -211,11 +211,11 @@ if (device_permitted($vars['device']) || $check_device == $vars['device']) { } require_once "../includes/component.php"; - $COMPONENT = new component(); + $component = new component(); $options['type'] = 'Cisco-OTV'; $options['filter']['device_id'] = array('=',$device['device_id']); - $OTV = $COMPONENT->getComponents(null,$options); - $device_routing_count['cisco-otv'] = count($OTV); + $otv = $component->getComponents(null,$options); + $device_routing_count['cisco-otv'] = count($otv); if ($device_routing_count['cisco-otv'] > 0) { $routing_tabs[] = 'cisco-otv'; } diff --git a/html/pages/device/routing/cisco-otv.inc.php b/html/pages/device/routing/cisco-otv.inc.php index f29a9c9ae..602f67abd 100644 --- a/html/pages/device/routing/cisco-otv.inc.php +++ b/html/pages/device/routing/cisco-otv.inc.php @@ -1,12 +1,12 @@ getComponents($device['device_id'],$options); -$COMPONENTS = $COMPONENTS[$device['device_id']]; +$components = $component->getComponents($device['device_id'],$options); +$components = $components[$device['device_id']]; global $config; ?> @@ -17,32 +17,32 @@ global $config;
    $OVERLAY) { - if ($OVERLAY['otvtype'] == 'overlay') { - if ($OVERLAY['status'] == 1) { - $OVERLAY_STATUS = "Normal"; - $GLI = ""; +foreach ($components as $oid => $overlay) { + if ($overlay['otvtype'] == 'overlay') { + if ($overlay['status'] == 1) { + $overlay_status = "Normal"; + $gli = ""; } else { - $OVERLAY_STATUS = "".$OVERLAY['error']." - Alert"; - $GLI = "list-group-item-danger"; + $overlay_status = "".$overlay['error']." - Alert"; + $gli = "list-group-item-danger"; } ?> - - -
  • https
    • -
  • ssh
    • -
  • telnet
    • '; - - if ($_SESSION['userlevel'] >= '7') { - echo '
  • + echo '
    + + +
    '; echo ''; + }//end if if (device_permitted($device['device_id']) || $check_device == $vars['device']) { From 9cd082044525498d51a20139306b28f3b298ef92 Mon Sep 17 00:00:00 2001 From: Arjit Chaudhary Date: Mon, 8 Feb 2016 22:55:18 +0530 Subject: [PATCH 05/19] use bootstraps own pull-right so that the dropdown draws inside the page width --- html/pages/device.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/pages/device.inc.php b/html/pages/device.inc.php index 2d6b4db36..b7583ed67 100644 --- a/html/pages/device.inc.php +++ b/html/pages/device.inc.php @@ -388,7 +388,7 @@ if (device_permitted($vars['device']) || $check_device == $vars['device']) { } - echo '
    + echo '
      From 2a98a2825f3d0e2e43d633c5bce08f3bd48d6048 Mon Sep 17 00:00:00 2001 From: pblasquez Date: Mon, 8 Feb 2016 16:29:53 -0800 Subject: [PATCH 06/19] Update ajax_setresolution.php --- html/ajax_setresolution.php | 1 + 1 file changed, 1 insertion(+) diff --git a/html/ajax_setresolution.php b/html/ajax_setresolution.php index b72bd748e..470b23da9 100644 --- a/html/ajax_setresolution.php +++ b/html/ajax_setresolution.php @@ -4,5 +4,6 @@ if(isset($_REQUEST['width']) AND isset($_REQUEST['height'])) { $_SESSION['screen_width'] = $_REQUEST['width']; $_SESSION['screen_height'] = $_REQUEST['height']; } +header('Content-type: application/json'); echo $_SESSION['screen_width']; echo $_SESSION['screen_height']; From f2054d369ba36b429831981f952b0f42f076dd6e Mon Sep 17 00:00:00 2001 From: arrmo Date: Mon, 8 Feb 2016 20:15:11 -0600 Subject: [PATCH 07/19] Updates for Windows 10 --- includes/polling/os/windows.inc.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/includes/polling/os/windows.inc.php b/includes/polling/os/windows.inc.php index c31e1741e..637aff1a2 100644 --- a/includes/polling/os/windows.inc.php +++ b/includes/polling/os/windows.inc.php @@ -28,7 +28,7 @@ if (strstr($poll_device['sysDescr'], 'Intel64')) { $hardware = 'Intel x64'; } -if ($poll_device['sysObjectID'] == '.1.3.6.1.4.1.311.1.1.3.1.1') { +if ($poll_device['sysObjectID'] == 'enterprises.311.1.1.3.1.1') { if (strstr($poll_device['sysDescr'], 'Build Number: 1057')) { $version = 'NT 3.51 Workstation'; } @@ -81,6 +81,10 @@ if ($poll_device['sysObjectID'] == '.1.3.6.1.4.1.311.1.1.3.1.1') { $version = '8.1 SP1 (NT 6.2)'; } + if (strstr($poll_device['sysDescr'], 'Version 6.3 (Build 10')) { + $version = '10 (NT 6.3)'; + } + } else if ($poll_device['sysObjectID'] == '.1.3.6.1.4.1.311.1.1.3.1.2') { if (strstr($poll_device['sysDescr'], 'Build Number: 1057')) { From 135bbdcc433c5487b3b63c3130869f02fd41d8ce Mon Sep 17 00:00:00 2001 From: laf Date: Tue, 9 Feb 2016 18:23:31 +0000 Subject: [PATCH 08/19] Updated bgp-peers polling so that an snmpwalk isn't done for each bgp peer --- includes/polling/bgp-peers.inc.php | 572 +++++++++++++++-------------- 1 file changed, 290 insertions(+), 282 deletions(-) diff --git a/includes/polling/bgp-peers.inc.php b/includes/polling/bgp-peers.inc.php index eb91eb935..9b7c9b5e2 100644 --- a/includes/polling/bgp-peers.inc.php +++ b/includes/polling/bgp-peers.inc.php @@ -1,310 +1,318 @@ 0) { - $peer2 = true; - } + $peers = dbFetchRows('SELECT * FROM bgpPeers WHERE device_id = ?', array($device['device_id'])); - if ($peer2 === true) { - if (strstr($peer['bgpPeerIdentifier'], ':')) { - $bgp_peer_ident = ipv62snmp($peer['bgpPeerIdentifier']); - } - else { - $bgp_peer_ident = $peer['bgpPeerIdentifier']; + if (!empty($peers)) { + + if ($device['os'] != 'junos') { + $peer_data_check = snmpwalk_cache_oid($device, 'cbgpPeer2RemoteAs', array(), 'CISCO-BGP4-MIB', $config['mibdir']); + } + + foreach ($peers as $peer) { + // Poll BGP Peer + $peer2 = false; + echo 'Checking BGP peer '.$peer['bgpPeerIdentifier'].' '; + + if (!empty($peer['bgpPeerIdentifier'])) { + if (!strstr($peer['bgpPeerIdentifier'], ':') || $device['os'] != 'junos') { + // v4 BGP4 MIB + if (count($peer_data_check) > 0) { + $peer2 = true; } - if (strstr($peer['bgpPeerIdentifier'], ':')) { - $ip_type = 2; - $ip_len = 16; - $ip_ver = 'ipv6'; - } - else { - $ip_type = 1; - $ip_len = 4; - $ip_ver = 'ipv4'; - } - - $peer_identifier = $ip_type.'.'.$ip_len.'.'.$bgp_peer_ident; - $peer_data_tmp = snmp_get_multi( - $device, - ' cbgpPeer2State.'.$peer_identifier.' cbgpPeer2AdminStatus.'.$peer_identifier.' cbgpPeer2InUpdates.'.$peer_identifier.' cbgpPeer2OutUpdates.'.$peer_identifier.' cbgpPeer2InTotalMessages.'.$peer_identifier.' cbgpPeer2OutTotalMessages.'.$peer_identifier.' cbgpPeer2FsmEstablishedTime.'.$peer_identifier.' cbgpPeer2InUpdateElapsedTime.'.$peer_identifier.' cbgpPeer2LocalAddr.'.$peer_identifier, - '-OQUs', - 'CISCO-BGP4-MIB', - $config['mibdir'] - ); - $ident = "$ip_ver.\"".$bgp_peer_ident.'"'; - unset($peer_data); - $ident_key = array_keys($peer_data_tmp); - foreach ($peer_data_tmp[$ident_key[0]] as $k => $v) { - if (strstr($k, 'cbgpPeer2LocalAddr')) { - if ($ip_ver == 'ipv6') { - $v = str_replace('"', '', $v); - $v = rtrim($v); - $v = preg_replace('/(\S+\s+\S+)\s/', '$1:', $v); - $v = strtolower($v); - } - else { - $v = hex_to_ip($v); - } + if ($peer2 === true) { + if (strstr($peer['bgpPeerIdentifier'], ':')) { + $bgp_peer_ident = ipv62snmp($peer['bgpPeerIdentifier']); + } + else { + $bgp_peer_ident = $peer['bgpPeerIdentifier']; } - $peer_data .= "$v\n"; - } - } - else { - $peer_cmd = $config['snmpget'].' -M '.$config['mibdir'].' -m BGP4-MIB -OUvq '.snmp_gen_auth($device).' '.$device['hostname'].':'.$device['port'].' '; - $peer_cmd .= 'bgpPeerState.'.$peer['bgpPeerIdentifier'].' bgpPeerAdminStatus.'.$peer['bgpPeerIdentifier'].' bgpPeerInUpdates.'.$peer['bgpPeerIdentifier'].' bgpPeerOutUpdates.'.$peer['bgpPeerIdentifier'].' bgpPeerInTotalMessages.'.$peer['bgpPeerIdentifier'].' '; - $peer_cmd .= 'bgpPeerOutTotalMessages.'.$peer['bgpPeerIdentifier'].' bgpPeerFsmEstablishedTime.'.$peer['bgpPeerIdentifier'].' bgpPeerInUpdateElapsedTime.'.$peer['bgpPeerIdentifier'].' '; - $peer_cmd .= 'bgpPeerLocalAddr.'.$peer['bgpPeerIdentifier'].''; - $peer_data = trim(`$peer_cmd`); - }//end if - list($bgpPeerState, $bgpPeerAdminStatus, $bgpPeerInUpdates, $bgpPeerOutUpdates, $bgpPeerInTotalMessages, $bgpPeerOutTotalMessages, $bgpPeerFsmEstablishedTime, $bgpPeerInUpdateElapsedTime, $bgpLocalAddr) = explode("\n", $peer_data); - $bgpLocalAddr = str_replace('"', '', str_replace(' ', '', $bgpLocalAddr)); - } - else if ($device['os'] == 'junos') { - // v6 for JunOS via Juniper MIB - $peer_ip = ipv62snmp($peer['bgpPeerIdentifier']); + if (strstr($peer['bgpPeerIdentifier'], ':')) { + $ip_type = 2; + $ip_len = 16; + $ip_ver = 'ipv6'; + } + else { + $ip_type = 1; + $ip_len = 4; + $ip_ver = 'ipv4'; + } - if (!isset($junos_v6)) { - echo "\nCaching Oids..."; - // FIXME - needs moved to function - $peer_cmd = $config['snmpwalk'].' -M '.$config['mibdir'].'/junos -m BGP4-V2-MIB-JUNIPER -OUnq -'.$device['snmpver'].' '.snmp_gen_auth($device).' '.$device['hostname'].':'.$device['port']; - $peer_cmd .= ' jnxBgpM2PeerStatus.0.ipv6'; - foreach (explode("\n", trim(`$peer_cmd`)) as $oid) { - list($peer_oid) = explode(' ', $oid); - $peer_id = explode('.', $peer_oid); - $junos_v6[implode('.', array_slice($peer_id, 35))] = implode('.', array_slice($peer_id, 18)); - } - } - - // FIXME - move to function (and clean up, wtf?) - $peer_cmd = $config['snmpget'].' -M '.$config['mibdir'].'/junos -m BGP4-V2-MIB-JUNIPER -OUvq '.snmp_gen_auth($device); - $peer_cmd .= ' -M"'.$config['install_dir'].'/mibs/junos"'; - $peer_cmd .= ' '.$device['hostname'].':'.$device['port']; - $peer_cmd .= ' jnxBgpM2PeerState.0.ipv6.'.$junos_v6[$peer_ip]; - $peer_cmd .= ' jnxBgpM2PeerStatus.0.ipv6.'.$junos_v6[$peer_ip]; - // Should be jnxBgpM2CfgPeerAdminStatus but doesn't seem to be implemented? - $peer_cmd .= ' jnxBgpM2PeerInUpdates.0.ipv6.'.$junos_v6[$peer_ip]; - $peer_cmd .= ' jnxBgpM2PeerOutUpdates.0.ipv6.'.$junos_v6[$peer_ip]; - $peer_cmd .= ' jnxBgpM2PeerInTotalMessages.0.ipv6.'.$junos_v6[$peer_ip]; - $peer_cmd .= ' jnxBgpM2PeerOutTotalMessages.0.ipv6.'.$junos_v6[$peer_ip]; - $peer_cmd .= ' jnxBgpM2PeerFsmEstablishedTime.0.ipv6.'.$junos_v6[$peer_ip]; - $peer_cmd .= ' jnxBgpM2PeerInUpdatesElapsedTime.0.ipv6.'.$junos_v6[$peer_ip]; - $peer_cmd .= ' jnxBgpM2PeerLocalAddr.0.ipv6.'.$junos_v6[$peer_ip]; - $peer_cmd .= '|grep -v "No Such Instance"'; - d_echo("\n$peer_cmd\n"); - - $peer_data = trim(`$peer_cmd`); - list($bgpPeerState, $bgpPeerAdminStatus, $bgpPeerInUpdates, $bgpPeerOutUpdates, $bgpPeerInTotalMessages, $bgpPeerOutTotalMessages, $bgpPeerFsmEstablishedTime, $bgpPeerInUpdateElapsedTime, $bgpLocalAddr) = explode("\n", $peer_data); - - d_echo("State = $bgpPeerState - AdminStatus: $bgpPeerAdminStatus\n"); - - $bgpLocalAddr = str_replace('"', '', str_replace(' ', '', $bgpLocalAddr)); - if ($bgpLocalAddr == '00000000000000000000000000000000') { - $bgpLocalAddr = ''; - // Unknown? - } - else { - $bgpLocalAddr = strtolower($bgpLocalAddr); - for ($i = 0; $i < 32; $i += 4) { - $bgpLocalAddr6[] = substr($bgpLocalAddr, $i, 4); - } - - $bgpLocalAddr = Net_IPv6::compress(implode(':', $bgpLocalAddr6)); - unset($bgpLocalAddr6); - } - }//end if - }//end if - - if ($bgpPeerFsmEstablishedTime) { - if (!(is_array($config['alerts']['bgp']['whitelist']) && !in_array($peer['bgpPeerRemoteAs'], $config['alerts']['bgp']['whitelist'])) && ($bgpPeerFsmEstablishedTime < $peer['bgpPeerFsmEstablishedTime'] || $bgpPeerState != $peer['bgpPeerState'])) { - if ($peer['bgpPeerState'] == $bgpPeerState) { - log_event('BGP Session Flap: '.$peer['bgpPeerIdentifier'].' (AS'.$peer['bgpPeerRemoteAs'].')', $device, 'bgpPeer', $bgpPeer_id); - } - else if ($bgpPeerState == 'established') { - log_event('BGP Session Up: '.$peer['bgpPeerIdentifier'].' (AS'.$peer['bgpPeerRemoteAs'].')', $device, 'bgpPeer', $bgpPeer_id); - } - else if ($peer['bgpPeerState'] == 'established') { - log_event('BGP Session Down: '.$peer['bgpPeerIdentifier'].' (AS'.$peer['bgpPeerRemoteAs'].')', $device, 'bgpPeer', $bgpPeer_id); - } - } - } - - $peerrrd = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename('bgp-'.$peer['bgpPeerIdentifier'].'.rrd'); - if (!is_file($peerrrd)) { - $create_rrd = 'DS:bgpPeerOutUpdates:COUNTER:600:U:100000000000 - DS:bgpPeerInUpdates:COUNTER:600:U:100000000000 - DS:bgpPeerOutTotal:COUNTER:600:U:100000000000 - DS:bgpPeerInTotal:COUNTER:600:U:100000000000 - DS:bgpPeerEstablished:GAUGE:600:0:U '.$config['rrd_rra']; - - rrdtool_create($peerrrd, $create_rrd); - } - - $fields = array( - 'bgpPeerOutUpdates' => $bgpPeerOutUpdates, - 'bgpPeerInUpdates' => $bgpPeerInUpdates, - 'bgpPeerOutTotal' => $bgpPeerOutTotalMessages, - 'bgpPeerInTotal' => $bgpPeerInTotalMessages, - 'bgpPeerEstablished' => $bgpPeerFsmEstablishedTime, - ); - rrdtool_update("$peerrrd", $fields); - - $tags = array('bgpPeerIdentifier' => $peer['bgpPeerIdentifier']); - influx_update($device,'bgp',$tags,$fields); - - $peer['update']['bgpPeerState'] = $bgpPeerState; - $peer['update']['bgpPeerAdminStatus'] = $bgpPeerAdminStatus; - $peer['update']['bgpPeerFsmEstablishedTime'] = $bgpPeerFsmEstablishedTime; - $peer['update']['bgpPeerInUpdates'] = $bgpPeerInUpdates; - $peer['update']['bgpLocalAddr'] = $bgpLocalAddr; - $peer['update']['bgpPeerOutUpdates'] = $bgpPeerOutUpdates; - - dbUpdate($peer['update'], 'bgpPeers', '`device_id` = ? AND `bgpPeerIdentifier` = ?', array($device['device_id'], $peer['bgpPeerIdentifier'])); - - if ($device['os_group'] == 'cisco' || $device['os'] == 'junos') { - // Poll each AFI/SAFI for this peer (using CISCO-BGP4-MIB or BGP4-V2-JUNIPER MIB) - $peer_afis = dbFetchRows('SELECT * FROM bgpPeers_cbgp WHERE `device_id` = ? AND bgpPeerIdentifier = ?', array($device['device_id'], $peer['bgpPeerIdentifier'])); - foreach ($peer_afis as $peer_afi) { - $afi = $peer_afi['afi']; - $safi = $peer_afi['safi']; - d_echo("$afi $safi\n"); - - if ($device['os_group'] == 'cisco') { - $bgp_peer_ident = ipv62snmp($peer['bgpPeerIdentifier']); - if (strstr($peer['bgpPeerIdentifier'], ':')) { - $ip_type = 2; - $ip_len = 16; - $ip_ver = 'ipv6'; - } - else { - $ip_type = 1; - $ip_len = 4; - $ip_ver = 'ipv4'; - } - - $ip_cast = 1; - if ($peer_afi['safi'] == 'multicast') { - $ip_cast = 2; - } - else if ($peer_afi['safi'] == 'unicastAndMulticast') { - $ip_cast = 3; - } - else if ($peer_afi['safi'] == 'vpn') { - $ip_cast = 128; - } - - $check = snmp_get($device, 'cbgpPeer2AcceptedPrefixes.'.$ip_type.'.'.$ip_len.'.'.$bgp_peer_ident.'.'.$ip_type.'.'.$ip_cast, '', 'CISCO-BGP4-MIB', $config['mibdir']); - - if (!empty($check)) { - $cgp_peer_identifier = $ip_type.'.'.$ip_len.'.'.$bgp_peer_ident.'.'.$ip_type.'.'.$ip_cast; - $cbgp_data_tmp = snmp_get_multi( + $peer_identifier = $ip_type.'.'.$ip_len.'.'.$bgp_peer_ident; + $peer_data_tmp = snmp_get_multi( $device, - ' cbgpPeer2AcceptedPrefixes.'.$cgp_peer_identifier.' cbgpPeer2DeniedPrefixes.'.$cgp_peer_identifier.' cbgpPeer2PrefixAdminLimit.'.$cgp_peer_identifier.' cbgpPeer2PrefixThreshold.'.$cgp_peer_identifier.' cbgpPeer2PrefixClearThreshold.'.$cgp_peer_identifier.' cbgpPeer2AdvertisedPrefixes.'.$cgp_peer_identifier.' cbgpPeer2SuppressedPrefixes.'.$cgp_peer_identifier.' cbgpPeer2WithdrawnPrefixes.'.$cgp_peer_identifier, + ' cbgpPeer2State.'.$peer_identifier.' cbgpPeer2AdminStatus.'.$peer_identifier.' cbgpPeer2InUpdates.'.$peer_identifier.' cbgpPeer2OutUpdates.'.$peer_identifier.' cbgpPeer2InTotalMessages.'.$peer_identifier.' cbgpPeer2OutTotalMessages.'.$peer_identifier.' cbgpPeer2FsmEstablishedTime.'.$peer_identifier.' cbgpPeer2InUpdateElapsedTime.'.$peer_identifier.' cbgpPeer2LocalAddr.'.$peer_identifier, '-OQUs', 'CISCO-BGP4-MIB', $config['mibdir'] ); - $ident = "$ip_ver.\"".$peer['bgpPeerIdentifier'].'"'.'.'.$ip_type.'.'.$ip_cast; - unset($cbgp_data); - $temp_keys = array_keys($cbgp_data_tmp); - unset($temp_data); - $temp_data['cbgpPeer2AcceptedPrefixes'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2AcceptedPrefixes']; - $temp_data['cbgpPeer2DeniedPrefixes'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2DeniedPrefixes']; - $temp_data['cbgpPeer2PrefixAdminLimit'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2PrefixAdminLimit']; - $temp_data['cbgpPeer2PrefixThreshold'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2PrefixThreshold']; - $temp_data['cbgpPeer2PrefixClearThreshold'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2PrefixClearThreshold']; - $temp_data['cbgpPeer2AdvertisedPrefixes'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2AdvertisedPrefixes']; - $temp_data['cbgpPeer2SuppressedPrefixes'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2SuppressedPrefixes']; - $temp_data['cbgpPeer2WithdrawnPrefixes'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2WithdrawnPrefixes']; - foreach ($temp_data as $k => $v) { - $cbgp_data .= "$v\n"; - } + $ident = "$ip_ver.\"".$bgp_peer_ident.'"'; + unset($peer_data); + $ident_key = array_keys($peer_data_tmp); + foreach ($peer_data_tmp[$ident_key[0]] as $k => $v) { + if (strstr($k, 'cbgpPeer2LocalAddr')) { + if ($ip_ver == 'ipv6') { + $v = str_replace('"', '', $v); + $v = rtrim($v); + $v = preg_replace('/(\S+\s+\S+)\s/', '$1:', $v); + $v = strtolower($v); + } + else { + $v = hex_to_ip($v); + } + } - d_echo("$cbgp_data\n"); + $peer_data .= "$v\n"; + } } else { - // FIXME - move to function - $cbgp_cmd = $config['snmpget'].' -M '.$config['mibdir'].' -m CISCO-BGP4-MIB -Ovq '.snmp_gen_auth($device).' '.$device['hostname'].':'.$device['port']; - $cbgp_cmd .= ' cbgpPeerAcceptedPrefixes.'.$peer['bgpPeerIdentifier'].".$afi.$safi"; - $cbgp_cmd .= ' cbgpPeerDeniedPrefixes.'.$peer['bgpPeerIdentifier'].".$afi.$safi"; - $cbgp_cmd .= ' cbgpPeerPrefixAdminLimit.'.$peer['bgpPeerIdentifier'].".$afi.$safi"; - $cbgp_cmd .= ' cbgpPeerPrefixThreshold.'.$peer['bgpPeerIdentifier'].".$afi.$safi"; - $cbgp_cmd .= ' cbgpPeerPrefixClearThreshold.'.$peer['bgpPeerIdentifier'].".$afi.$safi"; - $cbgp_cmd .= ' cbgpPeerAdvertisedPrefixes.'.$peer['bgpPeerIdentifier'].".$afi.$safi"; - $cbgp_cmd .= ' cbgpPeerSuppressedPrefixes.'.$peer['bgpPeerIdentifier'].".$afi.$safi"; - $cbgp_cmd .= ' cbgpPeerWithdrawnPrefixes.'.$peer['bgpPeerIdentifier'].".$afi.$safi"; - - d_echo("$cbgp_cmd\n"); - - $cbgp_data = preg_replace('/^OID.*$/', '', trim(`$cbgp_cmd`)); - $cbgp_data = preg_replace('/No Such Instance currently exists at this OID/', '0', $cbgp_data); - d_echo("$cbgp_data\n"); + $peer_cmd = $config['snmpget'].' -M '.$config['mibdir'].' -m BGP4-MIB -OUvq '.snmp_gen_auth($device).' '.$device['hostname'].':'.$device['port'].' '; + $peer_cmd .= 'bgpPeerState.'.$peer['bgpPeerIdentifier'].' bgpPeerAdminStatus.'.$peer['bgpPeerIdentifier'].' bgpPeerInUpdates.'.$peer['bgpPeerIdentifier'].' bgpPeerOutUpdates.'.$peer['bgpPeerIdentifier'].' bgpPeerInTotalMessages.'.$peer['bgpPeerIdentifier'].' '; + $peer_cmd .= 'bgpPeerOutTotalMessages.'.$peer['bgpPeerIdentifier'].' bgpPeerFsmEstablishedTime.'.$peer['bgpPeerIdentifier'].' bgpPeerInUpdateElapsedTime.'.$peer['bgpPeerIdentifier'].' '; + $peer_cmd .= 'bgpPeerLocalAddr.'.$peer['bgpPeerIdentifier'].''; + $peer_data = trim(`$peer_cmd`); }//end if - list($cbgpPeerAcceptedPrefixes,$cbgpPeerDeniedPrefixes,$cbgpPeerPrefixAdminLimit,$cbgpPeerPrefixThreshold,$cbgpPeerPrefixClearThreshold,$cbgpPeerAdvertisedPrefixes,$cbgpPeerSuppressedPrefixes,$cbgpPeerWithdrawnPrefixes) = explode("\n", $cbgp_data); + list($bgpPeerState, $bgpPeerAdminStatus, $bgpPeerInUpdates, $bgpPeerOutUpdates, $bgpPeerInTotalMessages, $bgpPeerOutTotalMessages, $bgpPeerFsmEstablishedTime, $bgpPeerInUpdateElapsedTime, $bgpLocalAddr) = explode("\n", $peer_data); + $bgpLocalAddr = str_replace('"', '', str_replace(' ', '', $bgpLocalAddr)); + } + else if ($device['os'] == 'junos') { + // v6 for JunOS via Juniper MIB + $peer_ip = ipv62snmp($peer['bgpPeerIdentifier']); + + if (!isset($junos_v6)) { + echo "\nCaching Oids..."; + // FIXME - needs moved to function + $peer_cmd = $config['snmpwalk'].' -M '.$config['mibdir'].'/junos -m BGP4-V2-MIB-JUNIPER -OUnq -'.$device['snmpver'].' '.snmp_gen_auth($device).' '.$device['hostname'].':'.$device['port']; + $peer_cmd .= ' jnxBgpM2PeerStatus.0.ipv6'; + foreach (explode("\n", trim(`$peer_cmd`)) as $oid) { + list($peer_oid) = explode(' ', $oid); + $peer_id = explode('.', $peer_oid); + $junos_v6[implode('.', array_slice($peer_id, 35))] = implode('.', array_slice($peer_id, 18)); + } + } + + // FIXME - move to function (and clean up, wtf?) + $peer_cmd = $config['snmpget'].' -M '.$config['mibdir'].'/junos -m BGP4-V2-MIB-JUNIPER -OUvq '.snmp_gen_auth($device); + $peer_cmd .= ' -M"'.$config['install_dir'].'/mibs/junos"'; + $peer_cmd .= ' '.$device['hostname'].':'.$device['port']; + $peer_cmd .= ' jnxBgpM2PeerState.0.ipv6.'.$junos_v6[$peer_ip]; + $peer_cmd .= ' jnxBgpM2PeerStatus.0.ipv6.'.$junos_v6[$peer_ip]; + // Should be jnxBgpM2CfgPeerAdminStatus but doesn't seem to be implemented? + $peer_cmd .= ' jnxBgpM2PeerInUpdates.0.ipv6.'.$junos_v6[$peer_ip]; + $peer_cmd .= ' jnxBgpM2PeerOutUpdates.0.ipv6.'.$junos_v6[$peer_ip]; + $peer_cmd .= ' jnxBgpM2PeerInTotalMessages.0.ipv6.'.$junos_v6[$peer_ip]; + $peer_cmd .= ' jnxBgpM2PeerOutTotalMessages.0.ipv6.'.$junos_v6[$peer_ip]; + $peer_cmd .= ' jnxBgpM2PeerFsmEstablishedTime.0.ipv6.'.$junos_v6[$peer_ip]; + $peer_cmd .= ' jnxBgpM2PeerInUpdatesElapsedTime.0.ipv6.'.$junos_v6[$peer_ip]; + $peer_cmd .= ' jnxBgpM2PeerLocalAddr.0.ipv6.'.$junos_v6[$peer_ip]; + $peer_cmd .= '|grep -v "No Such Instance"'; + d_echo("\n$peer_cmd\n"); + + $peer_data = trim(`$peer_cmd`); + list($bgpPeerState, $bgpPeerAdminStatus, $bgpPeerInUpdates, $bgpPeerOutUpdates, $bgpPeerInTotalMessages, $bgpPeerOutTotalMessages, $bgpPeerFsmEstablishedTime, $bgpPeerInUpdateElapsedTime, $bgpLocalAddr) = explode("\n", $peer_data); + + d_echo("State = $bgpPeerState - AdminStatus: $bgpPeerAdminStatus\n"); + + $bgpLocalAddr = str_replace('"', '', str_replace(' ', '', $bgpLocalAddr)); + if ($bgpLocalAddr == '00000000000000000000000000000000') { + $bgpLocalAddr = ''; + // Unknown? + } + else { + $bgpLocalAddr = strtolower($bgpLocalAddr); + for ($i = 0; $i < 32; $i += 4) { + $bgpLocalAddr6[] = substr($bgpLocalAddr, $i, 4); + } + + $bgpLocalAddr = Net_IPv6::compress(implode(':', $bgpLocalAddr6)); + unset($bgpLocalAddr6); + } }//end if + }//end if - // FIXME THESE FIELDS DO NOT EXIST IN THE DATABASE! - $update = 'UPDATE bgpPeers_cbgp SET'; - $peer['c_update']['AcceptedPrefixes'] = $cbgpPeerAcceptedPrefixes; - $peer['c_update']['DeniedPrefixes'] = $cbgpPeerDeniedPrefixes; - $peer['c_update']['PrefixAdminLimit'] = $cbgpPeerAdminLimit; - $peer['c_update']['PrefixThreshold'] = $cbgpPeerPrefixThreshold; - $peer['c_update']['PrefixClearThreshold'] = $cbgpPeerPrefixClearThreshold; - $peer['c_update']['AdvertisedPrefixes'] = $cbgpPeerAdvertisedPrefixes; - $peer['c_update']['SuppressedPrefixes'] = $cbgpPeerSuppressedPrefixes; - $peer['c_update']['WithdrawnPrefixes'] = $cbgpPeerWithdrawnPrefixes; - - - $oids = array( - 'AcceptedPrefixes', - 'DeniedPrefixes', - 'AdvertisedPrefixes', - 'SuppressedPrefixes', - 'WithdrawnPrefixes', - ); - - foreach ($oids as $oid) { - $peer['c_update'][$oid.'_delta'] = $peer['c_update'][$oid] - $peer_afi[$oid]; - $peer['c_update'][$oid.'_prev'] = $peer_afi[$oid]; + if ($bgpPeerFsmEstablishedTime) { + if (!(is_array($config['alerts']['bgp']['whitelist']) && !in_array($peer['bgpPeerRemoteAs'], $config['alerts']['bgp']['whitelist'])) && ($bgpPeerFsmEstablishedTime < $peer['bgpPeerFsmEstablishedTime'] || $bgpPeerState != $peer['bgpPeerState'])) { + if ($peer['bgpPeerState'] == $bgpPeerState) { + log_event('BGP Session Flap: '.$peer['bgpPeerIdentifier'].' (AS'.$peer['bgpPeerRemoteAs'].')', $device, 'bgpPeer', $bgpPeer_id); + } + else if ($bgpPeerState == 'established') { + log_event('BGP Session Up: '.$peer['bgpPeerIdentifier'].' (AS'.$peer['bgpPeerRemoteAs'].')', $device, 'bgpPeer', $bgpPeer_id); + } + else if ($peer['bgpPeerState'] == 'established') { + log_event('BGP Session Down: '.$peer['bgpPeerIdentifier'].' (AS'.$peer['bgpPeerRemoteAs'].')', $device, 'bgpPeer', $bgpPeer_id); + } } + } - dbUpdate($peer['c_update'], 'bgpPeers_cbgp', '`device_id` = ? AND bgpPeerIdentifier = ? AND afi = ? AND safi = ?', array($device['device_id'], $peer['bgpPeerIdentifier'], $afi, $safi)); + $peerrrd = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename('bgp-'.$peer['bgpPeerIdentifier'].'.rrd'); + if (!is_file($peerrrd)) { + $create_rrd = 'DS:bgpPeerOutUpdates:COUNTER:600:U:100000000000 + DS:bgpPeerInUpdates:COUNTER:600:U:100000000000 + DS:bgpPeerOutTotal:COUNTER:600:U:100000000000 + DS:bgpPeerInTotal:COUNTER:600:U:100000000000 + DS:bgpPeerEstablished:GAUGE:600:0:U '.$config['rrd_rra']; - $cbgp_rrd = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename('cbgp-'.$peer['bgpPeerIdentifier'].".$afi.$safi.rrd"); - if (!is_file($cbgp_rrd)) { - $rrd_create = 'DS:AcceptedPrefixes:GAUGE:600:U:100000000000 - DS:DeniedPrefixes:GAUGE:600:U:100000000000 - DS:AdvertisedPrefixes:GAUGE:600:U:100000000000 - DS:SuppressedPrefixes:GAUGE:600:U:100000000000 - DS:WithdrawnPrefixes:GAUGE:600:U:100000000000 '.$config['rrd_rra']; - rrdtool_create($cbgp_rrd, $rrd_create); - } + rrdtool_create($peerrrd, $create_rrd); + } - $fields = array( - 'AcceptedPrefixes' => $cbgpPeerAcceptedPrefixes, - 'DeniedPrefixes' => $cbgpPeerDeniedPrefixes, - 'AdvertisedPrefixes' => $cbgpPeerAdvertisedPrefixes, - 'SuppressedPrefixes' => $cbgpPeerSuppressedPrefixes, - 'WithdrawnPrefixes' => $cbgpPeerWithdrawnPrefixes, - ); - rrdtool_update("$cbgp_rrd", $fields); + $fields = array( + 'bgpPeerOutUpdates' => $bgpPeerOutUpdates, + 'bgpPeerInUpdates' => $bgpPeerInUpdates, + 'bgpPeerOutTotal' => $bgpPeerOutTotalMessages, + 'bgpPeerInTotal' => $bgpPeerInTotalMessages, + 'bgpPeerEstablished' => $bgpPeerFsmEstablishedTime, + ); + rrdtool_update("$peerrrd", $fields); - $tags = array('bgpPeerIdentifier' => $peer['bgpPeerIdentifier'], 'afi' => $afi, 'safi' => $safi); - influx_update($device,'cbgp',$tags,$fields); + $tags = array('bgpPeerIdentifier' => $peer['bgpPeerIdentifier']); + influx_update($device,'bgp',$tags,$fields); - } //end foreach - } //end if - echo "\n"; - } //end foreach + $peer['update']['bgpPeerState'] = $bgpPeerState; + $peer['update']['bgpPeerAdminStatus'] = $bgpPeerAdminStatus; + $peer['update']['bgpPeerFsmEstablishedTime'] = $bgpPeerFsmEstablishedTime; + $peer['update']['bgpPeerInUpdates'] = $bgpPeerInUpdates; + $peer['update']['bgpLocalAddr'] = $bgpLocalAddr; + $peer['update']['bgpPeerOutUpdates'] = $bgpPeerOutUpdates; + + dbUpdate($peer['update'], 'bgpPeers', '`device_id` = ? AND `bgpPeerIdentifier` = ?', array($device['device_id'], $peer['bgpPeerIdentifier'])); + + if ($device['os_group'] == 'cisco' || $device['os'] == 'junos') { + // Poll each AFI/SAFI for this peer (using CISCO-BGP4-MIB or BGP4-V2-JUNIPER MIB) + $peer_afis = dbFetchRows('SELECT * FROM bgpPeers_cbgp WHERE `device_id` = ? AND bgpPeerIdentifier = ?', array($device['device_id'], $peer['bgpPeerIdentifier'])); + foreach ($peer_afis as $peer_afi) { + $afi = $peer_afi['afi']; + $safi = $peer_afi['safi']; + d_echo("$afi $safi\n"); + + if ($device['os_group'] == 'cisco') { + $bgp_peer_ident = ipv62snmp($peer['bgpPeerIdentifier']); + if (strstr($peer['bgpPeerIdentifier'], ':')) { + $ip_type = 2; + $ip_len = 16; + $ip_ver = 'ipv6'; + } + else { + $ip_type = 1; + $ip_len = 4; + $ip_ver = 'ipv4'; + } + + $ip_cast = 1; + if ($peer_afi['safi'] == 'multicast') { + $ip_cast = 2; + } + else if ($peer_afi['safi'] == 'unicastAndMulticast') { + $ip_cast = 3; + } + else if ($peer_afi['safi'] == 'vpn') { + $ip_cast = 128; + } + + $check = snmp_get($device, 'cbgpPeer2AcceptedPrefixes.'.$ip_type.'.'.$ip_len.'.'.$bgp_peer_ident.'.'.$ip_type.'.'.$ip_cast, '', 'CISCO-BGP4-MIB', $config['mibdir']); + + if (!empty($check)) { + $cgp_peer_identifier = $ip_type.'.'.$ip_len.'.'.$bgp_peer_ident.'.'.$ip_type.'.'.$ip_cast; + $cbgp_data_tmp = snmp_get_multi( + $device, + ' cbgpPeer2AcceptedPrefixes.'.$cgp_peer_identifier.' cbgpPeer2DeniedPrefixes.'.$cgp_peer_identifier.' cbgpPeer2PrefixAdminLimit.'.$cgp_peer_identifier.' cbgpPeer2PrefixThreshold.'.$cgp_peer_identifier.' cbgpPeer2PrefixClearThreshold.'.$cgp_peer_identifier.' cbgpPeer2AdvertisedPrefixes.'.$cgp_peer_identifier.' cbgpPeer2SuppressedPrefixes.'.$cgp_peer_identifier.' cbgpPeer2WithdrawnPrefixes.'.$cgp_peer_identifier, + '-OQUs', + 'CISCO-BGP4-MIB', + $config['mibdir'] + ); + $ident = "$ip_ver.\"".$peer['bgpPeerIdentifier'].'"'.'.'.$ip_type.'.'.$ip_cast; + unset($cbgp_data); + $temp_keys = array_keys($cbgp_data_tmp); + unset($temp_data); + $temp_data['cbgpPeer2AcceptedPrefixes'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2AcceptedPrefixes']; + $temp_data['cbgpPeer2DeniedPrefixes'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2DeniedPrefixes']; + $temp_data['cbgpPeer2PrefixAdminLimit'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2PrefixAdminLimit']; + $temp_data['cbgpPeer2PrefixThreshold'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2PrefixThreshold']; + $temp_data['cbgpPeer2PrefixClearThreshold'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2PrefixClearThreshold']; + $temp_data['cbgpPeer2AdvertisedPrefixes'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2AdvertisedPrefixes']; + $temp_data['cbgpPeer2SuppressedPrefixes'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2SuppressedPrefixes']; + $temp_data['cbgpPeer2WithdrawnPrefixes'] = $cbgp_data_tmp[$temp_keys[0]]['cbgpPeer2WithdrawnPrefixes']; + foreach ($temp_data as $k => $v) { + $cbgp_data .= "$v\n"; + } + + d_echo("$cbgp_data\n"); + } + else { + // FIXME - move to function + $cbgp_cmd = $config['snmpget'].' -M '.$config['mibdir'].' -m CISCO-BGP4-MIB -Ovq '.snmp_gen_auth($device).' '.$device['hostname'].':'.$device['port']; + $cbgp_cmd .= ' cbgpPeerAcceptedPrefixes.'.$peer['bgpPeerIdentifier'].".$afi.$safi"; + $cbgp_cmd .= ' cbgpPeerDeniedPrefixes.'.$peer['bgpPeerIdentifier'].".$afi.$safi"; + $cbgp_cmd .= ' cbgpPeerPrefixAdminLimit.'.$peer['bgpPeerIdentifier'].".$afi.$safi"; + $cbgp_cmd .= ' cbgpPeerPrefixThreshold.'.$peer['bgpPeerIdentifier'].".$afi.$safi"; + $cbgp_cmd .= ' cbgpPeerPrefixClearThreshold.'.$peer['bgpPeerIdentifier'].".$afi.$safi"; + $cbgp_cmd .= ' cbgpPeerAdvertisedPrefixes.'.$peer['bgpPeerIdentifier'].".$afi.$safi"; + $cbgp_cmd .= ' cbgpPeerSuppressedPrefixes.'.$peer['bgpPeerIdentifier'].".$afi.$safi"; + $cbgp_cmd .= ' cbgpPeerWithdrawnPrefixes.'.$peer['bgpPeerIdentifier'].".$afi.$safi"; + + d_echo("$cbgp_cmd\n"); + + $cbgp_data = preg_replace('/^OID.*$/', '', trim(`$cbgp_cmd`)); + $cbgp_data = preg_replace('/No Such Instance currently exists at this OID/', '0', $cbgp_data); + d_echo("$cbgp_data\n"); + }//end if + list($cbgpPeerAcceptedPrefixes,$cbgpPeerDeniedPrefixes,$cbgpPeerPrefixAdminLimit,$cbgpPeerPrefixThreshold,$cbgpPeerPrefixClearThreshold,$cbgpPeerAdvertisedPrefixes,$cbgpPeerSuppressedPrefixes,$cbgpPeerWithdrawnPrefixes) = explode("\n", $cbgp_data); + }//end if + + // FIXME THESE FIELDS DO NOT EXIST IN THE DATABASE! + $update = 'UPDATE bgpPeers_cbgp SET'; + $peer['c_update']['AcceptedPrefixes'] = $cbgpPeerAcceptedPrefixes; + $peer['c_update']['DeniedPrefixes'] = $cbgpPeerDeniedPrefixes; + $peer['c_update']['PrefixAdminLimit'] = $cbgpPeerAdminLimit; + $peer['c_update']['PrefixThreshold'] = $cbgpPeerPrefixThreshold; + $peer['c_update']['PrefixClearThreshold'] = $cbgpPeerPrefixClearThreshold; + $peer['c_update']['AdvertisedPrefixes'] = $cbgpPeerAdvertisedPrefixes; + $peer['c_update']['SuppressedPrefixes'] = $cbgpPeerSuppressedPrefixes; + $peer['c_update']['WithdrawnPrefixes'] = $cbgpPeerWithdrawnPrefixes; + + + $oids = array( + 'AcceptedPrefixes', + 'DeniedPrefixes', + 'AdvertisedPrefixes', + 'SuppressedPrefixes', + 'WithdrawnPrefixes', + ); + + foreach ($oids as $oid) { + $peer['c_update'][$oid.'_delta'] = $peer['c_update'][$oid] - $peer_afi[$oid]; + $peer['c_update'][$oid.'_prev'] = $peer_afi[$oid]; + } + + dbUpdate($peer['c_update'], 'bgpPeers_cbgp', '`device_id` = ? AND bgpPeerIdentifier = ? AND afi = ? AND safi = ?', array($device['device_id'], $peer['bgpPeerIdentifier'], $afi, $safi)); + + $cbgp_rrd = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename('cbgp-'.$peer['bgpPeerIdentifier'].".$afi.$safi.rrd"); + if (!is_file($cbgp_rrd)) { + $rrd_create = 'DS:AcceptedPrefixes:GAUGE:600:U:100000000000 + DS:DeniedPrefixes:GAUGE:600:U:100000000000 + DS:AdvertisedPrefixes:GAUGE:600:U:100000000000 + DS:SuppressedPrefixes:GAUGE:600:U:100000000000 + DS:WithdrawnPrefixes:GAUGE:600:U:100000000000 '.$config['rrd_rra']; + rrdtool_create($cbgp_rrd, $rrd_create); + } + + $fields = array( + 'AcceptedPrefixes' => $cbgpPeerAcceptedPrefixes, + 'DeniedPrefixes' => $cbgpPeerDeniedPrefixes, + 'AdvertisedPrefixes' => $cbgpPeerAdvertisedPrefixes, + 'SuppressedPrefixes' => $cbgpPeerSuppressedPrefixes, + 'WithdrawnPrefixes' => $cbgpPeerWithdrawnPrefixes, + ); + rrdtool_update("$cbgp_rrd", $fields); + + $tags = array('bgpPeerIdentifier' => $peer['bgpPeerIdentifier'], 'afi' => $afi, 'safi' => $safi); + influx_update($device,'cbgp',$tags,$fields); + + } //end foreach + } //end if + echo "\n"; + } //end foreach + } //end if } //end if From 37dccb3932a5341ff93abb42216eb453fedff631 Mon Sep 17 00:00:00 2001 From: f0o Date: Wed, 10 Feb 2016 13:42:55 +0000 Subject: [PATCH 09/19] First effort in bringing some sanity --- html/includes/vars.inc.php | 10 +++++----- html/index.php | 8 -------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/html/includes/vars.inc.php b/html/includes/vars.inc.php index 369a13a74..8d3c3b6c2 100644 --- a/html/includes/vars.inc.php +++ b/html/includes/vars.inc.php @@ -7,7 +7,7 @@ foreach ($_GET as $key => $get_var) { $value = 'yes'; } - $vars[$name] = $value; + $vars[$name] = htmlentities($value); } } @@ -23,7 +23,7 @@ else { foreach ($segments as $pos => $segment) { $segment = urldecode($segment); if ($pos == '0') { - $vars['page'] = $segment; + $vars['page'] =htmlentities( $segment); } else { list($name, $value) = explode('=', $segment); @@ -31,15 +31,15 @@ foreach ($segments as $pos => $segment) { $vars[$name] = yes; } else { - $vars[$name] = $value; + $vars[$name] = htmlentities($value); } } } foreach ($_GET as $name => $value) { - $vars[$name] = $value; + $vars[$name] = htmlentities($value); } foreach ($_POST as $name => $value) { - $vars[$name] = $value; + $vars[$name] = htmlentities($value); } diff --git a/html/index.php b/html/index.php index 46164c663..494d6c3de 100644 --- a/html/index.php +++ b/html/index.php @@ -214,14 +214,6 @@ else {
      "); - print_r($_GET); - print_r($vars); - echo(""); -} - if ($_SESSION['authenticated']) { // Authenticated. Print a page. if (isset($vars['page']) && !strstr("..", $vars['page']) && is_file("pages/" . $vars['page'] . ".inc.php")) { From a6bca987bf927d36c91df980c42a777e643cee72 Mon Sep 17 00:00:00 2001 From: f0o Date: Wed, 10 Feb 2016 13:52:43 +0000 Subject: [PATCH 10/19] Enforce sanity before returning from database --- html/includes/vars.inc.php | 2 +- includes/common.php | 10 ++++++++++ includes/dbFacile.mysql.php | 2 ++ includes/dbFacile.mysqli.php | 2 ++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/html/includes/vars.inc.php b/html/includes/vars.inc.php index 8d3c3b6c2..a633cef72 100644 --- a/html/includes/vars.inc.php +++ b/html/includes/vars.inc.php @@ -23,7 +23,7 @@ else { foreach ($segments as $pos => $segment) { $segment = urldecode($segment); if ($pos == '0') { - $vars['page'] =htmlentities( $segment); + $vars['page'] = htmlentities($segment); } else { list($name, $value) = explode('=', $segment); diff --git a/includes/common.php b/includes/common.php index 8b59ba774..1162b819a 100644 --- a/includes/common.php +++ b/includes/common.php @@ -1255,3 +1255,13 @@ function get_port_id ($ports_mapped, $port, $port_association_mode) { return $port_id; } + +/** + * Sanitize + * @param mixed $item Reference to Item + * @param mixed $key Key + * @return void + */ +function sanitize_array(&$item, $key) { + $item = htmlentities($item); +} diff --git a/includes/dbFacile.mysql.php b/includes/dbFacile.mysql.php index f2bb56c0b..d9372cbb6 100644 --- a/includes/dbFacile.mysql.php +++ b/includes/dbFacile.mysql.php @@ -266,6 +266,7 @@ function dbFetchRows($sql, $parameters=array(), $nocache=false) { if ($config['memcached']['enable'] && $nocache === false) { $config['memcached']['resource']->set(hash('sha512',$sql.'|'.serialize($parameters)),$rows,$config['memcached']['ttl']); } + array_walk_recursive($rows,'sanitize_array'); return $rows; } @@ -333,6 +334,7 @@ function dbFetchRow($sql=null, $parameters=array(), $nocache=false) { if ($config['memcached']['enable'] && $nocache === false) { $config['memcached']['resource']->set(hash('sha512',$sql.'|'.serialize($parameters)),$row,$config['memcached']['ttl']); } + array_walk_recursive($row,'sanitize_array'); return $row; } else { diff --git a/includes/dbFacile.mysqli.php b/includes/dbFacile.mysqli.php index 15a48962c..70c4651e7 100644 --- a/includes/dbFacile.mysqli.php +++ b/includes/dbFacile.mysqli.php @@ -267,6 +267,7 @@ function dbFetchRows($sql, $parameters=array(), $nocache=false) { if ($config['memcached']['enable'] && $nocache === false) { $config['memcached']['resource']->set(hash('sha512',$sql.'|'.serialize($parameters)),$rows,$config['memcached']['ttl']); } + array_walk_recursive($rows,'sanitize_array'); return $rows; } @@ -334,6 +335,7 @@ function dbFetchRow($sql=null, $parameters=array(), $nocache=false) { if ($config['memcached']['enable'] && $nocache === false) { $config['memcached']['resource']->set(hash('sha512',$sql.'|'.serialize($parameters)),$row,$config['memcached']['ttl']); } + array_walk_recursive($row,'sanitize_array'); return $row; } else { From 8d9b522bdbb6f7664f42051037ff52fe1bc8a168 Mon Sep 17 00:00:00 2001 From: f0o Date: Wed, 10 Feb 2016 13:54:22 +0000 Subject: [PATCH 11/19] Remove redundant calls --- html/includes/vars.inc.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/html/includes/vars.inc.php b/html/includes/vars.inc.php index a633cef72..c9008d217 100644 --- a/html/includes/vars.inc.php +++ b/html/includes/vars.inc.php @@ -7,7 +7,7 @@ foreach ($_GET as $key => $get_var) { $value = 'yes'; } - $vars[$name] = htmlentities($value); + $vars[$name] = $value; } } @@ -23,7 +23,7 @@ else { foreach ($segments as $pos => $segment) { $segment = urldecode($segment); if ($pos == '0') { - $vars['page'] = htmlentities($segment); + $vars['page'] = $segment; } else { list($name, $value) = explode('=', $segment); @@ -31,15 +31,17 @@ foreach ($segments as $pos => $segment) { $vars[$name] = yes; } else { - $vars[$name] = htmlentities($value); + $vars[$name] = $value; } } } foreach ($_GET as $name => $value) { - $vars[$name] = htmlentities($value); + $vars[$name] = $value; } foreach ($_POST as $name => $value) { - $vars[$name] = htmlentities($value); + $vars[$name] = $value; } + +array_walk_recursive($vars,'sanitize_array'); From 2b55c06d9e58f65f3a4184473e6cf6fd0869e029 Mon Sep 17 00:00:00 2001 From: Daniel Preussker Date: Wed, 10 Feb 2016 14:31:16 +0000 Subject: [PATCH 12/19] Revert "Variable/Environment sanity" --- html/includes/vars.inc.php | 2 -- html/index.php | 8 ++++++++ includes/common.php | 10 ---------- includes/dbFacile.mysql.php | 2 -- includes/dbFacile.mysqli.php | 2 -- 5 files changed, 8 insertions(+), 16 deletions(-) diff --git a/html/includes/vars.inc.php b/html/includes/vars.inc.php index c9008d217..369a13a74 100644 --- a/html/includes/vars.inc.php +++ b/html/includes/vars.inc.php @@ -43,5 +43,3 @@ foreach ($_GET as $name => $value) { foreach ($_POST as $name => $value) { $vars[$name] = $value; } - -array_walk_recursive($vars,'sanitize_array'); diff --git a/html/index.php b/html/index.php index 494d6c3de..46164c663 100644 --- a/html/index.php +++ b/html/index.php @@ -214,6 +214,14 @@ else {
      "); + print_r($_GET); + print_r($vars); + echo(""); +} + if ($_SESSION['authenticated']) { // Authenticated. Print a page. if (isset($vars['page']) && !strstr("..", $vars['page']) && is_file("pages/" . $vars['page'] . ".inc.php")) { diff --git a/includes/common.php b/includes/common.php index 1162b819a..8b59ba774 100644 --- a/includes/common.php +++ b/includes/common.php @@ -1255,13 +1255,3 @@ function get_port_id ($ports_mapped, $port, $port_association_mode) { return $port_id; } - -/** - * Sanitize - * @param mixed $item Reference to Item - * @param mixed $key Key - * @return void - */ -function sanitize_array(&$item, $key) { - $item = htmlentities($item); -} diff --git a/includes/dbFacile.mysql.php b/includes/dbFacile.mysql.php index d9372cbb6..f2bb56c0b 100644 --- a/includes/dbFacile.mysql.php +++ b/includes/dbFacile.mysql.php @@ -266,7 +266,6 @@ function dbFetchRows($sql, $parameters=array(), $nocache=false) { if ($config['memcached']['enable'] && $nocache === false) { $config['memcached']['resource']->set(hash('sha512',$sql.'|'.serialize($parameters)),$rows,$config['memcached']['ttl']); } - array_walk_recursive($rows,'sanitize_array'); return $rows; } @@ -334,7 +333,6 @@ function dbFetchRow($sql=null, $parameters=array(), $nocache=false) { if ($config['memcached']['enable'] && $nocache === false) { $config['memcached']['resource']->set(hash('sha512',$sql.'|'.serialize($parameters)),$row,$config['memcached']['ttl']); } - array_walk_recursive($row,'sanitize_array'); return $row; } else { diff --git a/includes/dbFacile.mysqli.php b/includes/dbFacile.mysqli.php index 70c4651e7..15a48962c 100644 --- a/includes/dbFacile.mysqli.php +++ b/includes/dbFacile.mysqli.php @@ -267,7 +267,6 @@ function dbFetchRows($sql, $parameters=array(), $nocache=false) { if ($config['memcached']['enable'] && $nocache === false) { $config['memcached']['resource']->set(hash('sha512',$sql.'|'.serialize($parameters)),$rows,$config['memcached']['ttl']); } - array_walk_recursive($rows,'sanitize_array'); return $rows; } @@ -335,7 +334,6 @@ function dbFetchRow($sql=null, $parameters=array(), $nocache=false) { if ($config['memcached']['enable'] && $nocache === false) { $config['memcached']['resource']->set(hash('sha512',$sql.'|'.serialize($parameters)),$row,$config['memcached']['ttl']); } - array_walk_recursive($row,'sanitize_array'); return $row; } else { From c53e4de20c24a1613e4da7f8fab4f6c92b51c7fa Mon Sep 17 00:00:00 2001 From: pblasquez Date: Wed, 10 Feb 2016 13:22:22 -0800 Subject: [PATCH 13/19] Update ajax_setresolution.php --- html/ajax_setresolution.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/ajax_setresolution.php b/html/ajax_setresolution.php index 470b23da9..413832fb7 100644 --- a/html/ajax_setresolution.php +++ b/html/ajax_setresolution.php @@ -4,6 +4,6 @@ if(isset($_REQUEST['width']) AND isset($_REQUEST['height'])) { $_SESSION['screen_width'] = $_REQUEST['width']; $_SESSION['screen_height'] = $_REQUEST['height']; } -header('Content-type: application/json'); +header('Content-type: text/plain'); echo $_SESSION['screen_width']; echo $_SESSION['screen_height']; From 6b2679550083ee357d61deea90577ff58d52f208 Mon Sep 17 00:00:00 2001 From: Daniel van Dorp Date: Thu, 11 Feb 2016 16:47:02 +0100 Subject: [PATCH 14/19] Add functions needed to Installation instructions for Debian Ubuntu and RHEL CentOS --- doc/Installation/Installation-(Debian-Ubuntu).md | 2 +- doc/Installation/Installation-(RHEL-CentOS).md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/Installation/Installation-(Debian-Ubuntu).md b/doc/Installation/Installation-(Debian-Ubuntu).md index e07ac9bd2..dea55fb1f 100644 --- a/doc/Installation/Installation-(Debian-Ubuntu).md +++ b/doc/Installation/Installation-(Debian-Ubuntu).md @@ -73,7 +73,7 @@ Adding the above line to `/etc/snmp/snmpd.conf` and running `service snmpd resta In `/etc/php5/apache2/php.ini` and `/etc/php5/cli/php.ini`, ensure date.timezone is set to your preferred time zone. See http://php.net/manual/en/timezones.php for a list of supported timezones. Valid examples are: "America/New York", "Australia/Brisbane", "Etc/UTC". -Please also ensure that allow_url_fopen is enabled. +Please also ensure that `allow_url_fopen` is enabled. Other functions needed for LibreNMS include `exec,passthru,shell_exec,escapeshellarg,escapeshellcmd,proc_close,proc_open,popen`. ### Adding the librenms-user ### diff --git a/doc/Installation/Installation-(RHEL-CentOS).md b/doc/Installation/Installation-(RHEL-CentOS).md index 46100d078..d60fe96af 100644 --- a/doc/Installation/Installation-(RHEL-CentOS).md +++ b/doc/Installation/Installation-(RHEL-CentOS).md @@ -135,7 +135,8 @@ You need to configure snmpd appropriately if you have not already done so. An a Adding the above line to `/etc/snmp/snmpd.conf` and running `service snmpd restart` will activate this config. In `/etc/php.ini`, ensure date.timezone is set to your preferred time zone. See http://php.net/manual/en/timezones.php for a list of supported timezones. Valid -examples are: "America/New York", "Australia/Brisbane", "Etc/UTC". Please also ensure that allow_url_fopen is enabled. +examples are: "America/New York", "Australia/Brisbane", "Etc/UTC". +Please also ensure that `allow_url_fopen` is enabled. Other functions needed for LibreNMS include `exec,passthru,shell_exec,escapeshellarg,escapeshellcmd,proc_close,proc_open,popen`. Next, add the following to `/etc/httpd/conf.d/librenms.conf` From 616820d938f2f04db82b5f18718528d1df950ec6 Mon Sep 17 00:00:00 2001 From: Daniel van Dorp Date: Thu, 11 Feb 2016 16:51:49 +0100 Subject: [PATCH 15/19] Add functions needed to Support/FAQ 'Why do I not see any graphs?' --- doc/Support/FAQ.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/Support/FAQ.md b/doc/Support/FAQ.md index 8f9147e88..bdcfc73ca 100644 --- a/doc/Support/FAQ.md +++ b/doc/Support/FAQ.md @@ -73,6 +73,8 @@ If the page you are trying to load has a substantial amount of data in it then i This is usually due to there being blank spaces outside of the `` php tags within config.php. Remove these and retry. It's also worth removing the final `?>` at the end of config.php as this is not required. +Another reason why it might not be working is if you disabled functions needed by LibreNMS, which include `allow_url_fopen` +and `exec,passthru,shell_exec,escapeshellarg,escapeshellcmd,proc_close,proc_open,popen`. #### How do I debug pages not loading correctly? From 0e83e144054c285fa7472a82a89ca4504126a51a Mon Sep 17 00:00:00 2001 From: laf Date: Thu, 11 Feb 2016 21:26:06 +0000 Subject: [PATCH 16/19] Added rrdcached check, disable_function check and more binary location checks --- validate.php | 56 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 16 deletions(-) diff --git a/validate.php b/validate.php index f2fe619e3..f16178d3b 100755 --- a/validate.php +++ b/validate.php @@ -79,7 +79,6 @@ echo "MySQL: ".$versions['mysql_ver']."\n"; echo "RRDTool: ".$versions['rrdtool_ver']."\n"; echo "SNMP: ".$versions['netsnmp_ver']."\n"; - // Check php modules we use to make sure they are loaded $extensions = array('pcre','curl','session','snmp','mcrypt'); foreach ($extensions as $extension) { @@ -161,6 +160,10 @@ if (!$config['rrdcached']) { } } +if (isset($config['rrdcached'])) { + check_rrdcached(); +} + // Disk space and permission checks if (substr(sprintf('%o', fileperms($config['temp_dir'])), -3) != 777) { print_warn('Your tmp directory ('.$config['temp_dir'].") is not set to 777 so graphs most likely won't be generated"); @@ -176,13 +179,25 @@ if ($space_check < 1) { } // Check programs -$bins = array('fping'); +$bins = array('fping','rrdtool','snmpwalk','snmpget','snmpbulkwalk'); foreach ($bins as $bin) { if (!is_file($config[$bin])) { print_fail("$bin location is incorrect or bin not installed"); } - else { - print_ok("$bin has been found"); +} + +$disabled_functions = explode(',', ini_get('disable_functions')); +$required_functions = array('exec','passthru','shell_exec','escapeshellarg','escapeshellcmd','proc_close','proc_open','popen'); +foreach ($required_functions as $function) { + if (in_array($function, $disabled_functions)) { + print_fail("$function is disabled in php.ini"); + } +} + +if (!function_exists('openssl_random_pseudo_bytes')) { + print_warn("openssl_random_pseudo_bytes is not being used for user password hashing. This is a recommended function (https://secure.php.net/openssl_random_pseudo_bytes)"); + if (!is_readable('/dev/urandom')) { + print_warn("It also looks like we can't use /dev/urandom for user password hashing. We will fall back to generating our own hash - be warned"); } } @@ -257,15 +272,7 @@ foreach ($modules as $module) { print_fail('You have not configured $config[\'rrd_dir\']'); } else { - list($host,$port) = explode(':',$config['rrdcached']); - $connection = @fsockopen($host, $port); - if (is_resource($connection)) { - fclose($connection); - print_ok('Connection to rrdcached is ok'); - } - else { - print_fail('Cannot connect to rrdcached instance'); - } + check_rrdcached(); } } break; @@ -317,17 +324,34 @@ foreach ($modules as $module) { function print_ok($msg) { echo "[OK] $msg\n"; - }//end print_ok() function print_fail($msg) { echo "[FAIL] $msg\n"; - }//end print_fail() function print_warn($msg) { echo "[WARN] $msg\n"; - }//end print_warn() + +function check_rrdcached() { + global $config; + list($host,$port) = explode(':',$config['rrdcached']); + if ($host == 'unix') { + // Using socket, check that file exists + if (!file_exists($port)) { + print_fail("$port doesn't appear to exist, rrdcached test failed"); + } + } + else { + $connection = @fsockopen($host, $port); + if (is_resource($connection)) { + fclose($connection); + } + else { + print_fail('Cannot connect to rrdcached instance'); + } + } +}//end check_rrdcached From 4aaf4d8a7b6231de8eb7134ac0cedd386d5a186e Mon Sep 17 00:00:00 2001 From: laf Date: Thu, 11 Feb 2016 22:11:07 +0000 Subject: [PATCH 17/19] Added missing from email settings field --- html/pages/settings/alerting.inc.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/html/pages/settings/alerting.inc.php b/html/pages/settings/alerting.inc.php index 195c22f9b..b7cd30927 100644 --- a/html/pages/settings/alerting.inc.php +++ b/html/pages/settings/alerting.inc.php @@ -244,6 +244,10 @@ $mail_conf = array( 'descr' => 'From name', 'type' => 'text', ), + array('name' => 'email_from', + 'descr' => 'From email address', + 'type' => 'text', + ), array('name' => 'email_sendmail_path', 'descr' => 'Sendmail path', 'type' => 'text', From 8c53a94233b97f776e03258626f8f4f47c34b3f9 Mon Sep 17 00:00:00 2001 From: laf Date: Thu, 11 Feb 2016 22:27:36 +0000 Subject: [PATCH 18/19] Removed old alerting dbInsert code --- includes/polling/functions.inc.php | 1 - 1 file changed, 1 deletion(-) diff --git a/includes/polling/functions.inc.php b/includes/polling/functions.inc.php index fdd9aa3d7..69ad9b027 100644 --- a/includes/polling/functions.inc.php +++ b/includes/polling/functions.inc.php @@ -203,7 +203,6 @@ function poll_device($device, $options) { $poll_separator = ', '; dbUpdate(array('status' => $status, 'status_reason' => $response['status_reason']), 'devices', 'device_id=?', array($device['device_id'])); - dbInsert(array('importance' => '0', 'device_id' => $device['device_id'], 'message' => 'Device is '.($status == '1' ? 'up' : 'down')), 'alerts'); log_event('Device status changed to '.($status == '1' ? 'Up' : 'Down'), $device, ($status == '1' ? 'up' : 'down')); } From 6b7030c082583b67c2f5319698e512a27ec7f760 Mon Sep 17 00:00:00 2001 From: laf Date: Thu, 11 Feb 2016 23:19:56 +0000 Subject: [PATCH 19/19] Added show/hide line numbers button to show config page --- html/js/librenms.js | 21 +++++++++++++++++++++ html/pages/device/showconfig.inc.php | 3 +++ 2 files changed, 24 insertions(+) diff --git a/html/js/librenms.js b/html/js/librenms.js index b91090761..f103ea29b 100644 --- a/html/js/librenms.js +++ b/html/js/librenms.js @@ -223,3 +223,24 @@ $(document).on("click", '.collapse-neighbors', function(event) list.toggle(); continued.toggle(); }); + + +$(document).ready(function() { + var lines = 'on'; + $("#linenumbers").button().click(function() { + if (lines == 'on') { + $($('.config').find('ol').get().reverse()).each(function(){ + $(this).replaceWith($('
        '+$(this).html()+'
      ')) + lines = 'off'; + $('#linenumbers').val('Show line numbers'); + }); + } + else { + $($('.config').find('ul').get().reverse()).each(function(){ + $(this).replaceWith($('
        '+$(this).html()+'
      ')); + lines = 'on'; + $('#linenumbers').val('Hide line numbers'); + }); + } + }); +}); diff --git a/html/pages/device/showconfig.inc.php b/html/pages/device/showconfig.inc.php index ed9219cf2..1ba06bbfc 100644 --- a/html/pages/device/showconfig.inc.php +++ b/html/pages/device/showconfig.inc.php @@ -182,7 +182,10 @@ if ($_SESSION['userlevel'] >= '7') { $geshi->enable_line_numbers(GESHI_FANCY_LINE_NUMBERS); $geshi->set_overall_style('color: black;'); // $geshi->set_line_style('color: #999999'); + echo '
      '; + echo ''; echo $geshi->parse_code(); + echo '
      '; } }//end if