From 4739254fbe8e534119f1de7d2444e8b6fc283190 Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil+github@lathwood.co.uk>
Date: Mon, 13 Apr 2015 21:53:05 +0100
Subject: [PATCH] Added hardware / serial number support

---
 includes/discovery/vmware-vminfo.inc.php | 7 +++++--
 includes/polling/os/vmware.inc.php       | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/includes/discovery/vmware-vminfo.inc.php b/includes/discovery/vmware-vminfo.inc.php
index 06a107fdc8..d1708667e8 100755
--- a/includes/discovery/vmware-vminfo.inc.php
+++ b/includes/discovery/vmware-vminfo.inc.php
@@ -28,8 +28,11 @@ if (($device['os'] == "vmware") || ($device['os'] == "linux"))
    *  ...
    */
 
-  $oids = trim(snmp_walk($device, "vmwVmUUID", "-Osq", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:" . $config["install_dir"] . "/mibs"));
-  $oids = str_replace("vmwVmUUID.", "", $oids);
+  $oids = snmp_walk($device, "VMWARE-VMINFO-MIB::vmwVmVMID", "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:" . $config["install_dir"] . "/mibs");
+  if (empty($oids)) {
+      $oids = trim(snmp_walk($device, "vmwVmUUID", "-Osq", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:" . $config["install_dir"] . "/mibs"));
+      $oids = str_replace("vmwVmUUID.", "", $oids);
+  }
   if ($oids != "")
   {
     $oids = explode("\n", $oids);
diff --git a/includes/polling/os/vmware.inc.php b/includes/polling/os/vmware.inc.php
index 931667dab5..f6d8e71ffd 100644
--- a/includes/polling/os/vmware.inc.php
+++ b/includes/polling/os/vmware.inc.php
@@ -14,6 +14,8 @@
 $data   = snmp_get_multi($device, "VMWARE-SYSTEM-MIB::vmwProdName.0 VMWARE-SYSTEM-MIB::vmwProdVersion.0 VMWARE-SYSTEM-MIB::vmwProdBuild.0", "-OQUs", "+VMWARE-ROOT-MIB:VMWARE-SYSTEM-MIB:VMWARE-VMINFO-MIB", "+" . $config['install_dir'] . "/mibs/vmware:".$config['mibdir']);
 $version  = preg_replace("/^VMware /", "", $data[0]["vmwProdName"]) . " " . $data[0]["vmwProdVersion"];
 $features = "build-" . $data[0]["vmwProdBuild"];
+$hardware = snmp_get($device, "entPhysicalDescr.1", "-OsvQU", "ENTITY-MIB");
+$serial = snmp_get($device, "entPhysicalSerialNum.1", "-OsvQU", "ENTITY-MIB");
 
 /*
  * CONSOLE: Start the VMware discovery process.