From 558dfb234445330c51e4647a8f59eb395d37bb7b Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Tue, 21 Jun 2016 00:59:43 +0100
Subject: [PATCH] Pretty up the discovery process output

---
 includes/discovery/arp-table.inc.php          |  2 --
 includes/discovery/bgp-peers.inc.php          |  1 -
 includes/discovery/cisco-cbqos.inc.php        |  1 -
 includes/discovery/cisco-cef.inc.php          |  2 --
 .../discovery/cisco-mac-accounting.inc.php    |  1 -
 includes/discovery/cisco-otv.inc.php          |  1 -
 includes/discovery/cisco-pw.inc.php           |  2 --
 includes/discovery/cisco-sla.inc.php          |  1 -
 includes/discovery/cisco-vrf-lite.inc.php     |  1 -
 includes/discovery/cisco-vrf.inc.php          |  2 --
 includes/discovery/discovery-arp.inc.php      |  2 --
 .../discovery/discovery-protocols.inc.php     |  2 --
 includes/discovery/entity-physical.inc.php    |  1 -
 includes/discovery/functions.inc.php          | 20 ++++++++++++-------
 includes/discovery/hr-device.inc.php          |  2 --
 includes/discovery/ipv4-addresses.inc.php     |  3 +--
 includes/discovery/ipv6-addresses.inc.php     |  3 +--
 includes/discovery/junose-atm-vp.inc.php      |  1 -
 includes/discovery/libvirt-vminfo.inc.php     |  2 --
 includes/discovery/mempools.inc.php           |  2 --
 includes/discovery/os.inc.php                 |  2 --
 includes/discovery/ports-stack.inc.php        |  2 --
 includes/discovery/processors.inc.php         |  2 --
 includes/discovery/route.inc.php              |  1 -
 includes/discovery/sensors.inc.php            |  4 +---
 includes/discovery/services.inc.php           |  1 -
 includes/discovery/storage.inc.php            |  2 --
 includes/discovery/stp.inc.php                |  2 --
 includes/discovery/toner.inc.php              |  2 --
 includes/discovery/ucd-diskio.inc.php         |  1 -
 includes/discovery/vlans.inc.php              |  2 --
 includes/discovery/vmware-vminfo.inc.php      |  2 --
 32 files changed, 16 insertions(+), 59 deletions(-)

diff --git a/includes/discovery/arp-table.inc.php b/includes/discovery/arp-table.inc.php
index 21585d8617..73de45f2c0 100644
--- a/includes/discovery/arp-table.inc.php
+++ b/includes/discovery/arp-table.inc.php
@@ -2,8 +2,6 @@
 
 unset($mac_table);
 
-echo 'ARP Table : ';
-
 if( key_exists('vrf_lite_cisco', $device) && (count($device['vrf_lite_cisco'])!=0) ){
     $vrfs_lite_cisco = $device['vrf_lite_cisco'];
 }
