Merge pull request #799 from laf/issue-774

Fixed vmware virtual machine support + updated mibs + added serial and hardware info

includes/discovery/vmware-vminfo.inc.php

@@ -23,40 +23,47 @@ if (($device['os'] == "vmware") || ($device['os'] == "linux"))
   /*
    * Fetch the list is Virtual Machines.
    *
-   *  VMWARE-VMINFO-MIB::vmwVmVMID.224 = INTEGER: 224
+   *  vmwVmVMID.224 = INTEGER: 224
-   *  VMWARE-VMINFO-MIB::vmwVmVMID.416 = INTEGER: 416
+   *  vmwVmVMID.416 = INTEGER: 416
    *  ...
    */
 
   $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);
 
-    foreach ($oids as $oid)
+    foreach ($oids as $data)
     {
+        $data = trim($data);
+        list($oid,) = explode(" ", $data);
       /*
        * Fetch the Virtual Machine information.
        *
-       *  VMWARE-VMINFO-MIB::vmwVmDisplayName.224 = STRING: My First VM
+       *  vmwVmDisplayName.224 = STRING: My First VM
-       *  VMWARE-VMINFO-MIB::vmwVmDisplayName.416 = STRING: My Second VM
+       *  vmwVmDisplayName.416 = STRING: My Second VM
-       *  VMWARE-VMINFO-MIB::vmwVmGuestOS.224 = STRING: windows7Server64Guest
+       *  vmwVmGuestOS.224 = STRING: windows7Server64Guest
-       *  VMWARE-VMINFO-MIB::vmwVmGuestOS.416 = STRING: winLonghornGuest
+       *  vmwVmGuestOS.416 = STRING: winLonghornGuest
-       *  VMWARE-VMINFO-MIB::vmwVmMemSize.224 = INTEGER: 8192 megabytes
+       *  vmwVmMemSize.224 = INTEGER: 8192 megabytes
-       *  VMWARE-VMINFO-MIB::vmwVmMemSize.416 = INTEGER: 8192 megabytes
+       *  vmwVmMemSize.416 = INTEGER: 8192 megabytes
-       *  VMWARE-VMINFO-MIB::vmwVmState.224 = STRING: poweredOn
+       *  vmwVmState.224 = STRING: poweredOn
-       *  VMWARE-VMINFO-MIB::vmwVmState.416 = STRING: poweredOn
+       *  vmwVmState.416 = STRING: poweredOn
-       *  VMWARE-VMINFO-MIB::vmwVmVMID.224 = INTEGER: 224
+       *  vmwVmVMID.224 = INTEGER: 224
-       *  VMWARE-VMINFO-MIB::vmwVmVMID.416 = INTEGER: 416
+       *  vmwVmVMID.416 = INTEGER: 416
-       *  VMWARE-VMINFO-MIB::vmwVmCpus.224 = INTEGER: 2
+       *  vmwVmCpus.224 = INTEGER: 2
-       *  VMWARE-VMINFO-MIB::vmwVmCpus.416 = INTEGER: 2
+       *  vmwVmCpus.416 = INTEGER: 2
        */
 
-      $vmwVmDisplayName = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmDisplayName." . $oid, "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:" . $config["install_dir"] . "/mibs");
+
-      $vmwVmGuestOS   = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmGuestOS."   . $oid, "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:" . $config["install_dir"] . "/mibs");
+      $vmwVmDisplayName = snmp_get($device, "vmwVmDisplayName." . $oid, "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:" . $config["install_dir"] . "/mibs");
-      $vmwVmMemSize   = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmMemSize."   . $oid, "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:" . $config["install_dir"] . "/mibs");
+      $vmwVmGuestOS   = snmp_get($device, "vmwVmGuestOS."   . $oid, "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:" . $config["install_dir"] . "/mibs");
-      $vmwVmState     = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmState."     . $oid, "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:" . $config["install_dir"] . "/mibs");
+      $vmwVmMemSize   = snmp_get($device, "vmwVmMemSize."   . $oid, "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:" . $config["install_dir"] . "/mibs");
-      $vmwVmCpus    = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmCpus."    . $oid, "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:" . $config["install_dir"] . "/mibs");
+      $vmwVmState     = snmp_get($device, "vmwVmState."     . $oid, "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:" . $config["install_dir"] . "/mibs");
+      $vmwVmCpus    = snmp_get($device, "vmwVmCpus."    . $oid, "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:" . $config["install_dir"] . "/mibs");
 
       /*
        * VMware does not return an INTEGER but a STRING of the vmwVmMemSize. This bug
@@ -74,7 +81,8 @@ if (($device['os'] == "vmware") || ($device['os'] == "linux"))
 
       if (dbFetchCell("SELECT COUNT(id) FROM `vminfo` WHERE `device_id` = ? AND `vmwVmVMID` = ? AND vm_type='vmware'",array($device['device_id'], $oid)) == 0)
       {
-        dbInsert(array('device_id' => $device['device_id'], 'vm_type' => 'vmware', 'vmwVmVMID' => $oid,'vmwVmDisplayName' => mres($vmwVmDisplayName), 'vmwVmGuestOS' => mres($vmwVmGuestOS), 'vmwVmMemSize' => mres($vmwVmMemSize), 'vmwVmCpus' => mres($vmwVmCpus), 'vmwVmState' => mres($vmwVmState)), 'vminfo');
+        $vmid = dbInsert(array('device_id' => $device['device_id'], 'vm_type' => 'vmware', 'vmwVmVMID' => $oid,'vmwVmDisplayName' => mres($vmwVmDisplayName), 'vmwVmGuestOS' => mres($vmwVmGuestOS), 'vmwVmMemSize' => mres($vmwVmMemSize), 'vmwVmCpus' => mres($vmwVmCpus), 'vmwVmState' => mres($vmwVmState)), 'vminfo');
+        log_event(mres($vmwVmDisplayName) . " ($vmwVmMemSize GB / $vmwVmCpus vCPU) Discovered",$device,'system',$vmid);
         echo("+");
         // FIXME eventlog
       } else {
@@ -94,7 +102,7 @@ if (($device['os'] == "vmware") || ($device['os'] == "linux"))
    * Get a list of all the known Virtual Machines for this host.
    */
 
-  $sql = "SELECT id, vmwVmVMID FROM vminfo WHERE device_id = '" . $device["device_id"] . "' AND vm_type='vmware'";
+  $sql = "SELECT id, vmwVmVMID, vmwVmDisplayName FROM vminfo WHERE device_id = '" . $device["device_id"] . "' AND vm_type='vmware'";
 
   foreach (dbFetchRows($sql) as $db_vm)
   {
@@ -105,6 +113,7 @@ if (($device['os'] == "vmware") || ($device['os'] == "linux"))
     if (!in_array($db_vm["vmwVmVMID"], $vmw_vmlist))
     {
       dbDelete('vminfo', '`id` = ?', array($db_vm['id']));
+      log_event(mres($db_vm['vmwVmDisplayName']) . " Removed",$device,'system',$db_vm['vmwVmVMID']);
       echo("-");
       // FIXME eventlog
     }

includes/polling/os/vmware.inc.php

@@ -11,9 +11,11 @@
  *  features:  build-348481
  */
 
-$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", "+" . $config['install_dir'] . "/mibs/vmware");
+$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.
@@ -42,11 +44,11 @@ foreach ($db_info_list as $db_info)
 
   $vm_info = array();
 
-  $vm_info["vmwVmDisplayName"] = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmDisplayName." . $db_info["vmwVmVMID"], "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware");
+  $vm_info["vmwVmDisplayName"] = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmDisplayName." . $db_info["vmwVmVMID"], "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:".$config['mibdir']);
-  $vm_info["vmwVmGuestOS"] = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmGuestOS."   . $db_info["vmwVmVMID"], "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware");
+  $vm_info["vmwVmGuestOS"] = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmGuestOS."   . $db_info["vmwVmVMID"], "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:".$config['mibdir']);
-  $vm_info["vmwVmMemSize"] = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmMemSize."   . $db_info["vmwVmVMID"], "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware");
+  $vm_info["vmwVmMemSize"] = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmMemSize."   . $db_info["vmwVmVMID"], "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:".$config['mibdir']);
-  $vm_info["vmwVmState"] = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmState."     . $db_info["vmwVmVMID"], "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware");
+  $vm_info["vmwVmState"] = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmState."     . $db_info["vmwVmVMID"], "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:".$config['mibdir']);
-  $vm_info["vmwVmCpus"] = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmCpus."    . $db_info["vmwVmVMID"], "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware");
+  $vm_info["vmwVmCpus"] = snmp_get($device, "VMWARE-VMINFO-MIB::vmwVmCpus."    . $db_info["vmwVmVMID"], "-Osqnv", "+VMWARE-ROOT-MIB:VMWARE-VMINFO-MIB", "+" . $config["install_dir"] . "/mibs/vmware:".$config['mibdir']);
 
   /*
    * VMware does not return an INTEGER but a STRING of the vmwVmMemSize. This bug

mibs/vmware/VMWARE-CIMOM-MIB

@@ -0,0 +1,81 @@
+-- **********************************************************
+-- Copyright 2010 VMware, Inc.  All rights reserved. 
+-- **********************************************************
+
+VMWARE-CIMOM-MIB DEFINITIONS ::= BEGIN
+
+    IMPORTS
+        MODULE-IDENTITY, NOTIFICATION-TYPE
+    FROM SNMPv2-SMI
+        MODULE-COMPLIANCE, NOTIFICATION-GROUP
+    FROM SNMPv2-CONF
+        vmwEnvIndicationTime
+    FROM VMWARE-ENV-MIB
+       	vmwProductSpecific
+    FROM VMWARE-ROOT-MIB;
+
+    vmwCIMOMMIB MODULE-IDENTITY
+    LAST-UPDATED "201008200000Z"
+    ORGANIZATION "VMware, Inc"
+    CONTACT-INFO
+    "VMware, Inc
+    3401 Hillview Ave
+    Palo Alto, CA 94304
+    Tel: 1-877-486-9273 or 650-427-5000
+    Fax: 650-427-5001
+    Web: http://communities.vmware.com/community/developer/forums/managementapi
+    "
+DESCRIPTION
+     "This MIB module provides instrumentation of a CIM Object Manager." 
+REVISION      "201008200000Z"
+DESCRIPTION
+     "Information on a CIM object manager subsystem."
+::= { vmwCimOm 10 }
+
+vmwCimOm OBJECT IDENTIFIER
+    ::= { vmwProductSpecific 90 }
+
+vmwCimOmNotifications OBJECT IDENTIFIER 
+    ::= {vmwCimOm 0 }
+
+vmwCimOmHeartbeat NOTIFICATION-TYPE
+    OBJECTS     { vmwEnvIndicationTime }
+    STATUS      current 
+    DESCRIPTION
+        "This notification, if the agent is so configured, will be sent 
+         on a periodic basis to indicate cimom indication delivery is functioning."
+    ::= { vmwCimOmNotifications 401 }
+
+-- conformance information
+vmwCimOmMIBConformance
+OBJECT IDENTIFIER ::= { vmwCimOm 2 }
+vmwCimOmMIBCompliances
+OBJECT IDENTIFIER ::= { vmwCimOmMIBConformance 1 }
+vmwCimOmMIBGroups  OBJECT IDENTIFIER ::= { vmwCimOmMIBConformance 2 }
+
+-- compliance statements
+
+vmwCimOmMIBBasicCompliance MODULE-COMPLIANCE
+STATUS  current
+DESCRIPTION
+    "The compliance statement for entities which implement the 
+    VMWARE-CIMOM-MIB."
+MODULE  -- this module
+MANDATORY-GROUPS { vmwCimOmNotificationGroup }
+GROUP  vmwCimOmNotificationGroup
+DESCRIPTION
+    "This group is mandatory for systems with CIM object manager."
+::= { vmwCimOmMIBCompliances 4 }
+
+vmwCimOmNotificationGroup NOTIFICATION-GROUP
+       NOTIFICATIONS {
+       vmwCimOmHeartbeat
+       }
+       STATUS      current
+       DESCRIPTION
+           "Notifications related to CIM Object Manager subsystem."
+       ::= { vmwCimOmMIBGroups 2 }
+
+
+END
+

mibs/vmware/VMWARE-ENV-MIB.mib

@@ -1,14 +1,14 @@
 -- **********************************************************
--- Copyright 2008 VMware, Inc.  All rights reserved. 
+-- Copyright 2008-2010 VMware, Inc.  All rights reserved. 
 -- **********************************************************
 
 VMWARE-ENV-MIB DEFINITIONS ::= BEGIN
 
 IMPORTS
-    Integer32, NOTIFICATION-TYPE, OBJECT-TYPE, TimeTicks,
+    Counter32, Integer32, NOTIFICATION-TYPE, OBJECT-TYPE, TimeTicks,
     MODULE-IDENTITY, OBJECT-IDENTITY
     FROM SNMPv2-SMI
-    DisplayString
+    DisplayString, DateAndTime
     FROM SNMPv2-TC
     MODULE-COMPLIANCE, OBJECT-GROUP, NOTIFICATION-GROUP
     FROM SNMPv2-CONF
@@ -16,11 +16,12 @@ IMPORTS
     FROM VMWARE-ROOT-MIB
     vmwESX
     FROM VMWARE-PRODUCTS-MIB
-    VmwSubsystemStatus, VmwSubsystemTypes
+    VmwLongSnmpAdminString, VmwCIMSeverity, VmwSubsystemStatus, VmwSubsystemTypes,
+    VmwCIMAlertTypes, VmwCIMAlertFormat, VmwCimName
     FROM VMWARE-TC-MIB;
 
     vmwEnvironmentalMIB MODULE-IDENTITY
-    LAST-UPDATED "200810300000Z"
+    LAST-UPDATED "201005120000Z"
     ORGANIZATION "VMware, Inc"
     CONTACT-INFO
     "VMware, Inc
@@ -33,6 +34,13 @@ IMPORTS
 DESCRIPTION
      "This MIB module identifies hardware components of a machine as provided by IPMI."
 
+REVISION   "201005120000Z"
+DESCRIPTION
+    "This revision adds support for CIM OMC_IpmiAlertIndication as the source of events
+     instead of only IPMI sensors thus more areas of hardware can be reported on.
+     This required a new notification set to be defined replacing previous
+     notifications."
+
 REVISION   "200810300000Z"
 DESCRIPTION
     "Introduce vmwESXNotification to match ESX 3.5 agent."
@@ -139,7 +147,7 @@ vmwEnvHardwareTime OBJECT-TYPE
 vmwEnvHardwareEvent NOTIFICATION-TYPE
     OBJECTS     { vmwSubsystemType, vmwHardwareStatus, 
                   vmwEventDescription, vmwEnvHardwareTime }
-    STATUS      current
+    STATUS      deprecated
     DESCRIPTION 
         "This notification, if the agent is so configured, may be sent when the
          system has detected a material change in physical condition of the
@@ -149,7 +157,7 @@ vmwEnvHardwareEvent NOTIFICATION-TYPE
 vmwESXEnvHardwareEvent NOTIFICATION-TYPE
     OBJECTS     { vmwSubsystemType, vmwHardwareStatus, 
                   vmwEventDescription, vmwEnvHardwareTime }
-    STATUS      current
+    STATUS      deprecated
     DESCRIPTION 
         "ESX Specific version of this notification, 
          if the agent is so configured, may be sent when 
@@ -158,6 +166,327 @@ vmwESXEnvHardwareEvent NOTIFICATION-TYPE
     ::= { vmwESXNotifications 301 }
 
 
+-- SNMP notifications based on indications reported by ESX CIM subsystem
+
+vmwEnvSource OBJECT-TYPE
+    SYNTAX      INTEGER {unknown(1), sensors(2), indications(3) }
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION 
+        "The source being used to obtain hardware state."
+    ::= { vmwEnv 100 }
+
+vmwEnvInIndications OBJECT-TYPE
+    SYNTAX      Counter32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION 
+        "Number of HTTP POST msgs containing CIM Indications in XML as received by agent."
+    ::= { vmwEnv 101 }
+
+vmwEnvLastIn OBJECT-TYPE
+    SYNTAX      TimeTicks
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION 
+        "sysUptime when agent last received an indication."
+    ::= { vmwEnv 102 }
+
+vmwEnvOutNotifications OBJECT-TYPE
+    SYNTAX      Counter32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION 
+        "Number of notifications (traps|informs) sent that originated as CIM indication."
+    ::= { vmwEnv 103 }
+
+vmwEnvInErrs OBJECT-TYPE
+    SYNTAX      Counter32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION 
+        "Number of CIM Indications that agent did not complete receipt of."
+    ::= { vmwEnv 104 }
+
+vmwEnvIndOidErrs OBJECT-TYPE
+    SYNTAX      Counter32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION 
+        "Number of CIM Indications having a MappingString qualifier for which the value was not a valid oid."
+    ::= { vmwEnv 105 }
+
+vmwEnvCvtValueErrs OBJECT-TYPE
+    SYNTAX      Counter32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION 
+        "Number of CIM Indication properties having a MappingString qualifier
+        for which the cim value for the given cim type could not be converted."
+    ::= { vmwEnv 106 }
+
+vmwEnvCvtSyntaxErrs OBJECT-TYPE
+    SYNTAX      Counter32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION 
+        "Number of CIM Indication properties having a MappingString qualifier
+        for which the cim type could not be converted to smi syntax."
+    ::= { vmwEnv 107 }
+
+vmwEnvCvtOidErrs OBJECT-TYPE
+    SYNTAX      Counter32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION 
+        "Number of CIM Indication properties having a MappingString qualifier
+        for which the the oid was not valid."
+    ::= { vmwEnv 108 }
+
+vmwEnvGetClassErrs OBJECT-TYPE
+    SYNTAX      Counter32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION 
+        "Number of CIM GetClass operations over a given cim indication class and namespace
+        could not be completed (timeout) or returned error."
+    ::= { vmwEnv 109 }
+
+vmwEnvPropertySkips OBJECT-TYPE
+    SYNTAX      Counter32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION 
+        "Number of CIM indications having properties which do not have MappingString qualifier
+         in the class definition and were not converted, sent along with the notification."
+    ::= { vmwEnv 110 }
+
+vmwEnvIndicationSkips OBJECT-TYPE
+    SYNTAX      Counter32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION 
+        "Number of CIM indications recieved for which GetClass reported no MappingStrings qualifier
+        and were not converted to a notification."
+    ::= { vmwEnv 111 }
+
+vmwEnvCIM OBJECT IDENTIFIER
+    ::= { vmwProductSpecific 30 }
+
+vmwEnvDescription OBJECT-TYPE
+
+    SYNTAX     VmwLongSnmpAdminString
+    MAX-ACCESS accessible-for-notify
+    STATUS     current
+    DESCRIPTION
+      "A short description of the Indication." 
+    REFERENCE
+      "http://www.dmtf.org/standards/cim/cim_schema_v2240 : file CIM_AlertIndication.mof : property Description"
+    ::= { vmwEnvCIM 1 }
+
+vmwEnvEventTime OBJECT-TYPE
+    SYNTAX     DateAndTime
+    MAX-ACCESS accessible-for-notify
+    STATUS     current
+    DESCRIPTION
+      "The time and date the underlying event was first 
+       detected. May be set to the time the SNMP agent recieved the notification 
+       if in the incoming CIM indication the value is
+       NULL due to the creating entity not being capable of providing 
+       this information. This value is based on the notion of
+       local date and time of the Managed System Element
+       generating the Indication."
+    REFERENCE
+      "http://www.dmtf.org/standards/cim/cim_schema_v2240 : file CIM_AlertIndication.mof : property EventTime"
+    ::= { vmwEnvCIM 2 }
+
+vmwEnvIndicationTime OBJECT-TYPE
+    SYNTAX     DateAndTime
+    MAX-ACCESS accessible-for-notify
+    STATUS     current
+    DESCRIPTION
+      "The time and date of creation of the underlying Indication received by the snmp agent. The
+       property may be set to the time SNMP agent received the notification if the entity creating the
+       Indication is not capable of determining this
+       information and delivers a null IndicationTime property. Note that IndicationTime may be the same
+       for two Indications that are generated in rapid succession."
+    REFERENCE
+      "http://www.dmtf.org/standards/cim/cim_schema_v2240 : file CIM_AlertIndication.mof : property IndicationTime"
+    ::= { vmwEnvCIM 3 }
+
+vmwEnvPerceivedSeverity OBJECT-TYPE
+    SYNTAX     VmwCIMSeverity
+    MAX-ACCESS accessible-for-notify
+    STATUS     current
+    DESCRIPTION
+      "An enumerated value that describes the severity of the 
+       Alert Indication from the notifier's point of view."
+    REFERENCE
+      "http://www.dmtf.org/standards/cim/cim_schema_v2240 : file CIM_AlertIndication.mof : property PerceivedSeverity"
+    ::= { vmwEnvCIM 4 }
+
+vmwEnvAlertType OBJECT-TYPE
+    SYNTAX     VmwCIMAlertTypes
+    MAX-ACCESS accessible-for-notify
+    STATUS     current
+    DESCRIPTION
+      "Primary classification of the Indication."
+    REFERENCE
+      "http://www.dmtf.org/standards/cim/cim_schema_v2240 : file CIM_AlertIndication.mof : property AlertType"
+    ::= { vmwEnvCIM 5 }
+
+vmwEnvSysCreationClassName OBJECT-TYPE
+    SYNTAX     VmwCimName
+    MAX-ACCESS accessible-for-notify
+    STATUS     current
+    DESCRIPTION
+      "The scoping System's CreationClassName for the Provider 
+       generating this Indication."
+    REFERENCE
+      "http://www.dmtf.org/standards/cim/cim_schema_v2240 : file CIM_AlertIndication.mof : property SystemCreationClassName"
+    ::= { vmwEnvCIM 6 }
+
+vmwEnvAlertingElement OBJECT-TYPE
+    SYNTAX     VmwCimName
+    MAX-ACCESS accessible-for-notify
+    STATUS     current
+    DESCRIPTION
+      "The identifying information of the entity (ie, the
+       instance) for which this notification is generated. The
+       property contains the CIM path of an CIM object instance, 
+       encoded as a string parameter - if the instance is modeled in the CIM
+       Schema. If not a CIM instance, the property contains
+       some identifying string that names the entity for which
+       the Alert is generated. The path or identifying string
+       is formatted per the AlertingElementFormat property."
+    REFERENCE
+      "http://www.dmtf.org/standards/cim/cim_schema_v2240 : file CIM_AlertIndication.mof : property AlertingManagedElement"
+    ::= { vmwEnvCIM 7 }
+
+vmwEnvAlertingFormat OBJECT-TYPE
+    SYNTAX     VmwCIMAlertFormat
+    MAX-ACCESS accessible-for-notify
+    STATUS     current
+    DESCRIPTION
+      "The format of the AlertingManagedElement property is
+       interpretable based upon the value of this property."
+    REFERENCE
+      "http://www.dmtf.org/standards/cim/cim_schema_v2240 : file CIM_AlertIndication.mof : property AlertingElementFormat"
+    ::= { vmwEnvCIM 8 }
+
+vmwEnvSystemName OBJECT-TYPE
+    SYNTAX     VmwCimName
+    MAX-ACCESS accessible-for-notify
+    STATUS     current
+    DESCRIPTION
+     "The scoping System's Name for the Provider generating this message."
+    REFERENCE
+      "http://www.dmtf.org/standards/cim/cim_schema_v2240 : file CIM_AlertIndication.mof : property SystemName"
+    ::= { vmwEnvCIM 9 }
+
+vmwEnvProviderName OBJECT-TYPE
+    SYNTAX     VmwCimName
+    MAX-ACCESS accessible-for-notify
+    STATUS     current
+    DESCRIPTION
+      "The name of the CIM provider, a software module loaded into the CIM subsystem, generating this message."
+    REFERENCE
+      "http://www.dmtf.org/standards/cim/cim_schema_v2240 : file CIM_AlertIndication.mof : property ProviderName"
+    ::= { vmwEnvCIM 10 }
+
+
+vmwESXEnvHardwareAlert NOTIFICATION-TYPE
+    OBJECTS     {vmwEnvDescription, vmwEnvEventTime, vmwEnvIndicationTime, vmwEnvPerceivedSeverity,
+                 vmwEnvAlertType, vmwEnvSysCreationClassName, vmwEnvAlertingElement, vmwEnvAlertingFormat,
+                 vmwEnvSystemName, vmwEnvProviderName }
+    STATUS      current
+    DESCRIPTION 
+        "A hardware alert as received from the Common Infrastructure Management (CIM) subsystem on this system."
+    REFERENCE  "http://www.dmtf.org/standards/cim/cim_schema_v2240 : file CIM_AlertIndication.mof"
+    ::= { vmwESXNotifications 302 }
+
+vmwESXEnvBatteryAlert NOTIFICATION-TYPE
+    OBJECTS     {vmwEnvDescription, vmwEnvEventTime, vmwEnvIndicationTime, vmwEnvPerceivedSeverity,
+                 vmwEnvAlertType, vmwEnvSysCreationClassName, vmwEnvAlertingElement, vmwEnvAlertingFormat,
+                 vmwEnvSystemName, vmwEnvProviderName }
+    STATUS      current
+    DESCRIPTION 
+        "A battery alert as received from the Common Infrastructure Management (CIM) subsystem on this system."
+    REFERENCE  "http://www.dmtf.org/standards/cim/cim_schema_v2240 : file CIM_AlertIndication.mof"
+    ::= { vmwESXNotifications 303 }
+
+vmwESXEnvChassisAlert NOTIFICATION-TYPE
+    OBJECTS     {vmwEnvDescription, vmwEnvEventTime, vmwEnvIndicationTime, vmwEnvPerceivedSeverity,
+                 vmwEnvAlertType, vmwEnvSysCreationClassName, vmwEnvAlertingElement, vmwEnvAlertingFormat,
+                 vmwEnvSystemName, vmwEnvProviderName }
+    STATUS      current
+    DESCRIPTION 
+        "A chassis alert as received from the Common Infrastructure Management (CIM) subsystem on this system."
+    REFERENCE  "http://www.dmtf.org/standards/cim/cim_schema_v2240 : file CIM_AlertIndication.mof"
+    ::= { vmwESXNotifications 304 }
+
+
+vmwESXEnvThermalAlert NOTIFICATION-TYPE
+    OBJECTS     {vmwEnvDescription, vmwEnvEventTime, vmwEnvIndicationTime, vmwEnvPerceivedSeverity,
+                 vmwEnvAlertType, vmwEnvSysCreationClassName, vmwEnvAlertingElement, vmwEnvAlertingFormat,
+                 vmwEnvSystemName, vmwEnvProviderName }
+    STATUS      current
+    DESCRIPTION 
+        "A cooling/thermal alert as received from the Common Infrastructure Management (CIM) subsystem on this system."
+    REFERENCE  "http://www.dmtf.org/standards/cim/cim_schema_v2240 : file CIM_AlertIndication.mof"
+    ::= { vmwESXNotifications 305 }
+
+vmwESXEnvDiskAlert NOTIFICATION-TYPE
+    OBJECTS     {vmwEnvDescription, vmwEnvEventTime, vmwEnvIndicationTime, vmwEnvPerceivedSeverity,
+                 vmwEnvAlertType, vmwEnvSysCreationClassName, vmwEnvAlertingElement, vmwEnvAlertingFormat,
+                 vmwEnvSystemName, vmwEnvProviderName }
+    STATUS      current
+    DESCRIPTION 
+        "A disk drive alert as received from the Common Infrastructure Management (CIM) subsystem on this system."
+    REFERENCE  "http://www.dmtf.org/standards/cim/cim_schema_v2240 : file CIM_AlertIndication.mof"
+    ::= { vmwESXNotifications 306 }
+
+vmwESXEnvPowerAlert NOTIFICATION-TYPE
+    OBJECTS     {vmwEnvDescription, vmwEnvEventTime, vmwEnvIndicationTime, vmwEnvPerceivedSeverity,
+                 vmwEnvAlertType, vmwEnvSysCreationClassName, vmwEnvAlertingElement, vmwEnvAlertingFormat,
+                 vmwEnvSystemName, vmwEnvProviderName }
+    STATUS      current
+    DESCRIPTION 
+        "A power suppply alert as received from the Common Infrastructure Management (CIM) subsystem on this system."
+    REFERENCE  "http://www.dmtf.org/standards/cim/cim_schema_v2240 : file CIM_AlertIndication.mof"
+    ::= { vmwESXNotifications 307 }
+
+vmwESXEnvProcessorAlert NOTIFICATION-TYPE
+    OBJECTS     {vmwEnvDescription, vmwEnvEventTime, vmwEnvIndicationTime, vmwEnvPerceivedSeverity,
+                 vmwEnvAlertType, vmwEnvSysCreationClassName, vmwEnvAlertingElement, vmwEnvAlertingFormat,
+                 vmwEnvSystemName, vmwEnvProviderName }
+    STATUS      current
+    DESCRIPTION 
+        "A IPMI processor alert as received from the Common Infrastructure Management (CIM) subsystem on this system."
+    REFERENCE  "http://www.dmtf.org/standards/cim/cim_schema_v2240 : file CIM_AlertIndication.mof"
+    ::= { vmwESXNotifications 308 }
+
+vmwESXEnvMemoryAlert NOTIFICATION-TYPE
+    OBJECTS     {vmwEnvDescription, vmwEnvEventTime, vmwEnvIndicationTime, vmwEnvPerceivedSeverity,
+                 vmwEnvAlertType, vmwEnvSysCreationClassName, vmwEnvAlertingElement, vmwEnvAlertingFormat,
+                 vmwEnvSystemName, vmwEnvProviderName }
+    STATUS      current
+    DESCRIPTION 
+        "A IPMI memory alert as received from the Common Infrastructure Management (CIM) subsystem on this system."
+    REFERENCE  "http://www.dmtf.org/standards/cim/cim_schema_v2240 : file CIM_AlertIndication.mof"
+    ::= { vmwESXNotifications 309 }
+
+
+vmwESXEnvBIOSAlert NOTIFICATION-TYPE
+    OBJECTS     {vmwEnvDescription, vmwEnvEventTime, vmwEnvIndicationTime, vmwEnvPerceivedSeverity,
+                 vmwEnvAlertType, vmwEnvSysCreationClassName, vmwEnvAlertingElement, vmwEnvAlertingFormat,
+                 vmwEnvSystemName, vmwEnvProviderName }
+    STATUS      current
+    DESCRIPTION 
+        "BIOS System Event Log alert as received from the Common Infrastructure Management (CIM) subsystem on this system."
+    REFERENCE  "http://www.dmtf.org/standards/cim/cim_schema_v2240 : file CIM_AlertIndication.mof"
+    ::= { vmwESXNotifications 310 }
+
 -- conformance information
 vmwEnvironmentalMIBConformance
 OBJECT IDENTIFIER ::= { vmwEnvironmentalMIB 2 }
@@ -167,11 +496,23 @@ vmwEnvMIBGroups  OBJECT IDENTIFIER ::= { vmwEnvironmentalMIBConformance 2 }
 
 -- compliance statements
 
-vmwEnvMIBBasicCompliance2 MODULE-COMPLIANCE
+vmwEnvMIBBasicCompliance3 MODULE-COMPLIANCE
 STATUS  current
 DESCRIPTION
     "The compliance statement for entities which implement the 
-    VMWARE-RESOURCE-MIB."
+    VMWARE-ENV-MIB."
+MODULE  -- this module
+MANDATORY-GROUPS { vmwEnvAlertGroup, vmwESXEnvNotificationGroup2 }
+GROUP  vmwESXEnvNotificationGroup2
+DESCRIPTION
+    "This group is mandatory for ESX based systems agents."
+::= { vmwEnvironmentMIBCompliances 4 }
+
+vmwEnvMIBBasicCompliance2 MODULE-COMPLIANCE
+STATUS  deprecated
+DESCRIPTION
+    "The compliance statement for entities which implement the 
+    VMWARE-ENV-MIB."
 MODULE  -- this module
 MANDATORY-GROUPS { vmwEnvironmentGroup }
 
@@ -189,12 +530,42 @@ vmwEnvMIBBasicCompliance MODULE-COMPLIANCE
 STATUS  obsolete
 DESCRIPTION
     "The compliance statement for entities which implement the 
-    VMWARE-RESOURCE-MIB."
+    VMWARE-ENV-MIB."
 MODULE  -- this module
 MANDATORY-GROUPS { vmwEnvironmentGroup, vmwEnvNotificationGroup }
 ::= { vmwEnvironmentMIBCompliances 2 }
 
 
+vmwEnvAlertGroup OBJECT-GROUP
+    OBJECTS {
+    vmwEnvSource,
+    vmwEnvInIndications,
+    vmwEnvLastIn,
+    vmwEnvOutNotifications,
+    vmwEnvInErrs,
+    vmwEnvIndOidErrs,
+    vmwEnvCvtValueErrs,
+    vmwEnvCvtSyntaxErrs,
+    vmwEnvCvtOidErrs,
+    vmwEnvGetClassErrs,
+    vmwEnvPropertySkips,
+    vmwEnvIndicationSkips,
+    vmwEnvDescription,
+    vmwEnvEventTime,
+    vmwEnvIndicationTime,
+    vmwEnvPerceivedSeverity,
+    vmwEnvAlertType,
+    vmwEnvSysCreationClassName,
+    vmwEnvAlertingElement,
+    vmwEnvAlertingFormat,
+    vmwEnvSystemName,
+    vmwEnvProviderName
+    } 
+    STATUS current
+    DESCRIPTION
+        "These objects provide physical hardware environmental details as reported by CIM subsystem."
+    ::= { vmwEnvMIBGroups 5 }
+
 vmwEnvironmentGroup OBJECT-GROUP
     OBJECTS { 
     vmwEnvNumber,
@@ -204,7 +575,7 @@ vmwEnvironmentGroup OBJECT-GROUP
     vmwEventDescription,
     vmwEnvHardwareTime
     }
-    STATUS  current
+    STATUS  deprecated
     DESCRIPTION
         "These objects provide physical hardware environmental details."
     ::= { vmwEnvMIBGroups 1 }
@@ -213,7 +584,7 @@ vmwEnvNotificationGroup NOTIFICATION-GROUP
        NOTIFICATIONS {
        vmwEnvHardwareEvent
        }
-       STATUS      current
+       STATUS      deprecated
        DESCRIPTION
            "Notifications related to physical subsystems."
        ::= { vmwEnvMIBGroups 2 }
@@ -222,10 +593,28 @@ vmwESXEnvNotificationGroup NOTIFICATION-GROUP
        NOTIFICATIONS {
        vmwESXEnvHardwareEvent
        }
-       STATUS      current
+       STATUS      deprecated
        DESCRIPTION
            "ESX System specific notifications about physical subsystems."
        ::= { vmwEnvMIBGroups 3 }
 
+vmwESXEnvNotificationGroup2 NOTIFICATION-GROUP
+       NOTIFICATIONS {
+       vmwESXEnvHardwareAlert,
+       vmwESXEnvBatteryAlert,
+       vmwESXEnvChassisAlert,
+       vmwESXEnvThermalAlert,
+       vmwESXEnvDiskAlert,
+       vmwESXEnvPowerAlert,
+       vmwESXEnvProcessorAlert,
+       vmwESXEnvMemoryAlert,
+       vmwESXEnvBIOSAlert
+       }
+       STATUS      current
+       DESCRIPTION
+           "ESX System specific notifications about physical subsystems."
+       ::= { vmwEnvMIBGroups 4 }
+
 
 END -- end of module VMWARE-ENV-MIB.
+

mibs/vmware/VMWARE-OBSOLETE-MIB.mib

@@ -576,3 +576,4 @@ vmwOldVCNotificationGroup NOTIFICATION-GROUP
        ::= { vmwObsMIBGroups 3 }  
 
 END
+

mibs/vmware/VMWARE-PRODUCTS-MIB.mib

@@ -1,5 +1,5 @@
 -- **********************************************************
--- Copyright 2007 VMware, Inc.  All rights reserved. 
+-- Copyright 2007-2015 VMware, Inc.  All rights reserved. 
 -- **********************************************************
 
 VMWARE-PRODUCTS-MIB DEFINITIONS ::= BEGIN
@@ -7,11 +7,11 @@ VMWARE-PRODUCTS-MIB DEFINITIONS ::= BEGIN
 IMPORTS
    MODULE-IDENTITY
         FROM SNMPv2-SMI
-    vmwOID, vmwProductSpecific
+   vmwOID, vmwProductSpecific
         FROM VMWARE-ROOT-MIB;
 
 vmwProducts MODULE-IDENTITY
-       LAST-UPDATED "200707300000Z"
+       LAST-UPDATED "201409190000Z"
        ORGANIZATION "VMware, Inc"
        CONTACT-INFO
                "VMware, Inc
@@ -26,6 +26,12 @@ vmwProducts MODULE-IDENTITY
                 which are returned from SNMPv2-MIB sysObjectId for 
                 agents in specific VMware products.
                "
+       REVISION      "201409190000Z"
+       DESCRIPTION
+               "Add vSphere appliance sysObjectIds."
+       REVISION      "201109290000Z"
+       DESCRIPTION
+               "Add vmwVCOps snmp agent's sysObjectId value."
        REVISION      "200707300000Z"
        DESCRIPTION
                "The initial revision."
@@ -43,7 +49,23 @@ vmwVC OBJECT IDENTIFIER
 vmwServer OBJECT IDENTIFIER
     ::= { vmwProductSpecific 4 }
 
+vmwVCOps OBJECT IDENTIFIER
+    ::= { vmwProductSpecific 5 }
+
+vmwGenericAppliance OBJECT IDENTIFIER
+    ::= { vmwProductSpecific 6 }
+
+vmwEmbeddedVirtualCenterAppliance OBJECT IDENTIFIER
+    ::= { vmwProductSpecific 7 }
+
+vmwInfrastructureAppliance OBJECT IDENTIFIER
+    ::= { vmwProductSpecific 8 }
+
+vmwManagementAppliance OBJECT IDENTIFIER
+    ::= { vmwProductSpecific 9 }
+
 oidESX OBJECT IDENTIFIER
     ::= { vmwOID 1 }
 
 END -- end of module VMWARE-PRODUCTS-MIB.
+

mibs/vmware/VMWARE-RESOURCES-MIB.mib

@@ -1,5 +1,5 @@
 -- **********************************************************
--- Copyright 2007-20009 VMware, Inc.  All rights reserved. 
+-- Copyright 2007-2011 VMware, Inc.  All rights reserved. 
 -- **********************************************************
 
 VMWARE-RESOURCES-MIB DEFINITIONS ::= BEGIN
@@ -267,3 +267,4 @@ vmwResourceGroup OBJECT-GROUP
 
 
 END
+

mibs/vmware/VMWARE-ROOT-MIB.mib

@@ -1,5 +1,5 @@
 -- **********************************************************
--- Copyright 2007 VMware, Inc.  All rights reserved. 
+-- Copyright 2007-2010 VMware, Inc.  All rights reserved. 
 -- **********************************************************
 
 VMWARE-ROOT-MIB DEFINITIONS ::= BEGIN
@@ -9,7 +9,7 @@ IMPORTS
         FROM SNMPv2-SMI;
 
 vmware MODULE-IDENTITY
-       LAST-UPDATED "200707300000Z"
+       LAST-UPDATED "201004020000Z"
        ORGANIZATION "VMware, Inc"
        CONTACT-INFO
                "VMware, Inc
@@ -24,6 +24,11 @@ vmware MODULE-IDENTITY
                 This module defines the VMware SNMP MIB root
                 and its primary subtrees.
                "
+
+       REVISION      "201004020000Z"
+       DESCRIPTION
+               "Arc vmwDocumentation defined."
+
        REVISION      "200707300000Z"
        DESCRIPTION
                "The initial revision. Prior version was released in 
@@ -76,6 +81,13 @@ DESCRIPTION
      notifications varbind lists and can not be polled."
 ::= { vmware 50 }
 
+vmwSRM OBJECT-IDENTITY
+STATUS  current
+DESCRIPTION
+    "Managed objects defined under this node are only visible in
+     notifications from Site Recovery Manager and can not be polled."
+::= { vmware 51 }
+
 vmwOID OBJECT-IDENTITY
 STATUS  deprecated
 DESCRIPTION
@@ -94,6 +106,12 @@ DESCRIPTION
     "Used for product testing and development."
 ::= { vmware 700 }
 
+vmwDocumentation OBJECT-IDENTITY
+STATUS  current
+DESCRIPTION
+    "Used in product documentation, examples." 
+::= { vmware 750 }
+
 vmwObsolete OBJECT-IDENTITY
 STATUS  current
 DESCRIPTION
@@ -101,3 +119,4 @@ DESCRIPTION
 ::= { vmware 800 }
 
 END
+

mibs/vmware/VMWARE-SRM-EVENT-MIB.mib

@@ -0,0 +1,300 @@
+-- **********************************************************
+-- Copyright 2012 VMware, Inc.  All rights reserved.
+-- **********************************************************
+
+VMWARE-SRM-EVENT-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+    MODULE-IDENTITY, OBJECT-TYPE, NOTIFICATION-TYPE
+        FROM SNMPv2-SMI
+    MODULE-COMPLIANCE, OBJECT-GROUP, NOTIFICATION-GROUP
+        FROM SNMPv2-CONF
+    vmwSRM
+       FROM VMWARE-ROOT-MIB       
+    DisplayString
+        FROM SNMPv2-TC;
+
+    vmwSRMMIB MODULE-IDENTITY
+    LAST-UPDATED "201202070000Z"
+    ORGANIZATION "VMware, Inc"
+    CONTACT-INFO
+    "VMware, Inc
+    3401 Hillview Ave
+    Palo Alto, CA 94304
+    Tel: 1-877-486-9273 or 650-427-5000
+    Fax: 650-427-5001
+    Web: http://communities.vmware.com/community/developer/forums/managementapi
+    "
+DESCRIPTION
+     "This MIB module identifies Site Recovery Maager notifications (traps or inform)."
+
+REVISION      "201202070000Z"
+DESCRIPTION
+    "This is the first revision in SMIv2 format. Prior version was published as SMIv1.
+     Notifications were formerly in the VMWARE-SRM-TRAPS-1-0.MIB."
+::= { vmwSRM 10 }
+
+vmwSrmNotification OBJECT IDENTIFIER ::= { vmwSRM 1 }
+
+vmwSRMevents OBJECT IDENTIFIER ::= {vmwSRM 0 }
+
+vmwSrmVmName OBJECT-TYPE
+    SYNTAX      DisplayString
+    MAX-ACCESS  accessible-for-notify
+    STATUS      current
+    DESCRIPTION 
+        "This is the name of the affected VM generating the trap."
+    ::= { vmwSrmNotification 1 }
+
+vmwSrmRecoveryName OBJECT-TYPE
+    SYNTAX      DisplayString
+    MAX-ACCESS  accessible-for-notify
+    STATUS      current
+    DESCRIPTION 
+        "This is the name of the Recovery Plan generating the trap."
+    ::= { vmwSrmNotification 2 }
+
+vmwSrmPromptString OBJECT-TYPE
+    SYNTAX      DisplayString
+    MAX-ACCESS  accessible-for-notify
+    STATUS      current
+    DESCRIPTION 
+        "This is the text of the prompt generating the trap."
+    ::= { vmwSrmNotification 3 }
+
+vmwSrmRecoveryType OBJECT-TYPE
+    SYNTAX      INTEGER { test(1), recovery(2), reprotect(3), cleanup(4) }
+    MAX-ACCESS  accessible-for-notify
+    STATUS      current
+    DESCRIPTION 
+        "This is the mode of execution for the the Recovery Plan."
+    ::= { vmwSrmNotification 4 }
+
+vmwSrmRecoveryState OBJECT-TYPE
+    SYNTAX      INTEGER { uninitialized(1), running(2), paused(3), 
+                    cancelled(4), completed(5) }
+    MAX-ACCESS  accessible-for-notify
+    STATUS      current
+    DESCRIPTION 
+        "This is the state of execution for the the Recovery Plan."
+    ::= { vmwSrmNotification 5 }
+
+vmwSrmSiteString OBJECT-TYPE
+    SYNTAX      DisplayString
+    MAX-ACCESS  accessible-for-notify
+    STATUS      current
+    DESCRIPTION 
+        "This is the name of the DR site that is causing the trap."
+    ::= { vmwSrmNotification 6 }
+
+vmwSrmVmUuid OBJECT-TYPE
+    SYNTAX      DisplayString
+    MAX-ACCESS  accessible-for-notify
+    STATUS      current
+    DESCRIPTION 
+        "This is the UUID of the affected VM generating the trap."
+    ::= { vmwSrmNotification 7 }
+
+vmwSrmResult OBJECT-TYPE
+    SYNTAX      INTEGER { success(1), failure(2), warning(3), 
+                    cancelled(4) }
+    MAX-ACCESS  accessible-for-notify
+    STATUS      current
+    DESCRIPTION 
+        "This is the result of running a Recovery Plan."
+    ::= { vmwSrmNotification 8 }
+
+vmwSrmCommandName OBJECT-TYPE
+    SYNTAX      DisplayString
+    MAX-ACCESS  accessible-for-notify
+    STATUS      current
+    DESCRIPTION 
+        "This is the name of a callout command executed during Recovery Plan execution."
+    ::= { vmwSrmNotification 9 }
+
+vmwareSrmRecoveryPlanExecuteTestBeginTrap NOTIFICATION-TYPE
+    OBJECTS     { vmwSrmSiteString, vmwSrmRecoveryName, vmwSrmRecoveryType, 
+                  vmwSrmRecoveryState }
+    STATUS      current
+    DESCRIPTION 
+        "This trap is sent when a Recovery Plan starts a test."
+    ::= { vmwSRMevents 1 }
+
+vmwareSrmRecoveryPlanExecuteTestEndEvent NOTIFICATION-TYPE
+    OBJECTS     { vmwSrmSiteString, vmwSrmRecoveryName, vmwSrmRecoveryType, 
+                  vmwSrmRecoveryState, vmwSrmResult }
+    STATUS      current
+    DESCRIPTION 
+        "This trap is sent when a Recovery Plan ends a test."
+    ::= { vmwSRMevents 2 }
+
+vmwareSrmRecoveryPlanExecuteBeginEvent NOTIFICATION-TYPE
+    OBJECTS     { vmwSrmSiteString, vmwSrmRecoveryName, vmwSrmRecoveryType, 
+                  vmwSrmRecoveryState }
+    STATUS      current
+    DESCRIPTION 
+        "This trap is sent when a Recovery Plan starts a recovery."
+    ::= { vmwSRMevents 3 }
+
+vmwareVmwSrmRecoveryPlanExecuteEndEvent NOTIFICATION-TYPE
+    OBJECTS     { vmwSrmSiteString, vmwSrmRecoveryName, vmwSrmRecoveryType, 
+                  vmwSrmRecoveryState, vmwSrmResult }
+    STATUS      current
+    DESCRIPTION 
+        "This trap is sent when a Recovery Plan ends a recovery."
+    ::= { vmwSRMevents 4 }
+
+vmwareVmwSrmRecoveryVmBeginEvent NOTIFICATION-TYPE
+    OBJECTS     { vmwSrmSiteString, vmwSrmRecoveryName, vmwSrmRecoveryType, 
+                  vmwSrmRecoveryState, vmwSrmVmName, vmwSrmVmUuid }
+    STATUS      current
+    DESCRIPTION 
+        "This trap is sent when a Recovery Plan starts recovering a VM."
+    ::= { vmwSRMevents 5 }
+
+vmwareSrmRecoveryVmEndEvent NOTIFICATION-TYPE
+    OBJECTS     { vmwSrmSiteString, vmwSrmRecoveryName, vmwSrmRecoveryType, 
+                  vmwSrmRecoveryState, vmwSrmVmName, vmwSrmVmUuid, vmwSrmResult }
+    STATUS      current
+    DESCRIPTION 
+        "This trap is sent when a Recovery Plan has finished recovering a VM."
+    ::= { vmwSRMevents 6 }
+
+vmwareSrmRecoveryPlanPromptDisplay NOTIFICATION-TYPE
+    OBJECTS     { vmwSrmSiteString, vmwSrmRecoveryName, vmwSrmRecoveryType, 
+                  vmwSrmRecoveryState, vmwSrmPromptString }
+    STATUS      current
+    DESCRIPTION 
+        "This trap is sent when a Recovery Plan requires user input before continuing."
+    ::= { vmwSRMevents 7 }
+
+vmwareSrmRecoveryPlanPromptResponse NOTIFICATION-TYPE
+    OBJECTS     { vmwSrmSiteString, vmwSrmRecoveryName, vmwSrmRecoveryType, 
+                  vmwSrmRecoveryState }
+    STATUS      current
+    DESCRIPTION 
+        "This trap is sent when a Recovery Plan no longer requires user input before continuing."
+    ::= { vmwSRMevents 8 }
+
+vmwareVmwSrmRecoveryPlanServerCommandBegin NOTIFICATION-TYPE
+    OBJECTS     { vmwSrmSiteString, vmwSrmRecoveryName, vmwSrmRecoveryType, 
+                  vmwSrmRecoveryState, vmwSrmCommandName }
+    STATUS      current
+    DESCRIPTION 
+        "This trap is sent when a Recovery Plan starts the execution of a command callout on SRM server's machine."
+    ::= { vmwSRMevents 9 }
+
+vmwareSrmRecoveryPlanServerCommandEnd NOTIFICATION-TYPE
+    OBJECTS     { vmwSrmSiteString, vmwSrmRecoveryName, vmwSrmRecoveryType, 
+                  vmwSrmRecoveryState, vmwSrmCommandName, vmwSrmResult }
+    STATUS      current
+    DESCRIPTION 
+        "This trap is sent when a Recovery Plan has finished the execution of a command callout on SRM server's machine."
+    ::= { vmwSRMevents 10 }
+
+vmwareSrmRecoveryPlanVmCommandBegin NOTIFICATION-TYPE
+    OBJECTS     { vmwSrmSiteString, vmwSrmRecoveryName, vmwSrmRecoveryType, 
+                  vmwSrmRecoveryState, vmwSrmCommandName, vmwSrmVmName, vmwSrmVmUuid }
+    STATUS      current
+    DESCRIPTION 
+        "This trap is sent when a Recovery Plan starts the execution of a command callout on a recovered VM."
+    ::= { vmwSRMevents 11 }
+
+vmwareSrmRecoveryPlanVmCommandEnd NOTIFICATION-TYPE
+    OBJECTS     { vmwSrmSiteString, vmwSrmRecoveryName, vmwSrmRecoveryType, 
+                  vmwSrmRecoveryState, vmwSrmCommandName, vmwSrmVmName, vmwSrmVmUuid, 
+                  vmwSrmResult }
+    STATUS      current
+    DESCRIPTION 
+        "This trap is sent when a Recovery Plan has finished the execution of a command callout on a recovered VM."
+    ::= { vmwSRMevents 12 }
+
+vmwareSrmRecoveryPlanExecuteReprotectBegin NOTIFICATION-TYPE
+    OBJECTS     { vmwSrmSiteString, vmwSrmRecoveryName, vmwSrmRecoveryType, 
+                  vmwSrmRecoveryState }
+    STATUS      current
+    DESCRIPTION 
+        "This trap is sent when SRM starts the reprotect workflow for a Recovery Plan."
+    ::= { vmwSRMevents 13 }
+
+vmwareSrmRecoveryPlanExecuteReprotectEnd NOTIFICATION-TYPE
+    OBJECTS     { vmwSrmSiteString, vmwSrmRecoveryName, vmwSrmRecoveryType, 
+                  vmwSrmRecoveryState, vmwSrmResult }
+    STATUS      current
+    DESCRIPTION 
+        "This trap is sent when SRM has finished the reprotect workflow for a Recovery Plan."
+    ::= { vmwSRMevents 14 }
+
+vmwareVmwSrmRecoveryPlanExecuteCleanupBegin NOTIFICATION-TYPE
+    OBJECTS     { vmwSrmSiteString, vmwSrmRecoveryName, vmwSrmRecoveryType, 
+                  vmwSrmRecoveryState }
+    STATUS      current
+    DESCRIPTION 
+        "This trap is sent when a Recovery Plan starts a test cleanup."
+    ::= { vmwSRMevents 15 }
+
+vmwSrmRecoveryPlanExecuteCleanupEnd NOTIFICATION-TYPE
+    OBJECTS     { vmwSrmSiteString, vmwSrmRecoveryName, vmwSrmRecoveryType, 
+                  vmwSrmRecoveryState, vmwSrmResult }
+    STATUS      current
+    DESCRIPTION 
+        "This trap is sent a Recovery Plan ends a test cleanup."
+    ::= { vmwSRMevents 16 }
+
+-- conformance information
+vmwSRMMIBConformance OBJECT IDENTIFIER ::= { vmwSRMMIB 2 }
+vmwSRMMIBCompliances OBJECT IDENTIFIER ::= { vmwSRMMIBConformance 1 }
+vmwSRMMIBGroups OBJECT IDENTIFIER ::= { vmwSRMMIBConformance 2 }
+
+-- compliance statements
+vmwSRMMIBBasicCompliance MODULE-COMPLIANCE
+    STATUS     current
+    DESCRIPTION
+        "The compliance statement for entities which implement VMWARE-SRM-EVENT-MIB."
+    MODULE -- this module
+    MANDATORY-GROUPS { vmwSRMNotificationInfoGroup, vmwSRMNotificationGroup }
+    ::= { vmwSRMMIBCompliances 2 }
+
+vmwSRMNotificationInfoGroup OBJECT-GROUP
+    OBJECTS {
+         vmwSrmVmName,
+         vmwSrmRecoveryName,
+         vmwSrmPromptString,
+         vmwSrmRecoveryType,
+         vmwSrmRecoveryState,
+         vmwSrmSiteString,
+         vmwSrmVmUuid,
+         vmwSrmResult,
+         vmwSrmCommandName
+    }
+    STATUS current
+    DESCRIPTION
+	"These objects provide details in SRM notifications."
+    ::= { vmwSRMMIBGroups 1 }
+
+vmwSRMNotificationGroup NOTIFICATION-GROUP
+       NOTIFICATIONS {
+          vmwareSrmRecoveryPlanExecuteTestBeginTrap,
+          vmwareSrmRecoveryPlanExecuteTestEndEvent,
+          vmwareSrmRecoveryPlanExecuteBeginEvent,
+          vmwareVmwSrmRecoveryPlanExecuteEndEvent,
+          vmwareVmwSrmRecoveryVmBeginEvent,
+          vmwareSrmRecoveryVmEndEvent,
+          vmwareSrmRecoveryPlanPromptDisplay,
+          vmwareSrmRecoveryPlanPromptResponse,
+          vmwareVmwSrmRecoveryPlanServerCommandBegin,
+          vmwareSrmRecoveryPlanServerCommandEnd,
+          vmwareSrmRecoveryPlanVmCommandBegin,
+          vmwareSrmRecoveryPlanVmCommandEnd,
+          vmwareSrmRecoveryPlanExecuteReprotectBegin,
+          vmwareSrmRecoveryPlanExecuteReprotectEnd,
+          vmwareVmwSrmRecoveryPlanExecuteCleanupBegin,
+          vmwSrmRecoveryPlanExecuteCleanupEnd
+       }
+       STATUS current
+       DESCRIPTION
+           "Group of objects describing notifications (traps)."
+       ::= { vmwSRMMIBGroups 2 }
+
+END
+

mibs/vmware/VMWARE-SYSTEM-MIB.mib

@@ -1,5 +1,5 @@
 -- **********************************************************
--- Copyright 2007 VMware, Inc.  All rights reserved. 
+-- Copyright 2007-2010 VMware, Inc.  All rights reserved. 
 -- **********************************************************
 
 VMWARE-SYSTEM-MIB DEFINITIONS ::= BEGIN
@@ -15,7 +15,7 @@ VMWARE-SYSTEM-MIB DEFINITIONS ::= BEGIN
    FROM VMWARE-ROOT-MIB;
 
     vmwSystemMIB MODULE-IDENTITY
-    LAST-UPDATED "200801120000Z"
+    LAST-UPDATED "201008020000Z"
     ORGANIZATION "VMware, Inc"
     CONTACT-INFO
     "VMware, Inc
@@ -28,6 +28,10 @@ VMWARE-SYSTEM-MIB DEFINITIONS ::= BEGIN
 DESCRIPTION
     "This MIB module provides for System Software identification"
 
+REVISION      "201008020000Z"
+DESCRIPTION
+    "Add vmwProdPatch managed object to report patch level"
+
 REVISION      "200801120000Z"
 DESCRIPTION
     "Add to comments the Managed Object Browser (MOB) URLs which provide 
@@ -73,6 +77,26 @@ vmwProdBuild OBJECT-TYPE
          https://esx.example.com/mob/?moid=ServiceInstance&doPath=content%2eabout"
     ::= { vmwSystem 4 }
 
+vmwProdUpdate OBJECT-TYPE
+    SYNTAX      DisplayString
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION 
+        "This identifier represents the update level applied to this system.
+         VIM Property: Advanced Options key: Misc.HostAgentUpdateLevel
+         https://esx.example.com/mob/?moid=ha%2dadv%2doptions"
+    ::= { vmwSystem 5 }
+
+vmwProdPatch OBJECT-TYPE
+    SYNTAX      DisplayString
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION 
+        "This identifier represents the patch level applied to this system.
+         VIM Property: None. 
+         CLI: esxcli system version get"
+    ::= { vmwSystem 6 }
+
 -- conformance information
 vmwSystemMIBConformance
 OBJECT IDENTIFIER ::= { vmwSystemMIB 2 }
@@ -94,7 +118,9 @@ vmwSystemGroup OBJECT-GROUP
     OBJECTS { 
     vmwProdName,
     vmwProdVersion,
-    vmwProdBuild
+    vmwProdBuild,
+    vmwProdUpdate,
+    vmwProdPatch
     }
     STATUS  current
     DESCRIPTION

mibs/vmware/VMWARE-TC-MIB.mib

@@ -37,24 +37,52 @@ DESCRIPTION
 VmwSubsystemTypes ::= TEXTUAL-CONVENTION
     STATUS       current
     DESCRIPTION
-            "Define the various subsystems fond on hardware."
+            "Define the various hardware subsystems."
     SYNTAX   INTEGER { unknown(1), chassis(2), powerSupply(3), fan(4), cpu(5),
                        memory(6), battery(7), temperatureSensor(8),
                        raidController(9), voltage(10)
                      }
 
+VmwCIMAlertTypes ::= TEXTUAL-CONVENTION
+    STATUS       current
+    DESCRIPTION
+            "Primary classifications for alert messages."
+    SYNTAX   INTEGER { other(1), communications(2), qos(3), processingError(4),
+                       deviceAlert(5), environmentalAlert(6), modelChange(7),
+                       securityAlert(8)
+                     }
+
+VmwCIMAlertFormat ::= TEXTUAL-CONVENTION
+    STATUS       current
+    DESCRIPTION
+            "Indication of what the Alerting Managed Element property is."
+    SYNTAX  INTEGER { unknown(0), other(1), cimObjectPath(2) }
+
 VmwSubsystemStatus ::= TEXTUAL-CONVENTION
     STATUS       current
     DESCRIPTION
-            "Define the state oof a given subsystem if known."
+            "Define the state of a given subsystem if known."
     SYNTAX  INTEGER { unknown(1), normal(2), marginal(3), critical(4), failed(5) }
 
+VmwCIMSeverity ::= TEXTUAL-CONVENTION
+    STATUS       current
+    DESCRIPTION
+            "Recommendation.ITU|X733.Perceived severity possible values."
+    SYNTAX  INTEGER { unknown(0), other(1), information(2), warning(3), minor(4), major(5), critical(6), fatal(7) }
+
+VmwCimName ::= TEXTUAL-CONVENTION
+    DISPLAY-HINT "256a"
+    STATUS       current
+    DESCRIPTION
+            "Contains a name of no more than 256 characters."
+    SYNTAX  OCTET STRING (SIZE (0..256))
+
 VmwConnectedState ::= TEXTUAL-CONVENTION
     DISPLAY-HINT "7a"
     STATUS       current
     DESCRIPTION
             "Can hold one of the following values: 'true' or 'false' or 'unknown'."
-    SYNTAX  OCTET STRING (SIZE (7))
+    SYNTAX  OCTET STRING (SIZE (4..7))
 
 VmwLongDisplayString ::= TEXTUAL-CONVENTION
     DISPLAY-HINT "1a"
@@ -151,3 +179,4 @@ VmwLongSnmpAdminString ::= TEXTUAL-CONVENTION
     SYNTAX       OCTET STRING
 
 END
+

mibs/vmware/VMWARE-VA-AGENTCAP-MIB

@@ -0,0 +1,247 @@
+-- **********************************************************
+-- Copyright 2008-2015 VMware, Inc.  All rights reserved.
+-- **********************************************************
+
+VMWARE-VA-AGENTCAP-MIB DEFINITIONS ::= BEGIN
+
+IMPORTS
+    MODULE-IDENTITY
+       FROM SNMPv2-SMI
+    vmwareAgentCapabilities
+       FROM VMWARE-ROOT-MIB
+    AGENT-CAPABILITIES
+       FROM  SNMPv2-CONF;
+vmwVAAgentCapabilityMIB MODULE-IDENTITY
+   LAST-UPDATED "201501120000Z"
+   ORGANIZATION "VMware, Inc"
+   CONTACT-INFO
+      "VMware, Inc
+      3401 Hillview Ave
+      Palo Alto, CA 94304
+      Tel: 1-877-486-9273 or 650-427-5000
+      Fax: 650-427-5001
+      Web: http://communities.vmware.com/community/developer/forums/managementapi
+      "
+   DESCRIPTION
+     "This module defines agent capabilities for deployed VMware Virtual Appliance agents by release."
+
+   REVISION     "201501120000Z"
+   DESCRIPTION
+         "Capabilities for VMware Virutal Appliance."
+        ::= { vmwareAgentCapabilities 5 }
+
+vmwVACapability OBJECT IDENTIFIER ::= {  vmwVAAgentCapabilityMIB 1 }
+
+
+--
+-- 2015 Release and follow up patch releases
+--
+
+vmwVA2015x AGENT-CAPABILITIES
+  PRODUCT-RELEASE
+     "6.0.x"
+  STATUS  current
+  DESCRIPTION
+     "Release 2015 aka 6.0 for VMware Virtual Appliance supporting SNMPv1, SNMPv2c, and SNMPv3.
+
+     This agent supports read-only protocol operations, shares same configuration file as VMware ESXi agent.
+     This implies that configuring the SNMPv3 Agent can not be done via SET operations or use SET PDU to
+     discover engine id. Hence IETF standard SNMPv3 agent configuration mibs are not provided.
+     The SNMPv3 protocol is fully supported once configured via the CLI command interface, run
+     applianceh shell using the 'snmp' command set. Lastly this SNMP agent provides one read-only view of
+     the entire system to which all SNMPv3 users configured are assigned.
+
+     This initial release does not have: UDP-MIB, TCP-MIB modules.
+     "
+  REFERENCE
+     "http://www.vmware.com/products"
+
+     -- RFC 3418
+     SUPPORTS SNMPv2-MIB
+     INCLUDES {
+         snmpGroup,
+         systemGroup,
+         snmpCommunityGroup,
+         snmpBasicNotificationsGroup,
+         snmpWarmStartNotificationGroup
+         -- groups not supported; snmpSetGroup, snmpNotificationGroup
+     }
+
+     VARIATION snmpSetSerialNo
+     ACCESS  not-implemented
+     DESCRIPTION "Agent provides read-only view of system information."
+
+     VARIATION snmpTrapOID
+     ACCESS not-implemented
+     DESCRIPTION "Agent does not proxy other agents RFC1157 Trap-PDUs."
+
+     VARIATION  snmpTrapEnterprise
+     ACCESS not-implemented
+     DESCRIPTION "Agent does not proxy other agents RFC1157 Trap-PDUs."
+
+     VARIATION snmpEnableAuthenTraps
+     SYNTAX INTEGER { disabled(2) }
+     ACCESS read-only
+     DESCRIPTION "Agent does not support authentication traps. Poll snmpInBadCommunityNames for same info."
+     -- which implies:
+     -- VARIATION authenticationFailure
+     -- ACCESS not-implemented
+     -- DESCRIPTION "Agent does not provide this notification. snmpEnableAuthenTraps will return disabled."
+
+     -- ********************* ************ ************ *************** ***
+     -- RFC 2863
+     SUPPORTS IF-MIB
+     INCLUDES {
+         ifGeneralInformationGroup,
+         linkUpDownNotificationsGroup
+     }
+
+     VARIATION ifAdminStatus
+     ACCESS read-only
+     DESCRIPTION "Agent provides read-only view of administrative state for each physical interface."
+
+     VARIATION ifLinkUpDownTrapEnable
+     ACCESS read-only
+     DESCRIPTION "Agent provides read-only view of system information."
+
+     VARIATION ifAlias
+     ACCESS read-only
+     DESCRIPTION "ifIndexes may only change across reboot."
+
+     VARIATION ifInUnknownProtos
+     ACCESS not-implemented
+     DESCRIPTION "This counter always returns 0."
+
+     -- ifRcvAddressGroup is interface/media specific
+     VARIATION ifRcvAddressStatus
+     ACCESS not-implemented
+     DESCRIPTION "Required if media specific mib modules are implemented."
+
+     VARIATION ifRcvAddressType
+     ACCESS not-implemented
+     DESCRIPTION "Required if media specific mib modules are implemented."
+
+     -- ********************* ************ ************ *************** ***
+     -- RFC 4293
+     SUPPORTS IP-MIB
+     INCLUDES {
+         ipSystemStatsGroup,
+         ipAddressGroup,
+         ipNetToPhysicalGroup,
+         ipDefaultRouterGroup,
+         icmpStatsGroup,
+         ipSystemStatsHCOctetGroup,
+         ipSystemStatsHCPacketGroup,
+         ipv4GeneralGroup,
+         ipv4IfGroup,
+         ipv4SystemStatsGroup,
+         ipv4SystemStatsHCPacketGroup,
+         ipv6GeneralGroup2,
+         ipv6IfGroup,
+         ipAddressPrefixGroup,
+         ipv6RouterAdvertGroup,
+         ipLastChangeGroup
+     }
+     -- VARIATION ipv6ScopeGroup
+     -- ACCESS  not-implemented
+
+     -- ********************* ************ ************ *************** ***
+     -- RFC 4292
+     -- supports SNMPv2/3 Contexts for multiple instances
+     SUPPORTS IP-FORWARD-MIB
+     INCLUDES {
+         inetForwardCidrRouteGroup
+     }
+
+     -- RFC 2790
+     -- NOTE: For storage larger than Integer32 (Terabyte) this agent will report INT_MAX
+     SUPPORTS HOST-RESOURCES-MIB
+     INCLUDES {
+            hrSystemGroup,
+            hrStorageGroup,
+            hrDeviceGroup,
+            hrSWRunGroup,
+            hrSWRunPerfGroup,
+            hrSWInstalledGroup  -- updates once an hour
+     }
+
+     VARIATION  hrSystemNumUsers
+     ACCESS read-only
+     DESCRIPTION "Value reports number of active appliace shell sessions"
+
+     VARIATION  hrSystemDate
+     ACCESS read-only
+     DESCRIPTION "agent provides read only access"
+
+     VARIATION hrSystemInitialLoadDevice
+     ACCESS read-only
+     DESCRIPTION "agent provides read only access"
+
+     VARIATION hrSystemInitialLoadParameters
+     ACCESS read-only
+     DESCRIPTION "agent provides read only access"
+
+     VARIATION hrStorageSize
+     ACCESS read-only
+     DESCRIPTION "agent provides read only access"
+
+     VARIATION  hrSWRunStatus
+     ACCESS read-only
+     DESCRIPTION "agent provides read only access"
+
+    -- hrDeviceStatus reports unknown for: cpu, nic either running/unknown.
+    --               disk reports running, warning, down, unknown
+    -- device error counters do not account for all failure cases
+
+     VARIATION hrSWOSIndex
+     ACCESS not-implemented
+     DESCRIPTION "No operatingSystem entry exists in hrSWRunGroup hrSWRunTable"
+
+     VARIATION  hrFSLastFullBackupDate
+     ACCESS not-implemented
+     DESCRIPTION "is not implemented"
+
+     VARIATION  hrFSLastPartialBackupDate
+     ACCESS not-implemented
+     DESCRIPTION "is not implemented"
+
+     VARIATION hrPrinterStatus
+     ACCESS not-implemented
+     DESCRIPTION "is not implemented"
+
+     VARIATION hrPrinterDetectedErrorState
+     ACCESS not-implemented
+     DESCRIPTION "is not implemented"
+
+     -- ********************* ************ ************ *************** ***
+     -- RFC 4133
+     SUPPORTS ENTITY-MIB
+     INCLUDES {
+        entityPhysicalGroup,
+        entityPhysical2Group,
+        entityPhysical3Group,
+        entityGeneralGroup
+     }
+     -- VARIATION entityNotificationsGroup
+     -- ACCESS not-implemented
+     -- VARIATION entityMappingGroup
+     -- ACCESS not-implemented
+
+     -- ********************* ************ ************ *************** ***
+
+     -- REVISION 201008020000Z
+     SUPPORTS VMWARE-SYSTEM-MIB
+     INCLUDES {
+         vmwSystemGroup
+     }
+     -- VARIATION vmwProdUpdate
+     -- ACCESS not-implemented
+     -- VARIATION vmwProdPatch
+     -- ACCESS not-implemented
+
+   ::= { vmwVACapability 5 }
+
+
+END
+
+

mibs/vmware/VMWARE-VC-EVENT-MIB.mib

@@ -249,3 +249,4 @@ vmwVCAlarmNotificationGroup NOTIFICATION-GROUP
     ::= { vmwVCMIBGroups 4 }
 
 END -- end of VMWARE-VC-EVENT-MIB.
+

mibs/vmware/VMWARE-VMINFO-MIB.mib

@@ -19,7 +19,7 @@ VMWARE-VMINFO-MIB DEFINITIONS ::= BEGIN
         FROM VMWARE-ROOT-MIB;
 
     vmwVmInfoMIB MODULE-IDENTITY
-    LAST-UPDATED "200810230000Z"
+    LAST-UPDATED "201109170000Z"
     ORGANIZATION "VMware, Inc"
     CONTACT-INFO
     "VMware, Inc
@@ -35,6 +35,16 @@ DESCRIPTION
       this host system.  This MIB module also provides a mapping beween SMI
       managed objects defined here and their corresponding VMware Virtual
       Infrastructure Management (VIM) API properties."
+
+REVISION      "201109170000Z"
+DESCRIPTION
+    "Remove vmwVmID as it duplicates vmwVmID."
+
+REVISION      "201006220000Z"
+DESCRIPTION
+    "Add managed object vmwVmUUID to vmTable to allow management applications 
+     to identify a VM uniquely over a set of ESX systems. This value is useful when 
+     VMs may move between systems."
       
 REVISION      "200810230000Z"
 DESCRIPTION
@@ -86,7 +96,8 @@ DESCRIPTION
         vmwVmState         DisplayString,
         vmwVmVMID          Integer32,
         vmwVmGuestState    DisplayString,
-        vmwVmCpus          Integer32
+        vmwVmCpus          Integer32,
+        vmwVmUUID          OCTET STRING
         }
 
         vmwVmIdx OBJECT-TYPE
@@ -165,10 +176,10 @@ DESCRIPTION
         vmwVmVMID OBJECT-TYPE
             SYNTAX      Integer32
             MAX-ACCESS  read-only
-            STATUS      current
+            STATUS      obsolete
             DESCRIPTION 
-                "Same value as vmwVmIdx, note that indexes in SMIv2 are not accessible.
+                "No longer provided, use vmwVmIdx. See vmwVmUUID for cross system, 
-                https://esx.example.com/mob/?moid=vmwVmIdx"
+                 unique, persistent identifier."
             ::= { vmwVmEntry 7 }
 
         vmwVmGuestState OBJECT-TYPE
@@ -197,6 +208,18 @@ DESCRIPTION
                 MOB: https://esx.example.com/mob/?moid=vmwVmIdx&doPath=config%2ehardware"
             ::= { vmwVmEntry 9 }
 
+        vmwVmUUID OBJECT-TYPE
+            SYNTAX      OCTET STRING (SIZE(36..72))
+            MAX-ACCESS  read-only
+            STATUS      current
+            DESCRIPTION 
+                "A unique identifier for this VM. Must be unique across a set of ESX systems
+	         managed by an instance of vSphere Center. 
+                 Example value: 564d95d4-bff7-31fd-f20f-db2d808a8b32
+                 VIM Property: uuid 
+                 MOB: https://esx.example.com/mob/?moid=vmwVmIdx&doPath=config"
+            ::= { vmwVmEntry 10 }
+
 -- Host Bus Adapters
 
         vmwVmHbaTable OBJECT-TYPE
@@ -631,7 +654,6 @@ vmwVmInfoGroup OBJECT-GROUP
     vmwVmGuestOS,
     vmwVmMemSize,
     vmwVmState,
-    vmwVmVMID,
     vmwVmGuestState,
     vmwHbaNum,
     vmwHbaVirtDev,
@@ -646,7 +668,8 @@ vmwVmInfoGroup OBJECT-GROUP
     vmwCdromConnected,
     vmwVmID,
     vmwVmConfigFilePath,
-    vmwVmCpus
+    vmwVmCpus,
+    vmwVmUUID
     }
     STATUS  current
     DESCRIPTION
@@ -669,6 +692,7 @@ vmwVmInfoNotificationGroup NOTIFICATION-GROUP
 -- Obsolete details
 vmwVmObsoleteGroup OBJECT-GROUP
     OBJECTS {
+    vmwVmVMID,
     vmwVmNetConnType
     }
     STATUS  obsolete
@@ -678,3 +702,4 @@ vmwVmObsoleteGroup OBJECT-GROUP
 
 
 END -- end of module VMWARE-VMINFO-MIB.
+