diff --git a/includes/discovery/bgp-peers.inc.php b/includes/discovery/bgp-peers.inc.php
index 99f5fc8bc6..a4a8449dc3 100644
--- a/includes/discovery/bgp-peers.inc.php
+++ b/includes/discovery/bgp-peers.inc.php
@@ -1,7 +1,6 @@
 <?php
 if ($config['enable_bgp']) {
     // Discover BGP peers
-    echo 'BGP Sessions : ';
     
     if( key_exists('vrf_lite_cisco', $device) && (count($device['vrf_lite_cisco'])!=0) ){
         $vrfs_lite_cisco = $device['vrf_lite_cisco'];
diff --git a/includes/discovery/cisco-cbqos.inc.php b/includes/discovery/cisco-cbqos.inc.php
index 2082c950e9..c368be6704 100644
--- a/includes/discovery/cisco-cbqos.inc.php
+++ b/includes/discovery/cisco-cbqos.inc.php
@@ -14,7 +14,6 @@
 if ($device['os_group'] == 'cisco') {
 
     $module = 'Cisco-CBQOS';
-    echo $module.': ';
 
     require_once 'includes/component.php';
     $component = new component();
diff --git a/includes/discovery/cisco-cef.inc.php b/includes/discovery/cisco-cef.inc.php
index 5f9ef1ca65..e1e85beca7 100644
--- a/includes/discovery/cisco-cef.inc.php
+++ b/includes/discovery/cisco-cef.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-echo 'Cisco CEF Switching Path: ';
-
 $cefs = array();
 $cefs = snmpwalk_cache_threepart_oid($device, 'CISCO-CEF-MIB::cefSwitchingPath', $cefs);
 d_echo($cefs);
diff --git a/includes/discovery/cisco-mac-accounting.inc.php b/includes/discovery/cisco-mac-accounting.inc.php
index 2edb8008b7..89047a454e 100644
--- a/includes/discovery/cisco-mac-accounting.inc.php
+++ b/includes/discovery/cisco-mac-accounting.inc.php
@@ -1,7 +1,6 @@
 <?php
 
 if ($device['os_group'] == 'cisco') {
-    echo 'Cisco MAC Accounting : ';
 
     $datas = shell_exec($config['snmpbulkwalk'].' -M '.$config['mibdir'].' -m CISCO-IP-STAT-MIB -Oqn '.snmp_gen_auth($device).' '.$device['hostname'].' cipMacSwitchedBytes');
     // echo("$datas\n");
diff --git a/includes/discovery/cisco-otv.inc.php b/includes/discovery/cisco-otv.inc.php
index 864786577d..53b9658603 100644
--- a/includes/discovery/cisco-otv.inc.php
+++ b/includes/discovery/cisco-otv.inc.php
@@ -58,7 +58,6 @@ if ($device['os_group'] == 'cisco') {
     $error_overlay[6] = "destroy";
 
     $module = 'Cisco-OTV';
-    echo $module.': ';
 
     require_once 'includes/component.php';
     $component = new component();
diff --git a/includes/discovery/cisco-pw.inc.php b/includes/discovery/cisco-pw.inc.php
index 5c342c256e..9f1eac88bf 100644
--- a/includes/discovery/cisco-pw.inc.php
+++ b/includes/discovery/cisco-pw.inc.php
@@ -4,8 +4,6 @@ if ($config['enable_pseudowires'] && $device['os_group'] == 'cisco') {
     unset($cpw_count);
     unset($cpw_exists);
 
-    echo 'Cisco Pseudowires : ';
-
     // Pre-cache the existing state of pseudowires for this device from the database
     $pws_db_raw = dbFetchRows('SELECT * FROM `pseudowires` WHERE `device_id` = ?', array($device['device_id']));
     foreach ($pws_db_raw as $pw_db) {
diff --git a/includes/discovery/cisco-sla.inc.php b/includes/discovery/cisco-sla.inc.php
index d0e45107de..a5352ffd8a 100644
--- a/includes/discovery/cisco-sla.inc.php
+++ b/includes/discovery/cisco-sla.inc.php
@@ -1,7 +1,6 @@
 <?php
 
 if ($config['enable_sla'] && $device['os_group'] == 'cisco') {
-    echo 'SLAs : ';
 
     $slas = snmp_walk($device, 'ciscoRttMonMIB.ciscoRttMonObjects.rttMonCtrl', '-Osq', '+CISCO-RTTMON-MIB');
 
diff --git a/includes/discovery/cisco-vrf-lite.inc.php b/includes/discovery/cisco-vrf-lite.inc.php
index b079e618cb..49f16707fe 100644
--- a/includes/discovery/cisco-vrf-lite.inc.php
+++ b/includes/discovery/cisco-vrf-lite.inc.php
@@ -24,7 +24,6 @@ if ($config['enable_vrf_lite_cisco']) {
 
     // For the moment only will be cisco and the version 3
     if ($device['os_group'] == "cisco" && $device['snmpver'] == 'v3') {
-        echo ("VRF lite cisco : \n");
         $mib = "SNMP-COMMUNITY-MIB";
         $mib = "CISCO-CONTEXT-MAPPING-MIB";
         //-Osq because if i put the n the oid from the first command is not the same of this one
diff --git a/includes/discovery/cisco-vrf.inc.php b/includes/discovery/cisco-vrf.inc.php
index aceef192f6..428836f0e6 100644
--- a/includes/discovery/cisco-vrf.inc.php
+++ b/includes/discovery/cisco-vrf.inc.php
@@ -5,8 +5,6 @@ if ($config['enable_vrfs']) {
     if ($device['os_group'] == 'cisco' || $device['os_group'] == 'junos' || $device['os'] == 'ironware') {
         unset($vrf_count);
 
-        echo 'VRFs : ';
-
         /*
             There are 2 MIBs for VPNs : MPLS-VPN-MIB (oldest) and MPLS-L3VPN-STD-MIB (newest)
             Unfortunately, there is no simple way to find out which one to use, unless we reference
diff --git a/includes/discovery/discovery-arp.inc.php b/includes/discovery/discovery-arp.inc.php
index 6894e0cc65..ab21759c52 100644
--- a/includes/discovery/discovery-arp.inc.php
+++ b/includes/discovery/discovery-arp.inc.php
@@ -13,8 +13,6 @@
 // License: GPLv3
 //
 
-echo 'ARP Discovery: ';
-
 $hostname = $device['hostname'];
 $deviceid = $device['device_id'];
 
diff --git a/includes/discovery/discovery-protocols.inc.php b/includes/discovery/discovery-protocols.inc.php
index 331fe577f9..343cf9f0aa 100644
--- a/includes/discovery/discovery-protocols.inc.php
+++ b/includes/discovery/discovery-protocols.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-echo 'Discovery protocols:';
-
 global $link_exists;
 
 $community = $device['community'];
diff --git a/includes/discovery/entity-physical.inc.php b/includes/discovery/entity-physical.inc.php
index 91c61b8de3..0bf25eae20 100644
--- a/includes/discovery/entity-physical.inc.php
+++ b/includes/discovery/entity-physical.inc.php
@@ -1,7 +1,6 @@
 <?php
 
 if ($config['enable_inventory']) {
-    echo 'Physical Inventory : ';
 
     echo "\nCaching OIDs:";
 
diff --git a/includes/discovery/functions.inc.php b/includes/discovery/functions.inc.php
index ca6ee240bf..b6d591ac6e 100644
--- a/includes/discovery/functions.inc.php
+++ b/includes/discovery/functions.inc.php
@@ -108,20 +108,17 @@ function discover_device($device, $options = null) {
     if ($options['m']) {
         foreach (explode(',', $options['m']) as $module) {
             if (is_file("includes/discovery/$module.inc.php")) {
-                include "includes/discovery/$module.inc.php";
+                load_discovery_module($module, $device, $attribs);
             }
         }
     } else {
         foreach ($config['discovery_modules'] as $module => $module_status) {
             if ($attribs['discover_' . $module] || ( $module_status && !isset($attribs['discover_' . $module]))) {
-                $module_start = microtime(true);
-                include 'includes/discovery/' . $module . '.inc.php';
-                $module_time = microtime(true) - $module_start;
-                echo "Runtime for discovery module '$module': $module_time\n";
+                load_discovery_module($module, $device, $attribs);
             } else if (isset($attribs['discover_' . $module]) && $attribs['discover_' . $module] == '0') {
-                echo "Module [ $module ] disabled on host.\n";
+                echo "Module [ $module ] disabled on host.\n\n";
             } else {
-                echo "Module [ $module ] disabled globally.\n";
+                echo "Module [ $module ] disabled globally.\n\n";
             }
         }
     }
@@ -851,3 +848,12 @@ function avtech_add_sensor($device, $sensor) {
     return true;
 }
 
+function load_discovery_module($module, $device, $attribs) {
+    global $config, $valid;
+    $module_start = microtime(true);
+    echo "#### Load disco module $module ####\n";
+    include "includes/discovery/$module.inc.php";
+    $module_time = microtime(true) - $module_start;
+    echo "\n>> Runtime for discovery module '$module': $module_time\n";
+    echo "#### Unload disco module $module ####\n\n";
+}
diff --git a/includes/discovery/hr-device.inc.php b/includes/discovery/hr-device.inc.php
index a00ddc887c..868989dc55 100644
--- a/includes/discovery/hr-device.inc.php
+++ b/includes/discovery/hr-device.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-echo 'hrDevice : ';
-
 $hrDevice_oids = array(
     'hrDeviceEntry',
     'hrProcessorEntry',
diff --git a/includes/discovery/ipv4-addresses.inc.php b/includes/discovery/ipv4-addresses.inc.php
index 441b828747..a96530338e 100644
--- a/includes/discovery/ipv4-addresses.inc.php
+++ b/includes/discovery/ipv4-addresses.inc.php
@@ -1,6 +1,5 @@
 <?php
 
-echo 'IPv4 Addresses : ';
 if( key_exists('vrf_lite_cisco', $device) && (count($device['vrf_lite_cisco'])!= 0) ){
     $vrfs_lite_cisco = $device['vrf_lite_cisco'];
 }
@@ -72,4 +71,4 @@ foreach ($vrfs_lite_cisco as $vrf) {
     unset($device['context_name']);
     unset($valid_v4);
 }
-unset($vrfs_c);
\ No newline at end of file
+unset($vrfs_c);
diff --git a/includes/discovery/ipv6-addresses.inc.php b/includes/discovery/ipv6-addresses.inc.php
index 617c003e19..b57900b355 100644
--- a/includes/discovery/ipv6-addresses.inc.php
+++ b/includes/discovery/ipv6-addresses.inc.php
@@ -1,6 +1,5 @@
 <?php
 
-echo 'IPv6 Addresses : ';
 if( key_exists('vrf_lite_cisco', $device) && (count($device['vrf_lite_cisco'])!=0) ){
     $vrfs_lite_cisco = $device['vrf_lite_cisco'];
 } 
@@ -86,4 +85,4 @@ foreach ($vrfs_lite_cisco as $vrf) {
     echo "\n";
     unset($device['context_name']);
 }
-unset($vrfs_c);
\ No newline at end of file
+unset($vrfs_c);
diff --git a/includes/discovery/junose-atm-vp.inc.php b/includes/discovery/junose-atm-vp.inc.php
index f65320fcc7..cc79c47994 100644
--- a/includes/discovery/junose-atm-vp.inc.php
+++ b/includes/discovery/junose-atm-vp.inc.php
@@ -4,7 +4,6 @@
 // snmpwalk -v2c -c <community> <hostname> -M mibs/junose/ -m Juniper-UNI-ATM-MIB juniAtmVpStatsEntry
 // JunOSe ATM vps
 if ($device['os'] == 'junose' && $config['enable_ports_junoseatmvp']) {
-    echo 'JunOSe ATM vps : ';
     $vp_array = snmpwalk_cache_multi_oid($device, 'juniAtmVpStatsInCells', $vp_array, 'Juniper-UNI-ATM-MIB', $config['install_dir'].'/mibs/junose');
     $valid_vp = array();
     d_echo($vp_array);
diff --git a/includes/discovery/libvirt-vminfo.inc.php b/includes/discovery/libvirt-vminfo.inc.php
index aced6467c3..ec6c08a0ee 100644
--- a/includes/discovery/libvirt-vminfo.inc.php
+++ b/includes/discovery/libvirt-vminfo.inc.php
@@ -5,8 +5,6 @@
 if ($config['enable_libvirt'] == '1' && $device['os'] == 'linux') {
     $libvirt_vmlist = array();
 
-    echo 'Libvirt VM: ';
-
     $ssh_ok = 0;
 
     $userHostname = $device['hostname'];
diff --git a/includes/discovery/mempools.inc.php b/includes/discovery/mempools.inc.php
index b865b9f434..c622f76687 100644
--- a/includes/discovery/mempools.inc.php
+++ b/includes/discovery/mempools.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-echo 'Memory : ';
-
 // Include all discovery modules
 $include_dir = 'includes/discovery/mempools';
 require 'includes/include-dir.inc.php';
diff --git a/includes/discovery/os.inc.php b/includes/discovery/os.inc.php
index 654356a99e..afe5d2ae50 100644
--- a/includes/discovery/os.inc.php
+++ b/includes/discovery/os.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-echo 'OS: ';
-
 $os   = getHostOS($device);
 if ($os != $device['os']) {
     log_event('Device OS changed '.$device['os']." => $os", $device, 'system');
diff --git a/includes/discovery/ports-stack.inc.php b/includes/discovery/ports-stack.inc.php
index dfa03b111d..6ccc4587e6 100644
--- a/includes/discovery/ports-stack.inc.php
+++ b/includes/discovery/ports-stack.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-echo 'Port Stack: ';
-
 $sql = "SELECT * FROM `ports_stack` WHERE `device_id` = '".$device['device_id']."'";
 
 foreach (dbFetchRows($sql) as $entry) {
diff --git a/includes/discovery/processors.inc.php b/includes/discovery/processors.inc.php
index c095015980..3dbcee8666 100644
--- a/includes/discovery/processors.inc.php
+++ b/includes/discovery/processors.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-echo 'Processors : ';
-
 // Include all discovery modules
 $include_dir = 'includes/discovery/processors';
 require 'includes/include-dir.inc.php';
diff --git a/includes/discovery/route.inc.php b/includes/discovery/route.inc.php
index c50e44af60..c99627cd9d 100644
--- a/includes/discovery/route.inc.php
+++ b/includes/discovery/route.inc.php
@@ -25,7 +25,6 @@ $ids = array();
 // For the moment only will be cisco and the version 3
 if ($device['os_group'] == "cisco") {
 
-    echo ("ROUTE : ");
     //RFC1213-MIB
     $mib = "RFC1213-MIB";
     //IpRouteEntry
diff --git a/includes/discovery/sensors.inc.php b/includes/discovery/sensors.inc.php
index 67da5bc8e1..cfb66fd24c 100644
--- a/includes/discovery/sensors.inc.php
+++ b/includes/discovery/sensors.inc.php
@@ -2,8 +2,6 @@
 
 $valid['sensor'] = array();
 
-echo 'Sensors: ';
-
 require 'includes/discovery/sensors/cisco-entity-sensor.inc.php';
 require 'includes/discovery/sensors/entity-sensor.inc.php';
 require 'includes/discovery/sensors/ipmi.inc.php';
@@ -27,4 +25,4 @@ require 'includes/discovery/sensors/charge.inc.php';
 require 'includes/discovery/sensors/load.inc.php';
 require 'includes/discovery/sensors/states.inc.php';
 require 'includes/discovery/sensors/dbm.inc.php';
-require 'includes/discovery/sensors/signal.inc.php';
\ No newline at end of file
+require 'includes/discovery/sensors/signal.inc.php';
diff --git a/includes/discovery/services.inc.php b/includes/discovery/services.inc.php
index 3f3e3c9880..e434691273 100644
--- a/includes/discovery/services.inc.php
+++ b/includes/discovery/services.inc.php
@@ -1,7 +1,6 @@
 <?php
 
 if ($config['discover_services']) {
-    echo 'Services: ';
 
     // FIXME: use /etc/services?
     $known_services = array(
diff --git a/includes/discovery/storage.inc.php b/includes/discovery/storage.inc.php
index d04817c9be..e2e1c0b94d 100644
--- a/includes/discovery/storage.inc.php
+++ b/includes/discovery/storage.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-echo 'Storage : ';
-
 // Include all discovery modules
 $include_dir = 'includes/discovery/storage';
 require 'includes/include-dir.inc.php';
diff --git a/includes/discovery/stp.inc.php b/includes/discovery/stp.inc.php
index 6e85a8ff0c..2a441ed7d6 100644
--- a/includes/discovery/stp.inc.php
+++ b/includes/discovery/stp.inc.php
@@ -14,8 +14,6 @@
  * needs RSTP-MIB
  */
 
-echo "Spanning Tree: ";
-
 // Pre-cache existing state of STP for this device from database
 $stp_db = dbFetchRow('SELECT * FROM `stp` WHERE `device_id` = ?', array($device['device_id']));
 //d_echo($stp_db);
diff --git a/includes/discovery/toner.inc.php b/includes/discovery/toner.inc.php
index 92535f72bc..fd832b858e 100644
--- a/includes/discovery/toner.inc.php
+++ b/includes/discovery/toner.inc.php
@@ -3,8 +3,6 @@
 if ($config['enable_printers']) {
     $valid_toner = array();
 
-    echo 'Toner : ';
-
     if ($device['os_group'] == 'printer') {
         $oids = trim(snmp_walk($device, 'SNMPv2-SMI::mib-2.43.12.1.1.2.1 ', '-OsqnU'));
         if (!$oids) {
diff --git a/includes/discovery/ucd-diskio.inc.php b/includes/discovery/ucd-diskio.inc.php
index 1671b0f67f..97896a70fc 100644
--- a/includes/discovery/ucd-diskio.inc.php
+++ b/includes/discovery/ucd-diskio.inc.php
@@ -1,6 +1,5 @@
 <?php
 
-echo 'UCD Disk IO : ';
 $diskio_array = snmpwalk_cache_oid($device, 'diskIOEntry', array(), 'UCD-DISKIO-MIB', '+'.$config['install_dir'].'/mibs/');
 $valid_diskio = array();
 if (is_array($diskio_array)) {
diff --git a/includes/discovery/vlans.inc.php b/includes/discovery/vlans.inc.php
index d152368734..6147f82f30 100644
--- a/includes/discovery/vlans.inc.php
+++ b/includes/discovery/vlans.inc.php
@@ -1,7 +1,5 @@
 <?php
 
-echo "VLANs:\n";
-
 // Pre-cache the existing state of VLANs for this device from the database
 $vlans_db_raw = dbFetchRows('SELECT * FROM `vlans` WHERE `device_id` = ?', array($device['device_id']));
 foreach ($vlans_db_raw as $vlan_db) {
diff --git a/includes/discovery/vmware-vminfo.inc.php b/includes/discovery/vmware-vminfo.inc.php
index 5bf6b02b43..c5a8c0852d 100644
--- a/includes/discovery/vmware-vminfo.inc.php
+++ b/includes/discovery/vmware-vminfo.inc.php
@@ -16,8 +16,6 @@ if (($device['os'] == 'vmware') || ($device['os'] == 'linux')) {
      * CONSOLE: Start the VMware discovery process.
      */
 
-    echo 'VMware VM: ';
-
     /*
      * Fetch information about Virtual Machines.
      */