Merge branch 'master' of github.com:laf/librenms into issue-711

2024-09-29 14:26:25 +00:00 · 2015-04-18 19:23:33 +01:00 · 2015-04-18 19:23:33 +01:00 · 86d201e096
commit 86d201e096
parent 18b4dcb136 c698204d8a
63 changed files with 23057 additions and 296 deletions
--- a/AUTHORS.md
+++ b/AUTHORS.md
@ -19,6 +19,7 @@ Contributors to LibreNMS:
 - Alan Gregory <alan@opcaonet.com.br> (alangregory)
 - Joubert RedRat <me+github@redrat.com.br> (joubertredrat)
 - Len Lin <Ultra2D@users.noreply.github.com> (Ultra2D)
+- Christopher Freas <code@packetbusters.net> (nwautomator)

 [1]: http://observium.org/ "Observium web site"

--- a/2
+++ b/2
@ -27,7 +27,7 @@ push-dev:
 push-personal pp:
 	$(GIT) push personal

-push-testing:
+push-testing pt:
 	$(GIT) push testing

 update-subtrees: datetime-subtree moment-subtree font-awesome vis
--- a/callback.php
+++ b/callback.php
@ -16,7 +16,7 @@ $enabled = dbFetchCell("SELECT `value` FROM `callback` WHERE `name` = 'enabled'"
 if ($enabled == 1) {

    if (dbFetchCell("SELECT `value` FROM `callback` WHERE `name` = 'uuid'") == '') {
-        dbInsert(array('name'=>'uuid','value'=>guidv4(openssl_random_pseudo_bytes(16))),'callback');
+        dbInsert(array('name'=>'uuid','value'=>guidv4(openssl_random_pseudo_bytes(16))), 'callback');
    }
    $uuid = dbFetchCell("SELECT `value` FROM `callback` WHERE `name` = 'uuid'");

@ -72,12 +72,13 @@ if ($enabled == 1) {
    $submit = array('data'=>$data);

    $fields = '';
-    foreach($submit as $key => $value) { 
+    foreach ($submit as $key => $value) {
        $fields .= $key . '=' . $value . '&';
    }
    rtrim($fields, '&');

    $post = curl_init();
+    set_curl_proxy($post);
    curl_setopt($post, CURLOPT_URL, $config['callback_post']);
    curl_setopt($post, CURLOPT_POST, count($submit));
    curl_setopt($post, CURLOPT_POSTFIELDS, $fields);
@ -89,12 +90,13 @@ if ($enabled == 1) {
    $fields = "uuid=$uuid";

    $clear = curl_init();
+    set_curl_proxy($clear);
    curl_setopt($clear, CURLOPT_URL, $config['callback_clear']);
    curl_setopt($clear, CURLOPT_POST, count($clear));
    curl_setopt($clear, CURLOPT_POSTFIELDS, $fields);
    curl_setopt($clear, CURLOPT_RETURNTRANSFER, 1);
    $result = curl_exec($clear);
-    dbDelete('callback','`name`="uuid"',array());
+    dbDelete('callback', '`name`="uuid"', array());
    dbUpdate(array('value' => '0'), 'callback', '`name` = "enabled"', array());
 }

--- a/config.php.default
+++ b/config.php.default
@ -41,3 +41,6 @@ $config['auth_mechanism'] = "mysql"; # default, other options: ldap, http-auth
 $config['poller-wrapper']['alerter'] = FALSE;
 # Uncomment the next line to disable daily updates
 #$config['update'] = 0;
+
+# Uncomment to submit callback stats via proxy
+#$config['callback_proxy'] = "hostname:port";
--- a/doc/General/Changelog.md
+++ b/doc/General/Changelog.md
@ -3,6 +3,11 @@
 ####Bug fixes
  - Fixed ack of worse/better alerts (PR720)
  - Fixed ORIG_PATH_INFO warnings (PR727)
+  - Added missing CPU id for Cisco SB (PR744)
+  - Changed Processors table name to lower case in processors discovery (PR751)
+  - Fixed alerts path issue (PR756, PR760)
+  - Supress further port alerts when interface goes down (PR745)
+  - Fixed login so redirects via 303 when POST data sent (PR775)

 ####Improvements
  - New theme support added (light,dark and mono) (PR682,PR683,PR701)
@ -13,6 +18,15 @@
  - Update to Foritgate support (PR709)
  - Added support for UBNT AirOS and AirFibre (PR721,PR730,PR731)
  - Added support device groups + alerts to be mapped to devices or groups (PR722)
+  - Added basic Cambium support (PR738)
+  - Added basic F5 support (PR670)
+  - Shorten interface names on map (PR752)
+  - Added PowerCode support (PR762)
+  - Added Autodiscovery via OSPF (PR772)
+  - Added visual graph of alert log (PR777)
+  - Added Callback system to send anonymous stats (PR768)
+  - More tables converted to use bootgrid (PR729, PR761)
+  - New Global Cache to store common queries added (PR780)

 ### Mar 2015

--- a/doc/Installation/Installation-(Debian-Ubuntu).md
+++ b/doc/Installation/Installation-(Debian-Ubuntu).md
@ -182,6 +182,8 @@ so that it looks like this:

 That's it!  You now should be able to log in to http://librenms.example.com/.  Please note that we have not covered HTTPS setup in this example, so your LibreNMS install is not secure by default.  Please do not expose it to the public Internet unless you have configured HTTPS and taken appropriate web server hardening steps.

+It would be great if you would consider opting into the stats system we have, please see [this page](http://docs.librenms.org/General/Callback-Stats-and-Privacy/) on what it is and how to enable it.
+
 [1]: https://github.com/Atrato/observium-poller-wrapper
 [2]: http://git-scm.com/book
 [3]: http://gitready.com/
--- a/doc/Installation/Installation-(RHEL-CentOS).md
+++ b/doc/Installation/Installation-(RHEL-CentOS).md
@ -216,3 +216,5 @@ so that it looks like this:
 ### Install complete ###

 That's it!  You now should be able to log in to http://librenms.example.com/.  Please note that we have not covered HTTPS setup in this example, so your LibreNMS install is not secure by default.  Please do not expose it to the public Internet unless you have configured HTTPS and taken appropriate web server hardening steps.
+
+It would be great if you would consider opting into the stats system we have, please see [this page](http://docs.librenms.org/General/Callback-Stats-and-Privacy/) on what it is and how to enable it.
--- a/doc/Installation/Installation-Lighttpd-(Debian-Ubuntu).md
+++ b/doc/Installation/Installation-Lighttpd-(Debian-Ubuntu).md
@ -158,3 +158,5 @@ so that it looks like this:
 ### Install complete ###

 That's it!  You now should be able to log in to http://librenms.example.com/.  Please note that we have not covered HTTPS setup in this example, so your LibreNMS install is not secure by default.  Please do not expose it to the public Internet unless you have configured HTTPS and taken appropriate web server hardening steps.
+
+It would be great if you would consider opting into the stats system we have, please see [this page](http://docs.librenms.org/General/Callback-Stats-and-Privacy/) on what it is and how to enable it.
--- a/html/css/styles.css
+++ b/html/css/styles.css
@ -1606,7 +1606,7 @@ tr.search:nth-child(odd) {
    height: 600px;
 }

-.75pc-width {
+.threeqtr-width {
    display:block;
    width: 75%;
 }
--- a/html/csv.php
+++ b/html/csv.php
@ -0,0 +1,52 @@
+<?php
+
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2014 Neil Lathwood <https://github.com/laf/ http://www.lathwood.co.uk/fa>
+ *
+ * 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 (strpos($_SERVER['PATH_INFO'], "debug"))
+{
+  $debug = "1";
+  ini_set('display_errors', 1);
+  ini_set('display_startup_errors', 1);
+  ini_set('log_errors', 1);
+  ini_set('error_reporting', E_ALL);
+} else {
+  $debug = FALSE;
+  ini_set('display_errors', 0);
+  ini_set('display_startup_errors', 0);
+  ini_set('log_errors', 0);
+  ini_set('error_reporting', 0);
+}
+
+include "../includes/defaults.inc.php";
+include "../config.php";
+include_once "../includes/definitions.inc.php";
+include "../includes/functions.php";
+include "includes/functions.inc.php";
+include "includes/vars.inc.php";
+include "includes/authenticate.inc.php";
+
+$report = mres($vars['report']);
+if( !empty($report) && file_exists("includes/reports/$report.csv.inc.php")) {
+	if( $debug == false ) {
+		header("Content-Type: text/csv");
+		header('Content-Disposition: attachment; filename="'.$report.'-'.date('Ymd').'.csv"');
+	}
+	$csv = array();
+	include_once "includes/reports/$report.csv.inc.php";
+	foreach( $csv as $line ) {
+		echo implode(',',$line)."\n";
+	}
+} else {
+	echo "Report not found.\n";
+}
+?>
--- a/html/images/os/datacom.png
+++ b/html/images/os/datacom.png
--- a/html/includes/functions.inc.php
+++ b/html/includes/functions.inc.php
@ -122,7 +122,7 @@ function generate_device_url($device, $vars=array())
  return generate_url(array('page' => 'device', 'device' => $device['device_id']), $vars);
 }

-function generate_device_link($device, $text=NULL, $vars=array(), $start=0, $end=0, $escape_text=1)
+function generate_device_link($device, $text=NULL, $vars=array(), $start=0, $end=0, $escape_text=1, $overlib=1)
 {
  global $config;

@ -168,7 +168,11 @@ function generate_device_link($device, $text=NULL, $vars=array(), $start=0, $end
  }

  if ($escape_text) { $text = htmlentities($text); }
+  if ($overlib == 0) {
+      $link = $contents;
+  } else {
      $link = overlib_link($url, $text, escape_quotes($contents), $class);
+  }

  if (device_permitted($device['device_id']))
  {
@ -404,7 +408,7 @@ function generate_entity_link($type, $entity, $text = NULL, $graph_type=NULL)

 }

-function generate_port_link($port, $text = NULL, $type = NULL)
+function generate_port_link($port, $text = NULL, $type = NULL, $overlib = 1, $single_graph = 0)
 {
  global $config;

@ -429,17 +433,21 @@ function generate_port_link($port, $text = NULL, $type = NULL)
  $graph_array['from']     = $config['time']['day'];
  $graph_array['id']       = $port['port_id'];
  $content .= generate_graph_tag($graph_array);
+  if ($single_graph == 0) {
      $graph_array['from']     = $config['time']['week'];
      $content .= generate_graph_tag($graph_array);
      $graph_array['from']     = $config['time']['month'];
      $content .= generate_graph_tag($graph_array);
      $graph_array['from']     = $config['time']['year'];
      $content .= generate_graph_tag($graph_array);
+  }
  $content .= "</div>";

  $url = generate_port_url($port);

-  if (port_permitted($port['port_id'], $port['device_id'])) {
+  if ($overlib == 0) {
+    return $content;
+  } elseif (port_permitted($port['port_id'], $port['device_id'])) {
    return overlib_link($url, $text, $content, $class);
  } else {
    return fixifName($text);
@ -744,4 +752,12 @@ function shorten_interface_type($string) {
           );
 }

+function clean_bootgrid($string) {
+
+    $output = str_replace(array("\r","\n"), "", $string);
+    $output = addslashes($output);
+    return $output;
+
+}
+
 ?>
--- a/html/includes/graphs/device/ucd_cpu.inc.php
+++ b/html/includes/graphs/device/ucd_cpu.inc.php
@ -25,7 +25,7 @@ $rrd_options .= " AREA:system_perc#ea8f00:system:STACK";
 $rrd_options .= " GPRINT:system_perc:LAST:'   %5.2lf%%'";
 $rrd_options .= " GPRINT:system_perc:AVERAGE:'   %5.2lf%%'";
 $rrd_options .= " GPRINT:system_perc:MAX:'   %5.2lf%%\\n'";
-$rrd_options .= " AREA:idle_perc#f5f5e5:idle:STACK";
+$rrd_options .= " AREA:idle_perc#f8f8f3:idle:STACK";
 $rrd_options .= " GPRINT:idle_perc:LAST:'     %5.2lf%%'";
 $rrd_options .= " GPRINT:idle_perc:AVERAGE:'   %5.2lf%%'";
 $rrd_options .= " GPRINT:idle_perc:MAX:'   %5.2lf%%\\n'";
--- a/html/includes/graphs/generic_data.inc.php
+++ b/html/includes/graphs/generic_data.inc.php
@ -93,16 +93,18 @@ if($format == "octets" || $format == "bytes")

 $rrd_options .= " COMMENT:'bps      Now       Ave      Max      95th %\\n'";

-$rrd_options .= " AREA:in".$format."_max#aDEB7B:";
-$rrd_options .= " AREA:in".$format."#91B13C:'In '";
+$rrd_options .= " AREA:in".$format."_max#D7FFC7:";
+$rrd_options .= " AREA:in".$format."#90B040:'In '";
+$rrd_options .= " LINE:in".$format."#608720:'In '";
 #$rrd_options .= " LINE1.25:in".$format."#006600:'In '";
 $rrd_options .= " GPRINT:in".$format.":LAST:%6.2lf%s";
 $rrd_options .= " GPRINT:in".$format.":AVERAGE:%6.2lf%s";
 $rrd_options .= " GPRINT:in".$format."_max:MAX:%6.2lf%s";
 $rrd_options .= " GPRINT:95thin:%6.2lf%s\\\\n";

-$rrd_options .= " AREA:dout".$format."_max#a3b9FF:";
-$rrd_options .= " AREA:dout".$format."#8080BD:'Out'";
+$rrd_options .= " AREA:dout".$format."_max#E0E0FF:";
+$rrd_options .= " AREA:dout".$format."#8080C0:";
+$rrd_options .= " LINE:dout".$format."#606090:'Out'";
 #$rrd_options .= " LINE1.25:dout".$format."#000099:Out";
 $rrd_options .= " GPRINT:out".$format.":LAST:%6.2lf%s";
 $rrd_options .= " GPRINT:out".$format.":AVERAGE:%6.2lf%s";
--- a/html/includes/print-debug.php
+++ b/html/includes/print-debug.php
@ -47,7 +47,7 @@ foreach ($sql_debug as $sql_error) {
    <div class="modal-content">
      <div class="modal-header">
        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title" id="myModalLabel">SQL Debug</h4>
+        <h4 class="modal-title" id="myModalLabel">PHP Debug</h4>
      </div>
      <div class="modal-body">
      <table class="table table-condensed table-hover">
--- a/html/includes/print-graph-alerts.inc.php
+++ b/html/includes/print-graph-alerts.inc.php
@ -19,11 +19,11 @@ if (isset($device['device_id']) && $device['device_id'] > 0) {
 }

 if ($_SESSION['userlevel'] >= '5') {
-    $query = "SELECT DATE(time_logged) Date, COUNT(alert_log.device_id) totalCount, alert_rules.severity Severity FROM alert_log,alert_rules WHERE alert_log.rule_id=alert_rules.id $sql GROUP BY DATE(time_logged),alert_rules.severity";
+    $query = "SELECT DATE_FORMAT(time_logged, '".$config['alert_graph_date_format']."') Date, COUNT(alert_log.rule_id) totalCount, alert_rules.severity Severity FROM alert_log,alert_rules WHERE alert_log.rule_id=alert_rules.id AND `alert_log`.`state` != 0 $sql GROUP BY DATE_FORMAT(time_logged, '".$config['alert_graph_date_format']."'),alert_rules.severity";
 }

 if ($_SESSION['userlevel'] < '5') {
-    $query = "SELECT DATE(time_logged) Date, COUNT(alert_log.device_id) totalCount, alert_rules.severity Severity FROM alert_log,alert_rules,devices_perms WHERE alert_log.rule_id=alert_rules.id $sql AND alert_log.device_id = devices_perms.device_id AND devices_perms.user_id = " . $_SESSION['user_id'] . " GROUP BY DATE(time_logged),alert_rules.severity";
+    $query = "SELECT DATE_FORMAT(time_logged, '".$config['alert_graph_date_format']."') Date, COUNT(alert_log.device_id) totalCount, alert_rules.severity Severity FROM alert_log,alert_rules,devices_perms WHERE alert_log.rule_id=alert_rules.id AND `alert_log`.`state` != 0 $sql AND alert_log.device_id = devices_perms.device_id AND devices_perms.user_id = " . $_SESSION['user_id'] . " GROUP BY DATE_FORMAT(time_logged, '".$config['alert_graph_date_format']."'),alert_rules.severity";
 }

 ?>
@ -86,7 +86,7 @@ echo $max_count; ?>
                }
            }
        },
-        zoomMin: 2073600000, //24hrs
+        zoomMin: 86400, //24hrs
        zoomMax: <?php
 $first_date = reset($data);
 $last_date = end($data);
--- a/html/includes/print-map.inc.php
+++ b/html/includes/print-map.inc.php
@ -25,12 +25,12 @@ $sql .= ' AND `local_device_id` != 0 AND `remote_device_id` != 0';
 $tmp_ids = array();
 foreach (dbFetchRows("SELECT DISTINCT least(`devices`.`device_id`, `remote_device_id`) AS `remote_device_id`, GREATEST(`remote_device_id`,`devices`.`device_id`) AS `local_device_id` FROM `links` LEFT JOIN `ports` ON `local_port_id`=`ports`.`port_id` LEFT JOIN `devices` ON `ports`.`device_id`=`devices`.`device_id` $sql", $sql_array) as $link_devices) {
    if (!in_array($link_devices['local_device_id'], $tmp_ids) && device_permitted($link_devices['local_device_id'])) {
-        $link_dev = dbFetchRow("SELECT `hostname`,`location` FROM `devices` WHERE `device_id`=?",array($link_devices['local_device_id']));
-        $tmp_devices[] = array('id'=>$link_devices['local_device_id'],'label'=>$link_dev['hostname'],'title'=>$link_dev['hostname'],'group'=>$link_dev['location']);
+        $link_dev = dbFetchRow("SELECT * FROM `devices` WHERE `device_id`=?",array($link_devices['local_device_id']));
+        $tmp_devices[] = array('id'=>$link_devices['local_device_id'],'label'=>$link_dev['hostname'],'title'=>generate_device_link($link_dev,'',array(),'','','',0),'group'=>$link_dev['location'],'shape'=>'box');
    }
    if (!in_array($link_devices['remote_device_id'], $tmp_ids) && device_permitted($link_devices['remote_device_id'])) {
-        $link_dev = dbFetchRow("SELECT `hostname`,`location` FROM `devices` WHERE `device_id`=?",array($link_devices['remote_device_id']));
-        $tmp_devices[] = array('id'=>$link_devices['remote_device_id'],'label'=>$link_dev['hostname'],'title'=>$link_dev['hostname'],'group'=>$link_dev['location']);
+        $link_dev = dbFetchRow("SELECT * FROM `devices` WHERE `device_id`=?",array($link_devices['remote_device_id']));
+        $tmp_devices[] = array('id'=>$link_devices['remote_device_id'],'label'=>$link_dev['hostname'],'title'=>generate_device_link($link_dev,'',array(),'','','',0),'group'=>$link_dev['location'],'shape'=>'box');
    }
    array_push($tmp_ids,$link_devices['local_device_id']);
    array_push($tmp_ids,$link_devices['remote_device_id']);
@ -42,11 +42,12 @@ $nodes = json_encode($tmp_devices);
 
 if (is_array($tmp_devices[0])) {
    $tmp_links = array();
-    foreach (dbFetchRows("SELECT local_device_id, remote_device_id, `remote_hostname`,`ports`.`ifName` AS `local_port`, `remote_port`,`ports`.`ifSpeed` AS ifSpeed FROM `links` LEFT JOIN `ports` ON `local_port_id`=`ports`.`port_id` LEFT JOIN `devices` ON `ports`.`device_id`=`devices`.`device_id` WHERE (`local_device_id` IN ($tmp_ids) AND `remote_device_id` IN ($tmp_ids))") as $link_devices) {
+    foreach (dbFetchRows("SELECT local_device_id, remote_device_id, `remote_hostname`,`ports`.*, `remote_port` FROM `links` LEFT JOIN `ports` ON `local_port_id`=`ports`.`port_id` LEFT JOIN `devices` ON `ports`.`device_id`=`devices`.`device_id` WHERE (`local_device_id` IN ($tmp_ids) AND `remote_device_id` IN ($tmp_ids))") as $link_devices) {
        foreach ($tmp_devices as $k=>$v) {
            if ($v['id'] == $link_devices['local_device_id']) {
                $from = $v['id'];
-                $port = shorten_interface_type($link_devices['local_port']);
+                $port = shorten_interface_type($link_devices['ifName']);
+                $port_data = $link_devices;
            }
            if ($v['id'] == $link_devices['remote_device_id']) {
                $to = $v['id'];
@ -67,7 +68,20 @@ if (is_array($tmp_devices[0])) {
        } else {
            $width = 1;
        }
-        $tmp_links[] = array('from'=>$from,'to'=>$to,'label'=>$port,'title'=>$port,'width'=>$width);
+        $link_in_used = ($link_devices['ifInOctets_rate'] * 8) / $link_devices['ifSpeed'] * 100;
+        $link_out_used = ($link_devices['ifOutOctets_rate'] * 8) / $link_devices['ifSpeed'] * 100;
+        if ($link_in_used > $link_out_used) {
+            $link_used = $link_in_used;
+        } else {
+            $link_used = $link_out_used;
+        }
+        $link_used = round($link_used, -1);
+        if ($link_used > 100) {
+            $link_used = 100;
+        }
+        $link_color = $config['map_legend'][$link_used];
+
+        $tmp_links[] = array('from'=>$from,'to'=>$to,'label'=>$port,'title'=>generate_port_link($port_data, "<img src='graph.php?type=port_bits&amp;id=".$port['port_id']."&amp;from=".$config['time']['day']."&amp;to=".$config['time']['now']."&amp;width=100&amp;height=20&amp;legend=no&amp;bg=".str_replace("#","", $row_colour)."'>",'',0,1),'width'=>$width,'color'=>$link_color);
    }
 
    $edges = json_encode($tmp_links);
@ -97,9 +111,26 @@ echo $edges;
    var data = {
            nodes: nodes,
        edges: edges,
-        stabilize: true
+        stabilize: false
+    };
+    var options = {
+       physics: {
+           barnesHut: {
+               gravitationalConstant: -80000, springConstant: 0.001, springLength: 200
+           }
+       },
+       tooltip: {
+           color: {
+               background: '#ffffff'
+           }
+       },
+       smoothCurves: {dynamic:false, type: "continuous"},
+       edges: {
+           color: {
+               color: '#000000'
+           }
+       }
    };
-    var options = {physics: {barnesHut: {gravitationalConstant: -11900, centralGravity: 1.4, springLength: 203, springConstant: 0.05, damping: 0.3}}, smoothCurves: false};
    var network = new vis.Network(container, data, options);
    network.on("resize", function(params) {console.log(params.width,params.height)});
    network.on('click', function (properties) {
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@ -1,4 +1,5 @@
 <?php
+include($config['install_dir'].'/includes/object-cache.inc.php');

 // FIXME - this could do with some performance improvements, i think. possible rearranging some tables and setting flags at poller time (nothing changes outside of then anyways)

@ -194,13 +195,14 @@ if ($_SESSION['userlevel'] >= '10')
            <li><a href="ports/"><i class="fa fa-link fa-fw fa-lg"></i> All Ports</a></li>

 <?php
+$ports = new ObjCache('ports');

-if (isset($ports['errored']))
+if ($ports['errored'] > 0)
 {
  echo('            <li><a href="ports/errors=1/"><i class="fa fa-exclamation-circle fa-fw fa-lg"></i> Errored ('.$ports['errored'].')</a></li>');
 }

-if (isset($ports['ignored']))
+if ($ports['ignored'] > 0)
 {
  echo('            <li><a href="ports/ignore=1/"><i class="fa fa-question-circle fa-fw fa-lg"></i> Ignored ('.$ports['ignored'].')</a></li>');
 }
@ -431,8 +433,12 @@ Plugins::call('menu');

 if ($_SESSION['userlevel'] >= '10')
 {
+  if (dbFetchCell("SELECT COUNT(*) from `plugins` WHERE plugin_active = '1'") > 0) {
    echo('
            <li role="presentation" class="divider"></li>
+    ');
+  }
+  echo('
            <li><a href="plugin/view=admin"> <i class="fa fa-lock fa-fw fa-lg"></i>Plugin Admin</a></li>
  ');
 }
--- a/html/includes/reports/alert-log.pdf.inc.php
+++ b/html/includes/reports/alert-log.pdf.inc.php
--- a/html/includes/reports/example.pdf.inc.php
+++ b/html/includes/reports/example.pdf.inc.php
--- a/html/includes/reports/ports.csv.inc.php
+++ b/html/includes/reports/ports.csv.inc.php
@ -0,0 +1,137 @@
+<?php
+
+$param = array();
+
+if(!isset($vars['ignore']))   { $vars['ignore'] = "0"; }
+if(!isset($vars['disabled'])) { $vars['disabled'] = "0"; }
+if(!isset($vars['deleted']))  { $vars['deleted'] = "0"; }
+
+$where = '';
+
+foreach ($vars as $var => $value)
+{
+  if ($value != "")
+  {
+    switch ($var)
+    {
+      case 'hostname':
+        $where .= " AND D.hostname LIKE ?";
+        $param[] = "%".$value."%";
+        break;
+      case 'location':
+        $where .= " AND D.location LIKE ?";
+        $param[] = "%".$value."%";
+        break;
+      case 'device_id':
+        $where .= " AND D.device_id = ?";
+        $param[] = $value;
+        break;
+      case 'deleted':
+      case 'ignore':
+        if ($value == 1)
+        {
+          $where .= " AND (I.ignore = 1 OR D.ignore = 1) AND I.deleted = 0";
+        }
+        break;
+      case 'disable':
+      case 'ifSpeed':
+        if (is_numeric($value))
+        {
+          $where .= " AND I.$var = ?";
+          $param[] = $value;
+        }
+        break;
+      case 'ifType':
+        $where .= " AND I.$var = ?";
+        $param[] = $value;
+        break;
+      case 'ifAlias':
+      case 'port_descr_type':
+        $where .= " AND I.$var LIKE ?";
+        $param[] = "%".$value."%";
+        break;
+      case 'errors':
+        if ($value == 1)
+        {
+          $where .= " AND (I.`ifInErrors_delta` > '0' OR I.`ifOutErrors_delta` > '0')";
+        }
+        break;
+      case 'state':
+        if ($value == "down")
+        {
+          $where .= "AND I.ifAdminStatus = ? AND I.ifOperStatus = ?";
+          $param[] = "up";
+          $param[] = "down";
+        } elseif($value == "up") {
+          $where .= "AND I.ifAdminStatus = ? AND I.ifOperStatus = ?  AND I.ignore = '0' AND D.ignore='0' AND I.deleted='0'";
+          $param[] = "up";
+          $param[] = "up";
+        } elseif($value == "admindown") {
+          $where .= "AND I.ifAdminStatus = ? AND D.ignore = 0";
+          $param[] = "down";
+        }
+      break;
+    }
+  }
+}
+
+$query = "SELECT * FROM `ports` AS I, `devices` AS D WHERE I.device_id = D.device_id ".$where." ".$query_sort;
+
+$row = 1;
+
+list($format, $subformat) = explode("_", $vars['format']);
+
+$ports = dbFetchRows($query, $param);
+
+switch ($vars['sort'])
+{
+  case 'traffic':
+    $ports = array_sort($ports, 'ifOctets_rate', SORT_DESC);
+    break;
+  case 'traffic_in':
+    $ports = array_sort($ports, 'ifInOctets_rate', SORT_DESC);
+    break;
+  case 'traffic_out':
+    $ports = array_sort($ports, 'ifOutOctets_rate', SORT_DESC);
+    break;
+  case 'packets':
+    $ports = array_sort($ports, 'ifUcastPkts_rate', SORT_DESC);
+    break;
+  case 'packets_in':
+    $ports = array_sort($ports, 'ifInUcastOctets_rate', SORT_DESC);
+    break;
+  case 'packets_out':
+    $ports = array_sort($ports, 'ifOutUcastOctets_rate', SORT_DESC);
+    break;
+  case 'errors':
+    $ports = array_sort($ports, 'ifErrors_rate', SORT_DESC);
+    break;
+  case 'speed':
+    $ports = array_sort($ports, 'ifSpeed', SORT_DESC);
+    break;
+  case 'port':
+    $ports = array_sort($ports, 'ifDescr', SORT_ASC);
+    break;
+  case 'media':
+    $ports = array_sort($ports, 'ifType', SORT_ASC);
+    break;
+  case 'descr':
+    $ports = array_sort($ports, 'ifAlias', SORT_ASC);
+    break;
+  case 'device':
+  default:
+    $ports = array_sort($ports, 'hostname', SORT_ASC);
+}
+
+$csv[] = array('Device','Port','Speed','Down','Up','Media','Description');
+foreach( $ports as $port ) {
+	if( port_permitted($port['port_id'], $port['device_id']) ) {
+		$speed = humanspeed($port['ifSpeed']);
+		$type = humanmedia($port['ifType']);
+		$port['in_rate'] = formatRates($port['ifInOctets_rate'] * 8);
+		$port['out_rate'] = formatRates($port['ifOutOctets_rate'] * 8);
+		$port = ifLabel($port, $device);
+		$csv[] = array($port['hostname'],fixIfName($port['label']),$speed,$port['in_rate'],$port['out_rate'],$type,$port['ifAlias']);
+	}
+}
+?>
--- a/html/includes/vars.inc.php
+++ b/html/includes/vars.inc.php
@ -0,0 +1,40 @@
+<?php
+
+foreach ($_GET as $key=>$get_var)
+{
+  if (strstr($key, "opt"))
+  {
+    list($name, $value) = explode("|", $get_var);
+    if (!isset($value)) { $value = "yes"; }
+    $vars[$name] = $value;
+  }
+}
+
+$segments = explode('/', trim($_SERVER['REQUEST_URI'], '/'));
+
+foreach ($segments as $pos => $segment)
+{
+  $segment = urldecode($segment);
+  if ($pos == "0")
+  {
+    $vars['page'] = $segment;
+  } else {
+    list($name, $value) = explode("=", $segment);
+    if ($value == "" || !isset($value))
+    {
+      $vars[$name] = yes;
+    } else {
+      $vars[$name] = $value;
+    }
+  }
+}
+
+foreach ($_GET as $name => $value)
+{
+  $vars[$name] = $value;
+}
+
+foreach ($_POST as $name => $value)
+{
+  $vars[$name] = $value;
+}
--- a/html/index.php
+++ b/html/index.php
@ -12,7 +12,11 @@
 *
 */

-$_SERVER['PATH_INFO'] = !empty($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : (!empty($_SERVER['ORIG_PATH_INFO']) ? $_SERVER['ORIG_PATH_INFO'] : '');
+if( strstr($_SERVER['SERVER_SOFTWARE'],"nginx") ) {
+    $_SERVER['PATH_INFO'] = str_replace($_SERVER['PATH_TRANSLATED'].$_SERVER['PHP_SELF'],"",$_SERVER['ORIG_SCRIPT_FILENAME']);
+} else {
+    $_SERVER['PATH_INFO'] = !empty($_SERVER['PATH_INFO']) ? $_SERVER['PATH_INFO'] : (!empty($_SERVER['ORIG_PATH_INFO']) ? $_SERVER['ORIG_PATH_INFO'] : '');
+}

 function logErrors($errno, $errstr, $errfile, $errline) {
    global $php_debug;
@ -52,6 +56,7 @@ include("../config.php");
 include_once("../includes/definitions.inc.php");
 include("../includes/functions.php");
 include("includes/functions.inc.php");
+include("includes/vars.inc.php");
 include('includes/plugins.inc.php');
 Plugins::start();

@ -70,45 +75,6 @@ ob_start();
 ini_set('allow_url_fopen', 0);
 ini_set('display_errors', 0);

-foreach ($_GET as $key=>$get_var)
-{
-  if (strstr($key, "opt"))
-  {
-    list($name, $value) = explode("|", $get_var);
-    if (!isset($value)) { $value = "yes"; }
-    $vars[$name] = $value;
-  }
-}
-
-$segments = explode('/', trim($_SERVER['REQUEST_URI'], '/'));
-
-foreach ($segments as $pos => $segment)
-{
-  $segment = urldecode($segment);
-  if ($pos == "0")
-  {
-    $vars['page'] = $segment;
-  } else {
-    list($name, $value) = explode("=", $segment);
-    if ($value == "" || !isset($value))
-    {
-      $vars[$name] = yes;
-    } else {
-      $vars[$name] = $value;
-    }
-  }
-}
-
-foreach ($_GET as $name => $value)
-{
-  $vars[$name] = $value;
-}
-
-foreach ($_POST as $name => $value)
-{
-  $vars[$name] = $value;
-}
-
 include("includes/authenticate.inc.php");

 if (strstr($_SERVER['REQUEST_URI'], 'widescreen=yes')) { $_SESSION['widescreen'] = 1; }
@ -338,7 +304,7 @@ toastr.options.extendedTimeOut = 20;
  echo("</script>");
 }

-if (is_array($sql_debug) && is_array($php_debug)) {
+if (is_array($sql_debug) && is_array($php_debug) && $_SESSION['authenticated'] === TRUE) {

    include_once "includes/print-debug.php";

--- a/html/pages/devices.inc.php
+++ b/html/pages/devices.inc.php
@ -93,6 +93,59 @@ list($format, $subformat) = explode("_", $vars['format']);

 if($format == "graph")
 {
+$sql_param = array();
+
+if(isset($vars['state']))
+{
+  if($vars['state'] == 'up')
+  {
+    $state = '1';
+  }
+    elseif($vars['state'] == 'down')
+  {
+    $state = '0';
+  }
+}
+
+if (!empty($vars['hostname'])) { $where .= " AND hostname LIKE ?"; $sql_param[] = "%".$vars['hostname']."%"; }
+if (!empty($vars['os']))       { $where .= " AND os = ?";          $sql_param[] = $vars['os']; }
+if (!empty($vars['version']))  { $where .= " AND version = ?";     $sql_param[] = $vars['version']; }
+if (!empty($vars['hardware'])) { $where .= " AND hardware = ?";    $sql_param[] = $vars['hardware']; }
+if (!empty($vars['features'])) { $where .= " AND features = ?";    $sql_param[] = $vars['features']; }
+if (!empty($vars['type']))     {
+  if ($vars['type'] == 'generic') {
+    $where .= " AND ( type = ? OR type = '')";        $sql_param[] = $vars['type'];
+  } else {
+    $where .= " AND type = ?";        $sql_param[] = $vars['type'];
+  }
+}
+if (!empty($vars['state']))    {
+  $where .= " AND status= ?";       $sql_param[] = $state;
+  $where .= " AND disabled='0' AND `ignore`='0'"; $sql_param[] = '';
+}
+if (!empty($vars['disabled'])) { $where .= " AND disabled= ?";     $sql_param[] = $vars['disabled']; }
+if (!empty($vars['ignore']))   { $where .= " AND `ignore`= ?";       $sql_param[] = $vars['ignore']; }
+if (!empty($vars['location']) && $vars['location'] == "Unset") { $location_filter = ''; }
+if (!empty($vars['location'])) { $location_filter = $vars['location']; }
+if( !empty($vars['group']) ) {
+	require_once('../includes/device-groups.inc.php');
+	$where .= " AND ( ";
+	foreach( GetDevicesFromGroup($vars['group']) as $dev ) {
+		$where .= "device_id = ? OR ";
+		$sql_param[] = $dev['device_id'];
+	}
+	$where = substr($where, 0, strlen($where)-3);
+	$where .= " )";
+}
+
+$query = "SELECT * FROM `devices` WHERE 1 ";
+
+if (isset($where)) {
+    $query .= $where;
+}
+
+$query .= " ORDER BY hostname";
+
  $row = 1;
  foreach (dbFetchRows($query, $sql_param) as $device)
  {
@ -149,7 +202,7 @@ var grid = $("#devices").bootgrid({
    columnSelection: false,
    formatters: {
        "status": function(column,row) {
-            return "<h4><span class='label label-"+row.extra+" 75pc-width'>" + row.msg + "</span></h4>";
+            return "<h4><span class='label label-"+row.extra+" threeqtr-width'>" + row.msg + "</span></h4>";
        }
    },
    templates: {
@ -165,11 +218,12 @@ var grid = $("#devices").bootgrid({

 foreach (dbFetch('SELECT `os` FROM `devices` AS D WHERE 1 GROUP BY `os` ORDER BY `os`') as $data) {
    if ($data['os']) {
-        echo('"<option value=\"'.$data['os'].'\""+');
-        if ($data['os'] == $vars['os']) {
+        $tmp_os = clean_bootgrid($data['os']);
+        echo('"<option value=\"'.$tmp_os.'\""+');
+        if ($tmp_os == $vars['os']) {
            echo('" selected "+');
        }
-        echo('">'.$config['os'][$data['os']]['text'].'</option>"+');
+        echo('">'.$config['os'][$tmp_os]['text'].'</option>"+');
    }
 }
 ?>
@ -182,11 +236,12 @@ foreach (dbFetch('SELECT `os` FROM `devices` AS D WHERE 1 GROUP BY `os` ORDER BY

 foreach (dbFetch('SELECT `version` FROM `devices` AS D WHERE 1 GROUP BY `version` ORDER BY `version`') as $data) {
    if ($data['version']) {
-        echo('"<option value=\"'.$data['version'].'\""+');
-        if ($data['version'] == $vars['version']) {
+        $tmp_version = clean_bootgrid($data['version']);
+        echo('"<option value=\"'.$tmp_version.'\""+');
+        if ($tmp_version == $vars['version']) {
            echo('" selected "+');
        }
-        echo('">'.$data['version'].'</option>"+');
+        echo('">'.$tmp_version.'</option>"+');
  }
 }
 ?>
@ -199,11 +254,12 @@ foreach (dbFetch('SELECT `version` FROM `devices` AS D WHERE 1 GROUP BY `version

 foreach (dbFetch('SELECT `hardware` FROM `devices` AS D WHERE 1 GROUP BY `hardware` ORDER BY `hardware`') as $data) {
    if ($data['hardware']) {
-        echo('"<option value=\"'.$data['hardware'].'\""+');
-        if ($data['hardware'] == $vars['hardware']) {
+        $tmp_hardware = clean_bootgrid($data['hardware']);
+        echo('"<option value=\"'.$tmp_hardware.'\""+');
+        if ($tmp_hardware == $vars['hardware']) {
            echo('" selected"+');
        }
-        echo('">'.$data['hardware'].'</option>"+');
+        echo('">'.$tmp_hardware.'</option>"+');
    }
 }

@ -219,11 +275,12 @@ foreach (dbFetch('SELECT `features` FROM `devices` AS D WHERE 1 GROUP BY `featur
 {
  if ($data['features'])
  {
-    echo('"<option value=\"'.$data['features'].'\""+');
-    if ($data['features'] == $vars['features']) {
+    $tmp_features = clean_bootgrid($data['features']);
+    echo('"<option value=\"'.$tmp_features.'\""+');
+    if ($tmp_features == $vars['features']) {
        echo('" selected"+');
    }
-    echo('">'.$data['features'].'</option>"+');
+    echo('">'.$tmp_features.'</option>"+');
    }
 }

@ -239,6 +296,7 @@ foreach (dbFetch('SELECT `features` FROM `devices` AS D WHERE 1 GROUP BY `featur

 foreach (getlocations() as $location) {
    if ($location) {
+        $location = clean_bootgrid($location);
        echo('"<option value=\"'.$location.'\""+');
        if ($location == $vars['location']) {
            echo('" selected"+');
--- a/html/pages/health/processor.inc.php
+++ b/html/pages/health/processor.inc.php
@ -25,7 +25,7 @@ foreach (dbFetchRows("SELECT * FROM `processors` AS P, `devices` AS D WHERE D.de
    $text_descr = str_replace("Sub-Module", "Module ", $text_descr);
    $text_descr = str_replace("DFC Card", "DFC", $text_descr);

-    $proc_url   = "device/".$device['device_id']."/health/processor/";
+    $proc_url   = "device/device=".$device['device_id']."/tab=health/metric=processor/";

    $mini_url = "graph.php?id=".$proc['processor_id']."&amp;type=".$graph_type."&amp;from=".$config['time']['day']."&amp;to=".$config['time']['now']."&amp;width=80&amp;height=20&amp;bg=f4f4f400";

--- a/html/pages/ports.inc.php
+++ b/html/pages/ports.inc.php
@ -60,6 +60,7 @@ foreach ($menu_options as $option => $text)
 echo('<div style="float: right;">');
 ?>

+  <a href="/csv.php/report=<?php echo generate_url($vars,array('format'=>'')); ?>" title="Export as CSV" target="_blank">Export CSV</a> |
  <a href="<?php echo(generate_url($vars)); ?>" title="Update the browser URL to reflect the search criteria." >Update URL</a> |

 <?php
--- a/html/pdf.php
+++ b/html/pdf.php
@ -55,7 +55,7 @@ $pdf->setTextShadow(array('enabled'=>false, 'depth_w'=>0.2, 'depth_h'=>0.2, 'col
 if (isset($_GET['report']) && !empty($_GET['report'])) {
    $report = mres($_GET['report']);
    $pdf->SetHeaderData('../../' . $config['title_image'], 40, ucfirst($report), $config['project_name'], array(0,0,0), array(0,64,128));
-    include_once "includes/reports/$report.inc.php";
+    include_once "includes/reports/$report.pdf.inc.php";
 } else {
    $report = 'report';
 }
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@ -252,6 +252,9 @@ $config['graph_colours']['blues']   = array('A0A0E5','8080BD','606096','40406F',
 $config['graph_colours']['purples'] = array('CC7CCC','AF63AF','934A93','773177','5B185B','3F003F');
 $config['graph_colours']['default'] = $config['graph_colours']['blues'];

+// Map colors
+$config['map_legend'] = array('0'=> '#aeaeae', '10' => '#79847e', '20' => '#97ffca', '30' => '#a800ff', '40' => '#6c00ff', '50' => '#00d2ff', '60' => '#0090ff', '70' => '#ffe400', '80' => '#ffa200', '90' => '#ff6600', '100' => '#ff0000');
+
 // Device page options

 $config['show_overview_tab'] = TRUE;
@ -603,4 +606,7 @@ $config['distributed_poller_memcached_port']             = '11211';
 $config['callback_post']                                 = 'https://stats.librenms.org/log.php';
 $config['callback_clear']                                = 'https://stats.librenms.org/clear.php';

+// Stat graphs
+$config['alert_graph_date_format']                       = '%Y-%m-%d %H:%i';
+
 ?>
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@ -140,6 +140,18 @@ $config['os'][$os]['over'][1]['text']   = "Processor Usage";
 $config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";

+$os = "procera";
+$config['os'][$os]['type']              = "network";
+$config['os'][$os]['group']             = "unix";
+$config['os'][$os]['text']              = "Procera Networks";
+$config['os'][$os]['icon']              = "linux";
+$config['os'][$os]['over'][0]['graph']  = "device_bits";
+$config['os'][$os]['over'][0]['text']   = "Device Traffic";
+$config['os'][$os]['over'][1]['graph']  = "device_processor";
+$config['os'][$os]['over'][1]['text']   = "Processor Usage";
+$config['os'][$os]['over'][2]['graph']  = "device_mempool";
+$config['os'][$os]['over'][2]['text']   = "Memory Usage";
+
 // Other Unix-based OSes here please.

 $os = "freebsd";
@ -1045,6 +1057,11 @@ $config['os'][$os]['text']              = "Cambium";
 $config['os'][$os]['type']              = "wireless";
 $config['os'][$os]['icon']              = "cambium";

+$os = "datacom";
+$config['os'][$os]['text']              = "Datacom";
+$config['os'][$os]['type']              = "network";
+$config['os'][$os]['icon']              = "datacom";
+
 foreach ($config['os'] as $this_os => $blah)
 {
  if (isset($config['os'][$this_os]['group']))
--- a/includes/discovery/entity-physical.inc.php
+++ b/includes/discovery/entity-physical.inc.php
@ -1,19 +1,48 @@
 <?php

+if ($config['enable_inventory']) {
+
    echo("Physical Inventory : ");

- if ($config['enable_inventory']) {
-
    echo("\nCaching OIDs:");

+    if ($device['os'] == 'junos') {
+
+        $entity_array = array();
+        echo(" jnxBoxAnatomy");
+        $entity_array = snmpwalk_cache_oid($device, "jnxBoxAnatomy", $entity_array, "JUNIPER-MIB");
+    } else {
+
        $entity_array = array();
        echo(" entPhysicalEntry");
        $entity_array = snmpwalk_cache_oid($device, "entPhysicalEntry", $entity_array, "ENTITY-MIB:CISCO-ENTITY-VENDORTYPE-OID-MIB");
        echo(" entAliasMappingIdentifier");
        $entity_array = snmpwalk_cache_twopart_oid($device, "entAliasMappingIdentifier", $entity_array, "ENTITY-MIB:IF-MIB");
+    }

        foreach ($entity_array as $entPhysicalIndex => $entry) {

+            if ($device['os'] == 'junos') {
+
+                // Juniper's MIB doesn't have the same objects as the Entity MIB, so some values
+                // are made up here.
+                $entPhysicalDescr                = $entry['jnxContentsDescr'];
+                $entPhysicalContainedIn        = $entry['jnxContainersWithin'];
+                $entPhysicalClass                = $entry['jnxBoxClass'];
+                $entPhysicalName                = $entry['jnxOperatingDescr'];
+                $entPhysicalSerialNum        = $entry['jnxContentsSerialNo'];
+                $entPhysicalModelName        = $entry['jnxContentsPartNo'];
+                $entPhysicalMfgName                = 'Juniper';
+                $entPhysicalVendorType        = 'Juniper';
+                $entPhysicalParentRelPos        = -1; 
+                $entPhysicalHardwareRev         = $entry['jnxContentsRevision'];
+                $entPhysicalFirmwareRev         = $entry['entPhysicalFirmwareRev'];
+                $entPhysicalSoftwareRev         = $entry['entPhysicalSoftwareRev'];
+                $entPhysicalIsFRU                 = $entry['jnxFruType'];
+                $entPhysicalAlias             = $entry['entPhysicalAlias'];
+                $entPhysicalAssetID         = $entry['entPhysicalAssetID'];
+            } else {
+
                $entPhysicalDescr                = $entry['entPhysicalDescr'];
                $entPhysicalContainedIn        = $entry['entPhysicalContainedIn'];
                $entPhysicalClass                = $entry['entPhysicalClass'];
@ -29,6 +58,7 @@
                $entPhysicalIsFRU                 = $entry['entPhysicalIsFRU'];
                $entPhysicalAlias             = $entry['entPhysicalAlias'];
                $entPhysicalAssetID         = $entry['entPhysicalAssetID'];
+            }

            if (isset($entity_array[$entPhysicalIndex]['0']['entAliasMappingIdentifier'])) {
                $ifIndex = $entity_array[$entPhysicalIndex]['0']['entAliasMappingIdentifier'];
@ -41,15 +71,13 @@
                $ifIndex = $ifIndex_array[1];
            }

-    if ($entPhysicalVendorTypes[$entPhysicalVendorType] && !$entPhysicalModelName)
-    {
+            if ($entPhysicalVendorTypes[$entPhysicalVendorType] && !$entPhysicalModelName) {
                $entPhysicalModelName = $entPhysicalVendorTypes[$entPhysicalVendorType];
            }

            // FIXME - dbFacile

-    if ($entPhysicalDescr || $entPhysicalName)
-    {
+            if ($entPhysicalDescr || $entPhysicalName) {
                $entPhysical_id = dbFetchCell("SELECT entPhysical_id FROM `entPhysical` WHERE device_id = ? AND entPhysicalIndex = ?",array($device['device_id'], $entPhysicalIndex));

                if ($entPhysical_id) {
@ -102,22 +130,31 @@
                    echo("+");
                }           

+                if ($device['os'] == 'junos') {
+
+                    // $entPhysicalIndex appears as a numeric OID fragment 
+                    // (string), so convert it to an "integer" for the 
+                    // validation step below since it is stored in the DB as
+                    // an integer. This should be fixed.
+                    list($first,$second) = explode(".",$entPhysicalIndex);
+                    $entPhysicalIndexNoDots =  $first . $second;
+                    $valid[$entPhysicalIndexNoDots] = 1;
+                } else {
                    $valid[$entPhysicalIndex] = 1;
                }
            }
+        }

- } else { echo("Disabled!"); }
+} else { echo("Disabled!"); }

-  $sql = "SELECT * FROM `entPhysical` WHERE `device_id`  = '".$device['device_id']."'";
-  foreach (dbFetchRows($sql) as $test)
-  {
+$sql = "SELECT * FROM `entPhysical` WHERE `device_id`  = '".$device['device_id']."'";
+foreach (dbFetchRows($sql) as $test) {
    $id = $test['entPhysicalIndex'];
    if (!$valid[$id]) {
        echo("-");
        dbDelete('entPhysical', 'entPhysical_id = ?', array($test['entPhysical_id']));
    }
-  }
-
- echo("\n");
+}

+echo("\n");
 ?>
--- a/includes/discovery/os/comware.inc.php
+++ b/includes/discovery/os/comware.inc.php
@ -3,7 +3,7 @@
 if (!$os)
 {
  if (strstr($sysDescr, "Comware")) { $os = "comware"; }
-  else if(preg_match('/HP [a-zA-Z0-9-]+ Switch Software Version/',$sysDescr)) { $os = "comware"; }
+  else if(preg_match('/HP [a-zA-Z0-9- ]+ Switch Software Version/',$sysDescr)) { $os = "comware"; }
 }

 ?>
--- a/includes/discovery/os/datacom.inc.php
+++ b/includes/discovery/os/datacom.inc.php
@ -0,0 +1,6 @@
+<?php
+if (!$os)
+{
+   if (strstr($sysObjectId, ".1.3.6.1.4.1.3709")) { $os = "datacom"; }
+}
+?>
--- a/includes/discovery/os/linux.inc.php
+++ b/includes/discovery/os/linux.inc.php
@ -15,6 +15,7 @@ if (!$os)
    elseif (strstr($sysDescr, "endian")) { $os = "endian"; }
    elseif (preg_match("/Cisco Small Business/", $sysDescr)) { $os = "ciscosmblinux"; }
    elseif (strpos($entPhysicalMfgName, "QNAP") !== FALSE) { $os = "qnap"; }
+    elseif (stristr($sysObjectId, "packetlogic") || strstr($sysObjectId, ".1.3.6.1.4.1.15397.2")) { $os = "procera"; }
    elseif (strstr($sysObjectId, ".1.3.6.1.4.1.10002.1") || strstr($sysObjectId, ".1.3.6.1.4.1.41112.1.4") || strpos(trim(snmp_get($device, "dot11manufacturerName.5", "-Osqnv", "IEEE802dot11-MIB")), "Ubiquiti") !== FALSE)
    {
      $os = "airos";
--- a/includes/discovery/processors/datacom.inc.php
+++ b/includes/discovery/processors/datacom.inc.php
@ -0,0 +1,11 @@
+<?php
+if ($device['os'] == "datacom") {
+   echo("Datacom Switch : ");
+   $descr = "Processor";
+   $usage = snmp_get($device, "swCpuUsage.0", "-Ovq", "DMswitch-MIB");
+   echo $usage."\n";
+   if (is_numeric($usage)) {
+      discover_processor($valid['processor'], $device, "swCpuUsage", "0", "datacom", $descr, "1", $usage, NULL, NULL);
+   }
+}
+?>
--- a/includes/discovery/vmware-vminfo.inc.php
+++ b/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
-   *  VMWARE-VMINFO-MIB::vmwVmVMID.416 = INTEGER: 416
+   *  vmwVmVMID.224 = INTEGER: 224
+   *  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
-       *  VMWARE-VMINFO-MIB::vmwVmDisplayName.416 = STRING: My Second VM
-       *  VMWARE-VMINFO-MIB::vmwVmGuestOS.224 = STRING: windows7Server64Guest
-       *  VMWARE-VMINFO-MIB::vmwVmGuestOS.416 = STRING: winLonghornGuest
-       *  VMWARE-VMINFO-MIB::vmwVmMemSize.224 = INTEGER: 8192 megabytes
-       *  VMWARE-VMINFO-MIB::vmwVmMemSize.416 = INTEGER: 8192 megabytes
-       *  VMWARE-VMINFO-MIB::vmwVmState.224 = STRING: poweredOn
-       *  VMWARE-VMINFO-MIB::vmwVmState.416 = STRING: poweredOn
-       *  VMWARE-VMINFO-MIB::vmwVmVMID.224 = INTEGER: 224
-       *  VMWARE-VMINFO-MIB::vmwVmVMID.416 = INTEGER: 416
-       *  VMWARE-VMINFO-MIB::vmwVmCpus.224 = INTEGER: 2
-       *  VMWARE-VMINFO-MIB::vmwVmCpus.416 = INTEGER: 2
+       *  vmwVmDisplayName.224 = STRING: My First VM
+       *  vmwVmDisplayName.416 = STRING: My Second VM
+       *  vmwVmGuestOS.224 = STRING: windows7Server64Guest
+       *  vmwVmGuestOS.416 = STRING: winLonghornGuest
+       *  vmwVmMemSize.224 = INTEGER: 8192 megabytes
+       *  vmwVmMemSize.416 = INTEGER: 8192 megabytes
+       *  vmwVmState.224 = STRING: poweredOn
+       *  vmwVmState.416 = STRING: poweredOn
+       *  vmwVmVMID.224 = INTEGER: 224
+       *  vmwVmVMID.416 = INTEGER: 416
+       *  vmwVmCpus.224 = 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");
-      $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");
-      $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");
-      $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");
+
+      $vmwVmDisplayName = snmp_get($device, "vmwVmDisplayName." . $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");
+      $vmwVmMemSize   = snmp_get($device, "vmwVmMemSize."   . $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
    }
--- a/includes/functions.php
+++ b/includes/functions.php
@ -1140,4 +1140,17 @@ function guidv4($data) {
    return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($data), 4));
 }

-?>
+function set_curl_proxy($post)
+{
+    global $config;
+    if (isset($_ENV['https_proxy'])) {
+	$tmp = rtrim($_ENV['https_proxy'], "/");
+	$proxystr = str_replace(array("http://", "https://"), "", $tmp);
+	$config['callback_proxy'] = $proxystr;
+	echo "Setting proxy to ".$proxystr." (from https_proxy=".$_ENV['https_proxy'].")\n";
+    }
+    if (isset($config['callback_proxy'])) {
+	echo "Using ".$config['callback_proxy']." as proxy\n";
+	curl_setopt($post, CURLOPT_PROXY, $config['callback_proxy']);
+    }
+}
--- a/includes/polling/os/apc.inc.php
+++ b/includes/polling/os/apc.inc.php
@ -1,58 +1,77 @@
 <?php

 # PDU
-$serial = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.12.1.6.0", "-OQv", "", ""),'"');
+$serial = trim(snmp_get($device, "PowerNet-MIB::rPDUIdentSerialNumber.0", "-OQv", "", ""),'"');

 if ($serial == "")
 {
  # ATS
-  $serial = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.8.1.6.0", "-OQv", "", ""),'"');
+  $serial = trim(snmp_get($device, "PowerNet-MIB::atsIdentSerialNumber.0", "-OQv", "", ""),'"');
 }

 if ($serial == "")
 {
  # UPS
-  $serial = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.1.1.2.3.0", "-OQv", "", ""),'"');
+  $serial = trim(snmp_get($device, "PowerNet-MIB::upsAdvIdentSerialNumber.0", "-OQv", "", ""),'"');
 }

 if ($serial == "")
 {
  # Masterswitch/AP9606
-  $serial = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.4.1.5.0", "-OQv", "", ""),'"');
+  $serial = trim(snmp_get($device, "PowerNet-MIB::sPDUIdentSerialNumber.0", "-OQv", "", ""),'"');
+}
+
+if ($serial == "")
+{
+  # InRow chiller
+  $serial = trim(snmp_get($device, "PowerNet-MIB::airIRRCUnitIdentSerialNumber.0", "-OQv", "", ""),'"');
+}
+
+if ($serial == "")
+{
+  # InfraStruxure
+  $serial = trim(snmp_get($device, "PowerNet-MIB::isxModularPduIdentSerialNumber.0", "-OQv", "", ""),'"');
 }

 /////////////////////

 # PDU
-$hardware = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.12.1.5.0", "-OQv", "", ""),'"');
-$hardware .= ' ' . trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.12.1.2.0", "-OQv", "", ""),'"');
+$hardware = trim(snmp_get($device, "PowerNet-MIB::rPDUIdentModelNumber.0", "-OQv", "", ""),'"');
+$hardware .= ' ' . trim(snmp_get($device, "PowerNet-MIB::rPDUIdentHardwareRev.0", "-OQv", "", ""),'"');

 if ($hardware == " ")
 {
  # ATS
-  $hardware = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.8.1.5.0", "-OQv", "", ""),'"');
-  $hardware .= ' ' . trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.8.1.1.0", "-OQv", "", ""),'"');
+  $hardware = trim(snmp_get($device, "PowerNet-MIB::atsIdentModelNumber.0", "-OQv", "", ""),'"');
+  $hardware .= ' ' . trim(snmp_get($device, "PowerNet-MIB::atsIdentHardwareRev.0", "-OQv", "", ""),'"');
 }

 if ($hardware == " ")
 {
  # UPS
-  $hardware = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.1.1.1.1.0", "-OQv", "", ""),'"');
-  $hardware .= ' ' . trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.1.1.2.1.0", "-OQv", "", ""),'"');
+  $hardware = trim(snmp_get($device, "PowerNet-MIB::upsBasicIdentModel.0", "-OQv", "", ""),'"');
+  $hardware .= ' ' . trim(snmp_get($device, "PowerNet-MIB::upsAdvIdentFirmwareRevision.0", "-OQv", "", ""),'"');
 }

 if ($hardware == " ")
 {
  # Masterswitch/AP9606
-  $hardware = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.4.1.4.0", "-OQv", "", ""),'"');
-  $hardware .= ' ' . trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.4.1.1.0", "-OQv", "", ""),'"');
+  $hardware = trim(snmp_get($device, "PowerNet-MIB::sPDUIdentModelNumber.0", "-OQv", "", ""),'"');
+  $hardware .= ' ' . trim(snmp_get($device, "PowerNet-MIB::sPDUIdentHardwareRev.0", "-OQv", "", ""),'"');
 }

 if ($hardware == " ")
 {
  # InRow chiller
-  $hardware = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.13.3.2.2.1.4.0", "-OQv", "", ""),'"');
-  $hardware .= ' ' . trim(snmp_get($device, ".1.3.6.1.4.1.318.1.1.13.3.2.2.1.7.0", "-OQv", "", ""),'"');
+  $hardware = trim(snmp_get($device, "PowerNet-MIB::airIRRCUnitIdentModelNumber.0", "-OQv", "", ""),'"');
+  $hardware .= ' ' . trim(snmp_get($device, "PowerNet-MIB::airIRRCUnitIdentHardwareRevision.0", "-OQv", "", ""),'"');
+}
+
+if ($hardware == " ")
+{
+  # InfraStruxure
+  $hardware = trim(snmp_get($device, "PowerNet-MIB::isxModularPduIdentModelNumber.0", "-OQv", "", ""),'"');
+  $hardware .= ' ' . trim(snmp_get($device, "PowerNet-MIB::isxModularPduIdentMonitorCardHardwareRev.0", "-OQv", "", ""),'"');
 }

 /////////////////////
@ -63,18 +82,30 @@ $APPrev = trim(snmp_get($device, "1.3.6.1.4.1.318.1.4.2.4.1.4.2", "-OQv", "", ""
 if ($AOSrev == '')
 {
  # PDU
-  $version = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.12.1.3.0", "-OQv", "", ""),'"');
+  $version = trim(snmp_get($device, "PowerNet-MIB::rPDUIdentFirmwareRev.0", "-OQv", "", ""),'"');

  if ($version == "")
  {
    # ATS
-    $version = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.8.1.2.0", "-OQv", "", ""),'"');
+    $version = trim(snmp_get($device, "PowerNet-MIB::atsIdentFirmwareRev.0", "-OQv", "", ""),'"');
  }

  if ($version == "")
  {
    # Masterswitch/AP9606
-    $version = trim(snmp_get($device, "1.3.6.1.4.1.318.1.1.4.1.2.0", "-OQv", "", ""),'"');
+    $version = trim(snmp_get($device, "PowerNet-MIB::sPDUIdentFirmwareRev.0", "-OQv", "", ""),'"');
+  }
+
+  if ($version == "")
+  {
+    # InRow chiller
+    $version = trim(snmp_get($device, "PowerNet-MIB::airIRRCUnitIdentFirmwareRevision.0", "-OQv", "", ""),'"');
+  }
+
+  if ($version == "")
+  {
+    # InfraStruxure
+    $version = trim(snmp_get($device, "PowerNet-MIB::isxModularPduIdentMonitorCardFirmwareAppRev.0", "-OQv", "", ""),'"');
  }
 }
 else
--- a/includes/polling/os/cisco.inc.php
+++ b/includes/polling/os/cisco.inc.php
@ -1,14 +1,14 @@
 <?php

-if (preg_match('/^Cisco IOS Software, .+? Software \([^\-]+-([\w\d]+)-\w\), Version ([^,]+)/', $poll_device['sysDescr'], $regexp_result))
+if (preg_match('/^Cisco IOS Software, .+? Software(\, )?([\s\w\d]+)? \([^\-]+-([\w\d]+)-\w\), Version ([^,]+)/', $poll_device['sysDescr'], $regexp_result))
 {
-  $features = $regexp_result[1];
-  $version = $regexp_result[2];
-}
-elseif( false )
-{
-  # Placeholder
-  # Other regexp for other type of string
+  $features = $regexp_result[3];
+  $version = $regexp_result[4];
+  $hardware = $regexp_result[2];
+  $tmp = preg_split("/\\r\\n|\\r|\\n/",$version);
+  if (!empty($tmp[0])) {
+      $version = $tmp[0];
+  }
 }

 echo("\n".$poll_device['sysDescr']."\n");
@ -24,7 +24,7 @@ if ($data[1]['entPhysicalContainedIn'] == "0")
    $version = $data[1]['entPhysicalSoftwareRev'];
  }

-  if (!empty($data[1]['entPhysicalName']))
+  if (!empty($data[1]['entPhysicalName']) && $data[1]['entPhysicalName'] != 'Switch System')
  {
    $hardware = $data[1]['entPhysicalName'];
  }
--- a/includes/polling/os/datacom.inc.php
+++ b/includes/polling/os/datacom.inc.php
@ -0,0 +1,6 @@
+<?php
+$hardware = "Datacom ".str_replace("dmSwitch","DM",snmp_get($device, "swChassisModel.0", "-Ovq", "DMswitch-MIB"));
+$version  = snmp_get($device, "swFirmwareVer.1", "-Ovq", "DMswitch-MIB");
+$features  = snmp_get($device, "sysDescr.0", "-Oqv", "SNMPv2-MIB");
+$serial = snmp_get($device, "DMswitch-MIB::swSerialNumber.1", "-Ovq","DMswitch-MIB");
+?>
--- a/includes/polling/os/ibmnos.inc.php
+++ b/includes/polling/os/ibmnos.inc.php
@ -28,6 +28,12 @@ if (strpos($sysdescr_value, 'IBM Networking Operating System') !== false) {
        $version = trim(snmp_get($device, ".1.3.6.1.4.1.20301.2.7.13.1.1.1.10.0", "-Ovq") , '" ');
        $serial = trim(snmp_get($device, ".1.3.6.1.4.1.20301.100.100.14.9.0", "-Ovq") , '" ');
    }
+    if (empty($version)) {
+        $version = trim(snmp_get($device, ".1.3.6.1.2.1.47.1.1.1.1.10.1", "-Ovq") , '" ');
+    }
+    if (empty($serial)) {
+        $serial = trim(snmp_get($device, ".1.3.6.1.2.1.47.1.1.1.1.11.1", "-Ovq") , '" ');
+    }
 } elseif (strpos($sysdescr_value, 'IBM Flex System Fabric') !== false) {
    $hardware = str_replace("IBM Flex System Fabric", "", $sysdescr_value);
    $version = trim(snmp_get($device, ".1.3.6.1.2.1.47.1.1.1.1.10.1", "-Ovq") , '" ');
--- a/includes/polling/os/procera.inc.php
+++ b/includes/polling/os/procera.inc.php
@ -0,0 +1,18 @@
+<?php
+
+/*
+ * LibreNMS
+ *
+ * Copyright (c) 2014 Neil Lathwood <https://github.com/laf/ http://www.lathwood.co.uk/fa>
+ *
+ * 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 (stristr($poll_device['sysObjectID'], "packetlogic") || strstr($poll_device['sysObjectID'], "enterprises.15397.2") || strstr($poll_device['sysObjectID'], ".1.3.6.1.4.1.15397.2")) {
+    $version = "PacketLogic";
+    $hardware = "PacketLogic";
+}
--- a/includes/polling/os/vmware.inc.php
+++ b/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["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["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["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["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["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:".$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:".$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:".$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:".$config['mibdir']);

  /*
   * VMware does not return an INTEGER but a STRING of the vmwVmMemSize. This bug
--- a/includes/polling/processors/datacom.inc.php
+++ b/includes/polling/processors/datacom.inc.php
@ -0,0 +1,3 @@
+<?php
+   $proc = snmp_get($device, "swCpuUsage.0", "-Ovq", "DMswitch-MIB");
+?>
--- a/mibs/CISCO-PRODUCTS-MIB
+++ b/mibs/CISCO-PRODUCTS-MIB
@ -3,7 +3,7 @@
 --
 -- January 1995, Jeffrey T. Johnson
 --
-- Copyright (c) 1995-2014 by cisco Systems, Inc.
+-- Copyright (c) 1995-2015 by cisco Systems, Inc.
 -- All rights reserved.
 -- 
 -- *****************************************************************
@ -18,7 +18,7 @@ IMPORTS
 		FROM CISCO-SMI;

 ciscoProductsMIB MODULE-IDENTITY
-	LAST-UPDATED	"201411060000Z"
+	LAST-UPDATED	"201503260000Z"
 	ORGANIZATION	"Cisco Systems, Inc."
 	CONTACT-INFO
 		"       Cisco Systems
@ -35,7 +35,7 @@ ciscoProductsMIB MODULE-IDENTITY
 		"This module defines the object identifiers that are
 		assigned to various hardware platforms, and hence are
 		returned as values for sysObjectID"
-        REVISION "201305280000Z"
+        REVISION "201503250000Z"
        DESCRIPTION
                 "Added following OIDs:
                 ciscoMPX, ciscoNMCUEEC, ciscoWLSE1132, 
@ -1551,7 +1551,7 @@ ciscoNam2320                    OBJECT IDENTIFIER ::= { ciscoProducts 1528 } --
 ciscoNam3                       OBJECT IDENTIFIER ::= { ciscoProducts 1529 } -- Cisco NAM-3 for Catalyst 6500
 cisco819HG4GAK9                 OBJECT IDENTIFIER ::= { ciscoProducts 1530 } -- C819HG-4G-A-K9 Hardened Router with 1 Gigabit Ethernet WAN, 4 Fast Ethernet LAN, 1 AT&T LTE modem, 1 Serial, 1 Console/Aux ports, 256MB flash memory, 512MB DRAM
 ciscoECDS50IVB                  OBJECT IDENTIFIER ::= { ciscoProducts 1536 } -- Cisco Enterprise Content Delivery System Model MDE50IVB
-ciscoVSR1000                    OBJECT IDENTIFIER ::= { ciscoProducts 1537 } -- Cisco Virtual Services Router 1000
+ciscoCSR1000v                   OBJECT IDENTIFIER ::= { ciscoProducts 1537 } -- Cisco Cloud Services Router 1000v
 ciscoASR5000                    OBJECT IDENTIFIER ::= { ciscoProducts 1538 } -- Cisco Systems ASR5000 Intelligent Mobile Gateway
 ciscoflowAgent3000              OBJECT IDENTIFIER ::= { ciscoProducts 1539 } -- Cisco Integrated NetFlow Generation Agent
 ciscoTelePresenceMCU5310       OBJECT IDENTIFIER ::= { ciscoProducts 1540 } -- Cisco TelePresence MCU 5310
@ -1640,6 +1640,7 @@ ciscoAIRAP3602                  OBJECT IDENTIFIER ::= { ciscoProducts 1661 } --
 ciscoAIRAP3601                  OBJECT IDENTIFIER ::= { ciscoProducts 1662 } -- Cisco Aironet 3600 Series WLAN Access Point with one 10/100/1000TX port and single IEEE 802.11n radio port
 ciscoAIRAP1552                  OBJECT IDENTIFIER ::= { ciscoProducts 1664 } -- Cisco Aironet 1550 Series Outdoor Mesh Access Points with dual radio
 ciscoAIRAP1553                  OBJECT IDENTIFIER ::= { ciscoProducts 1665 } -- Cisco Aironet 1550 Series outdoor Mesh Access Points with three radio ports
+ciscoNgsm3k16gepoeplus          OBJECT IDENTIFIER ::= { ciscoProducts 1666 } -- EtherSwitch Next Generation Service Module Layer3 + PoEPlus + 16 10/100/1000
 ciscoNexus1010X                 OBJECT IDENTIFIER ::= { ciscoProducts 1667 } -- Large Virtual service Appliance
 ciscoNexus1110S                 OBJECT IDENTIFIER ::= { ciscoProducts 1668 } -- Gen-2 Base  Virtual service Appliance
 ciscoNexus1110X                 OBJECT IDENTIFIER ::= { ciscoProducts 1669 } -- Gen-2 Large  Virtual service Appliance
@ -1649,6 +1650,8 @@ cisco866VAEWEK9                 OBJECT IDENTIFIER ::= { ciscoProducts 1675 } --
 cisco867VAEWAK9                 OBJECT IDENTIFIER ::= { ciscoProducts 1676 } -- CISCO867VAE-W-A-K9  with 2 GE switch ports, 3 FE switch ports, 1 GE WAN port, 1 multi-mode VDSL2/ ADSL2/ADSL2+ Annex A WAN port, and FCC compliant Wireless LAN
 cisco867VAEWEK9                 OBJECT IDENTIFIER ::= { ciscoProducts 1677 } -- CISCO867VAE-W-E-K9 with 2 GE switch ports, 3 FE switch ports, 1 GE WAN port, 1 multi-mode VDSL2/ ADSL2/ADSL2+ Annex A WAN port, and ETSI compliant Wireless LAN
 cisco867VAEPOEWAK9              OBJECT IDENTIFIER ::= { ciscoProducts 1678 } -- CISCO867VAE-POE-W-A-K9 with 2 GE switch ports, 3 FE switch ports with one port POE, 1 GE WAN port, 1 multi-mode VDSL2/ADSL2/ADSL2+ Annex A WAN port, and FCC compliant Wireless LAN
+ciscoSmES3x24P                  OBJECT IDENTIFIER ::= { ciscoProducts 1679 } -- EtherSwitch Service Module Layer3 24 Gigabit Ethernet port,POE+, MACSec PHY
+ciscoSmDES3x48P                 OBJECT IDENTIFIER ::= { ciscoProducts 1680 } -- EtherSwitch Double Wide Service Module Layer3 48 Gigabit Ethernet port, 2 SFP port, POE+, MACSec PHY
 ciscoOeKWaas                    OBJECT IDENTIFIER ::= { ciscoProducts 1681 } -- Wide Area Application Engine Virtualized Wide Area Application Services instance running on the KVM hypervisor container (KWAAS)
 ciscoUcsC220                    OBJECT IDENTIFIER ::= { ciscoProducts 1682 } -- This one-rack unit (1RU) server offers superior performance and density over a wide range of business workloads, from web serving to distributed database
 ciscoUcsC240                    OBJECT IDENTIFIER ::= { ciscoProducts 1683 } -- This 2RU server is designed for both performance and expandability over a wide range of storage-intensive infrastructure workloads, from big data to collaboration
@ -1656,6 +1659,7 @@ ciscoUcsC22                     OBJECT IDENTIFIER ::= { ciscoProducts 1684 } --
 ciscoUcsC24                     OBJECT IDENTIFIER ::= { ciscoProducts 1685 } -- This 2RU, 2-socket rack server is designed for both outstanding economics and internal expandability over a range of storage-intensive infrastructure workloads, from IT and web infrastructure to big data
 ciscoCDScde2202s4               OBJECT IDENTIFIER ::= { ciscoProducts 1686 } -- Cisco Content Delivery System Model CDE-220-2S4
 ciscoCDScde4604r1               OBJECT IDENTIFIER ::= { ciscoProducts 1687 } -- Cisco Content Delivery System Model CDE-460-4R1
+ciscoASR1002XC                  OBJECT IDENTIFIER ::= { ciscoProducts 1688 } -- Cisco Aggregation Services Router 1000 Series, ASR1002-XC Chassis
 catWsC2960x48fpdL               OBJECT IDENTIFIER ::= { ciscoProducts 1690 } -- Catalyst 2960X 48 Gig Downlinks, 2 SFP+ uplink, 2 x 10G stacking module, POE+ support for 740W
 catWsC2960x48lpdL               OBJECT IDENTIFIER ::= { ciscoProducts 1691 } -- Catalyst 2960X 48 Gig Downlinks, 2 SFP+ uplink, 2 x 10G stacking module, POE+ support for 370W
 catWsC2960x48tdL                OBJECT IDENTIFIER ::= { ciscoProducts 1692 } -- Catalyst 2960X 48 Gig Downlinks, 2 SFP+ uplink, 2 x 10G stacking module
@ -1733,13 +1737,13 @@ ciscoWsC2960XR48LpsI            OBJECT IDENTIFIER ::= { ciscoProducts 1803 } --
 ciscoWsC2960XR48TsI             OBJECT IDENTIFIER ::= { ciscoProducts 1804 } -- Catalyst 2960XR 48 Gig Downlinks and 4 SFP uplinks IP Lite Stackable 
 ciscoWsC2960XR24PsI             OBJECT IDENTIFIER ::= { ciscoProducts 1805 } -- Catalyst 2960XR 24 Gig Downlinks and 4 SFP uplinks IP Lite Stackable with POE support for 370W 
 ciscoWsC2960XR24TsI             OBJECT IDENTIFIER ::= { ciscoProducts 1806 } -- Catalyst 2960XR 24 Gig Downlinks and 4 SFP uplinks IP Lite Stackable 
+ciscoUCSC460M4Rackserver        OBJECT IDENTIFIER ::= { ciscoProducts 1817 } -- 4-Socket 4-RU Cisco UCS Rack Server
 ciscoA901S4SGFD                 OBJECT IDENTIFIER ::= { ciscoProducts 1818 } -- Agora platform - 4 external Ports (4 SFP) + 1 Gland Interface, DC PSU 
 ciscoA901S3SGFD                 OBJECT IDENTIFIER ::= { ciscoProducts 1819 } -- Agora platform - 3 external Ports (3 SFP+1Cu) + 1 Gland Interface, DC PSU 
 ciscoA901S2SGFD                 OBJECT IDENTIFIER ::= { ciscoProducts 1820 } -- Agora platform - 3 external Ports (2 SFP+2Cu) + 1 Gland Interface, DC PSU 
 ciscoA901S3SGFAH                OBJECT IDENTIFIER ::= { ciscoProducts 1821 } -- Agora platform - AC, 3 External Ports (3SFP) + 1 Gland Interface, AC PSU, 1sec holdover for 1 PoE+ 
 ciscoA901S2SGFAH                OBJECT IDENTIFIER ::= { ciscoProducts 1822 } -- Agora platform - AC, 3 External Ports (2 SFP+1 Cu) + 1 Gland Interface, AC PSU, 1sec holdover for 1 PoE+ 
 ciscoIE2000U4STSG               OBJECT IDENTIFIER ::= { ciscoProducts 1839 } -- Cisco Industrial Ethernet 2000U Switch, 4 10/100 SFP + 2 1000 SFP 
-ciscoIE2000U16TCGP              OBJECT IDENTIFIER ::= { ciscoProducts 1840 } -- Cisco Industrial Ethernet 2000U Switch, 16 10/100 T (4 PoE) + 2 1000 T/SFP until Jun 2013, contact kavenkat
 ciscoIE20008T67B                OBJECT IDENTIFIER ::= { ciscoProducts 1841 } -- Cisco IE2000 IP67 Variant Switch with  8 port 10/100 downlink, LAN Base Image  
 ciscoIE200016T67B               OBJECT IDENTIFIER ::= { ciscoProducts 1842 } -- Cisco IE2000 IP67 Variant Switch with  16 port 10/100 downlink, LAN Base Image
 ciscoIE200024T67B               OBJECT IDENTIFIER ::= { ciscoProducts 1843 } -- Cisco IE2000 IP67 Variant Switch with  24 port 10/100 downlink, LAN Base Image
@ -1760,6 +1764,7 @@ ciscoC888K9                     OBJECT IDENTIFIER ::= { ciscoProducts 1857 } --
 ciscoC891FK9                    OBJECT IDENTIFIER ::= { ciscoProducts 1858 } -- C891F-K9 router with 1 Giga Ethernet Primary WAN, 1 SFP (Small Form-factor Pluggable) Giga Ethernet Primary WAN, 1 Fast Ethernet WAN, 1 V.92, 1 ISDN BRI S/T interface, 8 Giga Ethernet LAN, 4 PoE Optional, 1 USB 2.0 port, 1 Console/Aux port, 256MB flash memory and 1GB DRAM 
 ciscoC891FwAK9                  OBJECT IDENTIFIER ::= { ciscoProducts 1859 } -- C891FW-A-K9 router with 1 Giga Ethernet Primary WAN, 1 SFP (Small Form-factor Pluggable) Giga Ethernet Primary WAN, 1 Fast Ethernet WAN, 1 V.92, 1 ISDN BRI S/T interface, 1 Dual 2.4/5GHz with FCC compliant Wireless LAN, 8 Giga Ethernet LAN, 4 PoE Optional, 1 USB 2.0 port, 1 Console/Aux port, 256MB flash memory and 1GB DRAM 
 ciscoC891FwEK9                  OBJECT IDENTIFIER ::= { ciscoProducts 1860 } -- C891FW-E-K9 router with 1 Giga Ethernet Primary WAN, 1 SFP (Small Form-factor Pluggable) Giga Ethernet Primary WAN, 1 Fast Ethernet WAN, 1 V.92, 1 ISDN BRI S/T interface, 1 Dual 2.4/5GHz with EU or ETSI compliant Wireless LAN, 8 Giga Ethernet LAN, 4 PoE Optional, 1 USB 2.0 port, 1 Console/Aux port, 256MB flash memory and 1GB DRAM 
+ciscoASR1001X                   OBJECT IDENTIFIER ::= { ciscoProducts 1861 } -- Cisco Aggregation Services Router 1000 Series, ASR1001-X Chassis
 cisco1783WAP5100xK9             OBJECT IDENTIFIER ::= { ciscoProducts 1862 } -- Cisco Rockwell Industrial Automation Wireless AP 5100, one 10/100/1000 BASE-T, Dual-band autonomous 802.11a/g/n 
 ciscoCDScde2502s5               OBJECT IDENTIFIER ::= { ciscoProducts 1863 } -- Cisco Content Delivery System Model CDE-250-2S5
 ciscoUcsE140S                   OBJECT IDENTIFIER ::= { ciscoProducts 1864 } -- UCS E-Series Server 4-Core Ivy Bridge Single wide Service module (UCS-E140S-M2/K9)
@ -1771,6 +1776,7 @@ ciscoIE2000U4TSG                OBJECT IDENTIFIER ::= { ciscoProducts 1869 } --
 ciscoIE2000U8TCG                OBJECT IDENTIFIER ::= { ciscoProducts 1870 } -- Cisco Industrial Ethernet 2000U Switch, 8 10/100 T + 2 1000 T/SFP 
 ciscoIE2000U16TCG               OBJECT IDENTIFIER ::= { ciscoProducts 1871 } -- Cisco Industrial Ethernet 2000U Switch, 16 10/100 T + 2 100 T + 2 1000 T/SFP 
 ciscoIE2000U16TCGX              OBJECT IDENTIFIER ::= { ciscoProducts 1872 } -- Cisco Conformal coating Industrial Ethernet 2000U Switch, 16 10/100 T + 2 100 T + 2 1000 T/SFP 
+ciscoAIRAP3702                  OBJECT IDENTIFIER ::= { ciscoProducts 1873 } -- Cisco Aironet 3700 Series (IEEE 802.11ac) Access Point
 ciscoAIRAP702                   OBJECT IDENTIFIER ::= { ciscoProducts 1874 } -- Cisco Aironet 702 Series (IEEE 802.11n) Access Point
 ciscoAIRAP1532                  OBJECT IDENTIFIER ::= { ciscoProducts 1875 } -- Cisco Aironet 1530 Series (IEEE 802.11n) Access Point
 ciscoEsxNAM                     OBJECT IDENTIFIER ::= { ciscoProducts 1876 } -- Network Analysis Module running on ESX Hypervisor
@ -1782,14 +1788,19 @@ ciscoC365048PQ                  OBJECT IDENTIFIER ::= { ciscoProducts 1881 } --
 ciscoC365048TQ                  OBJECT IDENTIFIER ::= { ciscoProducts 1882 } -- Cisco Catalyst 3650 48 Port Data 4x10G Uplink
 ciscoASR902                     OBJECT IDENTIFIER ::= { ciscoProducts 1897 } -- Cisco Aggregation Services Router 900 Series with 2RU Chassis
 ciscoME1200                     OBJECT IDENTIFIER ::= { ciscoProducts 1899 } -- Cisco ME 1200 Carrier Ethernet Access Demarcation  Device 
+ciscoVASA                       OBJECT IDENTIFIER ::= { ciscoProducts 1902 } -- Cisco Virtual Adaptive Security Appliance
+ciscoVASASy                     OBJECT IDENTIFIER ::= { ciscoProducts 1903 } -- Cisco Virtual Adaptive Security Appliance System Context
+ciscoVASASc                     OBJECT IDENTIFIER ::= { ciscoProducts 1904 } -- Cisco Virtual Adaptive Security Appliance Security Context
 ciscoN9Kc9508                   OBJECT IDENTIFIER ::= { ciscoProducts 1915 } -- Nexus 9500 series chassis with 8 slots 
 ciscoWapAP702                   OBJECT IDENTIFIER ::= { ciscoProducts 1916 } -- Wireless Access Point 700 
 ciscoWapAP2602                  OBJECT IDENTIFIER ::= { ciscoProducts 1917 } -- Wireless Access Point 2600 
 ciscoWapAP1602                  OBJECT IDENTIFIER ::= { ciscoProducts 1918 } -- Wireless Access Point 1600 
 ciscoN9KC93128TX                OBJECT IDENTIFIER ::= { ciscoProducts 1923 } -- 3RU TOR, 96x10GT+8x40G QSFP 
+ciscoN9KC9396TX                 OBJECT IDENTIFIER ::= { ciscoProducts 1924 } -- 2RU TOR, 48x10GT+12x40G QSFP
 ciscoN9KC9396PX                 OBJECT IDENTIFIER ::= { ciscoProducts 1925 } -- 2RU TOR, 48x10GF+12x40G QSFP 
 ciscoUcsEN120S                  OBJECT IDENTIFIER ::= { ciscoProducts 1931 } -- UCS E-Series Network compute engine 2-Core Service module (UCS-EN120S-M2/K9)
 ciscoC68xxVirtualSwitch         OBJECT IDENTIFIER ::= { ciscoProducts 1934 } -- 68xx Virtual Switch 
+ciscoISR4431                    OBJECT IDENTIFIER ::= { ciscoProducts 1935 } -- Cisco ISR 4431 Router Chassis
 ciscoC6880x                     OBJECT IDENTIFIER ::= { ciscoProducts 1936 } -- Catalyst 6880 chassis 
 ciscoCPT50                      OBJECT IDENTIFIER ::= { ciscoProducts 1937 } -- Cisco Carrier Packet Transport (CPT) 50 
 ciscoCSE340WG32K9               OBJECT IDENTIFIER ::= { ciscoProducts 1940 } -- Cisco Edge 340 Digital Media Player general model,equipped with 32G SSD, WiFi chip, support 2.4G
@ -1827,6 +1838,7 @@ ciscoitpAxpSmSre910                     OBJECT IDENTIFIER ::= { ciscoProducts 19
 ciscoN9Kc9516                           OBJECT IDENTIFIER ::= { ciscoProducts 1996 } -- Nexus 9500 series chassis with 16 slots
 ciscoN9Kc9504                           OBJECT IDENTIFIER ::= { ciscoProducts 1997 } -- Nexus 9500 series chassis with 4 slots
 ciscoDoorCGR1240                        OBJECT IDENTIFIER ::= { ciscoProducts 1998 } -- Cisco Connected Grid Router CGR1240 physical door entity
+ciscoISR4351                            OBJECT IDENTIFIER ::= { ciscoProducts 1999 } -- Cisco ISR 4351 Router
 ciscoWRP500                             OBJECT IDENTIFIER ::= { ciscoProducts 2000 } -- WRP500 is targeted for small business network environments from a Hosted Service Provider
 cisco897VABK9                           OBJECT IDENTIFIER ::= { ciscoProducts 2008 } -- C897VAB-K9 router with 1 VDSL2 withbonding/ADSL2+ WAN , 1 Giga Ethernet WAN, 1 SFP (Small Form-factor Pluggable) Giga Ethernet Primary WAN, 8 Giga Ethernet LAN,4 PoE Optional, 1 USB 2.0 port, 1 Console/Aux port, 256MB flash memory and 1GB DRAM
 cisco819HWDCK9                          OBJECT IDENTIFIER ::= { ciscoProducts 2023 } -- C819HWD-C-K9 Hardened Router with 1 Gigabit Ethernet WAN, 4 Fast Ethernet LAN, 1 Serial, CCC Mark compliant Wireless LAN, 1 Console/Aux ports, 1GB flash memory and 1GB DRAM
@ -1837,6 +1849,32 @@ ciscoIOG910GK9                      OBJECT IDENTIFIER ::= { ciscoProducts 2064 }
 ciscoIOG910K9                       OBJECT IDENTIFIER ::= { ciscoProducts 2065 } -- Programmable IoT Sensor Gateway, 1 Combo (GE/SFP), 1 open slot for 802.15.4 module, 1 slot for external storage
 cat36xxstack                        OBJECT IDENTIFIER ::= { ciscoProducts 2066 } -- A stack of any catalyst36xx stack-able ethernet switches with unified identity (as a single unified switch), control and management
 cat57xxstack                        OBJECT IDENTIFIER ::= { ciscoProducts 2067 } -- A stack of any Wireless LAN 57xx stack-able controllers with unified identity (as a single unified switch), control and management
+ciscoISR4331                        OBJECT IDENTIFIER ::= { ciscoProducts 2068 } -- Cisco ISR 4331 Router
+ciscoIE40004TC4GE          OBJECT IDENTIFIER ::= { ciscoProducts 2069 } -- CISCO IE4000 with 4 FE Combo DL ports, 4 GE combo UL ports, w/FPGA
+ciscoIE40008T4GE           OBJECT IDENTIFIER ::= { ciscoProducts 2070 } -- CISCO IE4000 with 8 FE Copper DL ports, 4 GE combo UL ports, w/FPGA
+ciscoIE40008S4GE           OBJECT IDENTIFIER ::= { ciscoProducts 2071 } -- CISCO IE4000 with 8 FE Fiber DL ports, 4 GE combo UL ports, w/FPGA
+ciscoIE40004T4P4GE         OBJECT IDENTIFIER ::= { ciscoProducts 2072 } -- CISCO IE4000 with 4 FE Copper DL ports + 4 FE Copper DL ports with POE, 4 GE combo UL ports, w/FPGA
+ciscoIE400016T4GE          OBJECT IDENTIFIER ::= { ciscoProducts 2073 } -- CISCO IE4000 with 16 FE Copper DL ports, 4 GE combo UL ports, w/FPGA
+ciscoIE40004S8P4GE         OBJECT IDENTIFIER ::= { ciscoProducts 2074 } -- CISCO IE4000 with 4 FE Fiber DL ports + 8 FE Copper DL ports with POE, 4 GE combo UL ports, w/FPGA
+ciscoIE40008GT4GE          OBJECT IDENTIFIER ::= { ciscoProducts 2075 } -- CISCO IE4000 with 8 GE Copper DL ports, 4 GE combo UL ports, w/FPGA
+ciscoIE40008GS4GE          OBJECT IDENTIFIER ::= { ciscoProducts 2076 } -- CISCO IE4000 with 8 GE Fiber DL ports, 4 GE combo UL ports, w/FPGA
+ciscoIE40004GC4GP4GE       OBJECT IDENTIFIER ::= { ciscoProducts 2077 } -- CISCO IE4000 with 4 GE Combo DL ports + 4 GE Copper DL ports with POE, 4 GE combo UL ports, w/FPGA
+ciscoIE400016GT4GE         OBJECT IDENTIFIER ::= { ciscoProducts 2078 } -- CISCO IE4000 with 16 GE Copper DL ports, 4 GE combo UL ports, w/FPGA
+ciscoIE40008GT8GP4GE       OBJECT IDENTIFIER ::= { ciscoProducts 2079 } -- CISCO IE4000 with 8 GE Copper DL ports + 8 GE Copper DL ports with POE, 4 GE combo UL ports, w/FPGA
+ciscoIE40004GS8GP4GE       OBJECT IDENTIFIER ::= { ciscoProducts 2080 } -- CISCO IE4000 with 4 GE Fiber DL ports + 8 GE Copper DL ports with POE, 4 GE combo UL ports, w/FPGA
+ciscoRAIE1783HMS4C4CGN          OBJECT IDENTIFIER ::= { ciscoProducts 2081 } -- CISCO IE4000 with 4 FE Combo DL ports, 4 GE combo UL ports, w/FPGA
+ciscoRAIE1783HMS8T4CGN          OBJECT IDENTIFIER ::= { ciscoProducts 2082 } -- CISCO IE4000 with 8 FE Copper DL ports, 4 GE combo UL ports, w/FPGA
+ciscoRAIE1783HMS8S4CGN          OBJECT IDENTIFIER ::= { ciscoProducts 2083 } -- CISCO IE4000 with 8 FE Fiber DL ports, 4 GE combo UL ports, w/FPGA
+ciscoRAIE1783HMS4T4E4CGN        OBJECT IDENTIFIER ::= { ciscoProducts 2084 } -- CISCO IE4000 with 4 FE Copper DL ports + 4 FE Copper DL ports with POE, 4 GE combo UL ports, w/FPGA
+ciscoRAIE1783HMS16T4CGN         OBJECT IDENTIFIER ::= { ciscoProducts 2085 } -- CISCO IE4000 with 16 FE Copper DL ports, 4 GE combo UL ports, w/FPGA
+ciscoRAIE1783HMS4S8E4CGN        OBJECT IDENTIFIER ::= { ciscoProducts 2086 } -- CISCO IE4000 with 4 FE Fiber DL ports + 8 FE Copper DL ports with POE, 4 GE combo UL ports, w/FPGA
+ciscoRAIE1783HMS8TG4CGN         OBJECT IDENTIFIER ::= { ciscoProducts 2087 } -- CISCO IE4000 with 8 GE Copper DL ports, 4 GE combo UL ports, w/FPGA
+ciscoRAIE1783HMS8SG4CGN         OBJECT IDENTIFIER ::= { ciscoProducts 2088 } -- CISCO IE4000 with 8 GE Fiber DL ports, 4 GE combo UL ports, w/FPGA
+ciscoRAIE1783HMS4EG8CGN         OBJECT IDENTIFIER ::= { ciscoProducts 2089 } -- CISCO IE4000 with 4 GE Combo DL ports + 4 GE Copper DL ports with POE, 4 GE combo UL ports, w/FPGA
+ciscoRAIE1783HMS16TG4CGN        OBJECT IDENTIFIER ::= { ciscoProducts 2090 } -- CISCO IE4000 with 16 GE Copper DL ports, 4 GE combo UL ports, w/FPGA
+ciscoRAIE1783HMS8TG8EG4CGN      OBJECT IDENTIFIER ::= { ciscoProducts 2091 } -- CISCO IE4000 with 8 GE Copper DL ports + 8 GE Copper DL ports with POE, 4 GE combo UL ports, w/FPGA
+ciscoRAIE1783HMS4SG8EG4CGN      OBJECT IDENTIFIER ::= { ciscoProducts 2092 } -- CISCO IE4000 with 4 GE Fiber DL ports + 8 GE Copper DL ports with POE, 4 GE combo UL ports, w/FPGA
+ciscoISR4321                        OBJECT IDENTIFIER ::= { ciscoProducts 2093 } -- Cisco ISR 4321 Router
 ciscoCSE340G32K9                    OBJECT IDENTIFIER ::= { ciscoProducts 2094 } -- Cisco Edge 340 Digital Media Player none wifi, general model, equipped with 32G SSD
 ciscoCSE340M32K9                    OBJECT IDENTIFIER ::= { ciscoProducts 2095 } -- Cisco Edge 340 Digital Media Player none wifi, DMP model, equipped with 32G SSD
 ciscoSCE10000                       OBJECT IDENTIFIER ::= { ciscoProducts 2096 } -- Cisco service control engine 10000
@ -1848,19 +1886,42 @@ ciscoASR92024TZM                    OBJECT IDENTIFIER ::= { ciscoProducts 2101 }
 ciscoASR92024SZM                    OBJECT IDENTIFIER ::= { ciscoProducts 2102 } -- Cisco ASR920 Series - 24GE Fiber and 4-10GE - Modular PSU  
 ciscoWallander1x1GESKU              OBJECT IDENTIFIER ::= { ciscoProducts 2112 } -- This is a giga-bit ethernet card which can be plugged into host such like ISR4451, this will provide one giga-bit eth interface (both RJ45 and SFP are supported).
 ciscoWallander2x1GESKU              OBJECT IDENTIFIER ::= { ciscoProducts 2113 } -- This is a giga-bit ethernet card which can be plugged into host such like ISR4451, this will provide two giga-bit eth interface (both RJ45 and SFP are supported).
+ciscoASA5506                        OBJECT IDENTIFIER ::= { ciscoProducts 2114 } -- ASA 5506 Adaptive Security Appliance
+ciscoASA5506sc                      OBJECT IDENTIFIER ::= { ciscoProducts 2115 } -- ASA 5506 Adaptive Security Appliance Security Context
+ciscoASA5506sy                      OBJECT IDENTIFIER ::= { ciscoProducts 2116 } -- ASA 5506 Adaptive Security Appliance System Context
+ciscoASA5506K7                      OBJECT IDENTIFIER ::= { ciscoProducts 2123 } -- ASA 5506 Adaptive Security Appliance with No Payload Encryption
+ciscoASA5506K7sc                    OBJECT IDENTIFIER ::= { ciscoProducts 2124 } -- ASA 5506 Adaptive Security Appliance Security Context with No Payload Encryption
+ciscoASA5506K7sy                    OBJECT IDENTIFIER ::= { ciscoProducts 2125 } -- ASA 5506 Adaptive Security Appliance System Context with No Payload Encryption
+ciscoAIRAP1702                      OBJECT IDENTIFIER ::= { ciscoProducts 2129 } --  Cisco Aironet 1700 Series (IEEE 802.11ac) Access Point
+catwsC3560CX12pdS                   OBJECT IDENTIFIER ::= { ciscoProducts 2132 } -- Smirnoff catalyst 3560CX 12x GE downlink, PoE+, 2x CU + 2x 10G SFP+ uplinks
+catwsC3560CX12tcS                   OBJECT IDENTIFIER ::= { ciscoProducts 2133 } -- Smirnoff catalyst 3560CX 12x GE downlink, 2x Copper + 2x SFP uplinks
+catwsC3560CX12pcS                   OBJECT IDENTIFIER ::= { ciscoProducts 2134 } -- Smirnoff catalyst 3560CX 12x GE downlink, PoE+, 2x copper + 2x SFP uplink
+catwsC3560CX8tcS                    OBJECT IDENTIFIER ::= { ciscoProducts 2135 } -- Smirnoff Catalyst 3560CX 8x GE downlink, 2x Copper + 2x SFP uplink
+catwsC3560CX8pcS                    OBJECT IDENTIFIER ::= { ciscoProducts 2136 } -- Smirnoff Catalyst 3560CX 8x GE downlink, PoE+, 2x Copper + 2x SFP uplink
+catwsC2960CX8tcL                    OBJECT IDENTIFIER ::= { ciscoProducts 2137 } -- Smirnoff catalyst 2960CX 8 Gig Downlinks, 2 Copper, 2 SFP uplink
+cisco2911TK9                        OBJECT IDENTIFIER ::= { ciscoProducts 2138 } -- CISCO2911-T/K9 with 3 GE, 4 EHWIC,  1 SM , 256 MB CF, 512 MB DRAM, IPB, extended temperature range from -5 to 60 C
 ciscoSNS3495K9                      OBJECT IDENTIFIER ::= { ciscoProducts 2139 } -- Cisco Secure Network Server platform SNS-3495 appliance
 ciscoSNS3415K9                      OBJECT IDENTIFIER ::= { ciscoProducts 2140 } -- Cisco Secure Network Server platform SNS-3415 appliance
+ciscoAIRAP702w                      OBJECT IDENTIFIER ::= { ciscoProducts 2146 } -- Cisco Aironet 702w (IEEE 802.11n) Series Access Points
+cisco891x24XK9                      OBJECT IDENTIFIER ::= { ciscoProducts 2148 } -- C891-24X Router series with 2 Giga Ethernet WAN Xor'ed with SFP (Small Form-factor Pluggable), 24 Giga Ethernet LAN with 8 PoE 1 USB 2.0 port, 1 Console/Aux port, 256MB flash memory and 512MB/1GB DRAM
 ciscoASR9204SZD                     OBJECT IDENTIFIER ::= { ciscoProducts 2155 } -- Cisco ASR920 Series - 2GE and 4-10GE -DC model
 ciscoASR9208SZ0A                    OBJECT IDENTIFIER ::= { ciscoProducts 2156 } -- Cisco ASR920 Series - 8GE and 4-10GE - Outdoor AC model
 ciscoASR92012CZA                    OBJECT IDENTIFIER ::= { ciscoProducts 2157 } -- Cisco ASR920 Series - 12GE and 2-10GE - AC model
 ciscoASR92012CZD                    OBJECT IDENTIFIER ::= { ciscoProducts 2158 } -- Cisco ASR920 Series - 12GE and 2-10GE - DC model
 ciscoASR9204SZA                     OBJECT IDENTIFIER ::= { ciscoProducts 2159 } -- Cisco ASR920 Series - 2GE and 4-10GE -AC model
 ciscoASR9208SZ0D                    OBJECT IDENTIFIER ::= { ciscoProducts 2160 } -- Cisco ASR920 Series - 8GE and 4-10GE - Outdoor DC model
-ciscoC3850E12XS                     OBJECT IDENTIFIER ::= { ciscoProducts 2162 } -- Cisco Catalyst 3850E 12 Port 10G Fiber Switch
-ciscoC3850E24XS                     OBJECT IDENTIFIER ::= { ciscoProducts 2163 } -- Cisco Catalyst 3850E 24 Port 10G Fiber Switch
-ciscoC3850E48XS                     OBJECT IDENTIFIER ::= { ciscoProducts 2164 } -- Cisco Catalyst 3850E 48 Port 10G Fiber Switch
+ciscoTSCodecG3                      OBJECT IDENTIFIER ::= { ciscoProducts 2161 } -- Cisco Telepresence Generation 3 Codec
+ciscoC385012XS                      OBJECT IDENTIFIER ::= { ciscoProducts 2162 } -- Cisco Catalyst 3850 12 Port 10G Fiber Switch
+ciscoC385024XS                      OBJECT IDENTIFIER ::= { ciscoProducts 2163 } -- Cisco Catalyst 3850 24 Port 10G Fiber Switch
+ciscoC385048XS                      OBJECT IDENTIFIER ::= { ciscoProducts 2164 } -- Cisco Catalyst 3850 48 Port 10G Fiber Switch
 ciscoRAIE1783ZMS4T4E2TGN            OBJECT IDENTIFIER ::= { ciscoProducts 2168 } -- Cisco IE2000 IP67 Variant with  4 port 10/100 downlink, 4 port POE/POE+ downlink, 2 10/100/1000 uplink, w/FPGA, LAN Base Image, PTP and NAT Support
 ciscoRAIE1783ZMS8T8E2TGN            OBJECT IDENTIFIER ::= { ciscoProducts 2169 } -- Cisco IE2000 IP67 Variant with 8 port 10/100 downlink, 8 port POE/POE+ downlink, 2 10/100/1000 uplink, w/FPGA, LAN Base Image, PTP and NAT Support
+ciscoRAIE1783HMS8TG4CGR             OBJECT IDENTIFIER ::= { ciscoProducts 2172 } -- CISCO IE4000 with 8 GE Copper DL ports, 4 GE combo UL ports, w/FPGA
+ciscoRAIE1783HMS8SG4CGR             OBJECT IDENTIFIER ::= { ciscoProducts 2173 } -- CISCO IE4000 with 8 GE Fiber DL ports, 4 GE combo UL ports, w/FPGA
+ciscoRAIE1783HMS4EG8CGR             OBJECT IDENTIFIER ::= { ciscoProducts 2174 } -- CISCO IE4000 with 4 GE Combo DL ports + 4 GE Copper DL ports with POE, 4 GE combo UL ports, w/FPGA
+ciscoRAIE1783HMS16TG4CGR            OBJECT IDENTIFIER ::= { ciscoProducts 2175 } -- CISCO IE4000 with 16 GE Copper DL ports, 4 GE combo UL ports, w/FPGA
+ciscoRAIE1783HMS8TG8EG4CGR          OBJECT IDENTIFIER ::= { ciscoProducts 2176 } -- CISCO IE4000 with 8 GE Copper DL ports + 8 GE Copper DL ports with POE, 4 GE combo UL ports, w/FPGA
+ciscoRAIE1783HMS4SG8EG4CGR          OBJECT IDENTIFIER ::= { ciscoProducts 2177 } -- CISCO IE4000 with 4 GE Fiber DL ports + 8 GE Copper DL ports with POE, 4 GE combo UL ports, w/FPGA
 ciscoUCSC220M4                      OBJECT IDENTIFIER ::= { ciscoProducts 2178 } -- Cisco UCS C220 M4 Rack server
 ciscoUCSC240M4                      OBJECT IDENTIFIER ::= { ciscoProducts 2179 } -- Cisco UCS C240 M4 Rack server
 ciscoUCSC3160                       OBJECT IDENTIFIER ::= { ciscoProducts 2180 } -- Cisco UCS C3160 Rack server
@ -1908,7 +1969,10 @@ ciscoFpSsl2000K9	            OBJECT IDENTIFIER ::= { ciscoProducts 2225  } -- Ci
 ciscoFpSsl8200K9	            OBJECT IDENTIFIER ::= { ciscoProducts 2226  } -- Cisco FirePOWER SSL8200 Appliance, 2U
 ciscoFp7010K9                       OBJECT IDENTIFIER ::= { ciscoProducts 2227  } -- Cisco FirePOWER 7010 Appliance, 1U
 ciscoFp7020K9                       OBJECT IDENTIFIER ::= { ciscoProducts 2228  } -- Cisco FirePOWER 7020 Appliance, 1U 
-
+cisco841Mx4XK9                      OBJECT IDENTIFIER ::= { ciscoProducts 2229 } -- C841M-4X/K9 router with 4GE LAN, 2GE WAN, 2 WIM slots
+cisco841Mx8XK9                      OBJECT IDENTIFIER ::= { ciscoProducts 2230 } --  C841M-8X/K9 router with 8GE LAN, 2GE WAN, 2 WIM slots
+ciscoIR829GWLTEMAAK9                OBJECT IDENTIFIER ::= { ciscoProducts 2248 } -- IR829 Hardened WAN GE 4G LTE secure platform multi-mode Sprint LTE/DoRa  with 802.11n, PoE, FCC compliant
+ciscoPwsX474812X48uE                OBJECT IDENTIFIER ::= { ciscoProducts 2249 } -- Switch 4500E  100/1000/2500/5000/10GBaseT (RJ45)+V E Series with 48 10GbaseT
 END


--- a/mibs/DATA-DMSWITCH.mib
+++ b/mibs/DATA-DMSWITCH.mib
--- a/mibs/DATACOM-REG.mib
+++ b/mibs/DATACOM-REG.mib
--- a/mibs/DATACOM-SMI.mib
+++ b/mibs/DATACOM-SMI.mib
@ -0,0 +1,112 @@
+--
+-- DATACOM Telematica
+-- Copyright 1999-2006 by Datacom Telematica (Teracom Telematica Ltda). All Rights Reserved.
+-- This DATACOM SNMP MIB Specification is Datacom proprietary intellectual property.
+-- 
+-- This module will be extend, as required. The specification and other information 
+-- contained in this document can be modified without prior notice. The user should 
+-- consult Datacom to determine whether any such changes have been done.
+--
+
+DATACOM-SMI        DEFINITIONS ::= BEGIN
+
+
+IMPORTS
+	enterprises
+		FROM RFC1155-SMI;
+
+datacom OBJECT IDENTIFIER ::={ enterprises 3709 }
+-- MODULE-IDENTITY
+--	LAST-UPDATED "9912150000Z"
+--	ORGANIZATION "Datacom Telemática"
+--	CONTACT-INFO 
+--		     "Datacom Telemática
+--		
+--		      Postal: Datacom Telematica
+--			           Av. França, 735
+--			           Navegantes, POA, RS
+--			           CEP 90230-220 
+--			           BRAZIL
+--
+-- 		    Tel:   +55(051)3358-0100
+--	   	    Fax:   +55(051)3358-0101
+--
+-- 		      E-mail: datacom@datacom-telematica.com.br"
+--	DESCRIPTION
+--		" The Structure of Management Information for 
+--      Datacom Telematica enterprise. "
+--
+
+datacomRegistrations	OBJECT IDENTIFIER ::={ datacom 1 }
+ 
+
+datacomGenericMIBs	OBJECT IDENTIFIER ::={ datacom 2 }
+
+
+datacomProductsMIBs	OBJECT IDENTIFIER ::={ datacom 3 }
+
+	
+datacomExperimental	OBJECT IDENTIFIER ::={ datacom 4 }
+
+
+
+
+
+-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
+
+
+-- -- -- -- -- -- -- -- -- -- -- -- -- --
+-- 
+-- datacomRegistration
+-- Register the modules identification of MIBs
+datacomModules		OBJECT IDENTIFIER ::={ datacomRegistrations 1 }
+
+--
+-- Products registration
+-- Register the management cards
+datacomManagementCards 	OBJECT IDENTIFIER ::={ datacomRegistrations 2 }
+
+-- Register the modems
+datacomModems		      OBJECT IDENTIFIER ::={ datacomRegistrations 3 }
+	
+	
+-- Register the data converters.
+datacomAccessDevices		OBJECT IDENTIFIER ::={ datacomRegistrations 5 }
+
+
+
+-- -- -- -- -- -- -- -- -- -- -- -- -- --
+--
+-- datacomProductsMIBs
+
+-- Modem MIBs
+datacomModemsMIBs		OBJECT IDENTIFIER ::={ datacomProductsMIBs 3 }
+	
+-- Access Devices MIBs 
+datacomAccessDevicesMIBs	OBJECT IDENTIFIER ::={ datacomProductsMIBs 5 }
+	
+
+
+
+-- -- -- -- -- -- -- -- -- -- -- -- -- --
+--
+-- datacomExperimental
+
+datacomExpGenericMIBs	OBJECT IDENTIFIER ::={ datacomExperimental 2 }
+
+datacomExpProductsMIBs	OBJECT IDENTIFIER ::={ datacomExperimental 3 }
+
+
+--
+-- datacomExpProductsMIBs
+datacomExpModemsMIBs		        OBJECT IDENTIFIER ::={ datacomExpProductsMIBs 3 }
+
+-- Access Devices MIBs
+datacomExpAccessDevicesMIBs	  OBJECT IDENTIFIER ::={ datacomExpProductsMIBs 5 }
+
+
+END
+
+
+
+
--- a/mibs/OLD-CISCO-CHASSIS-MIB-V1SMI
+++ b/mibs/OLD-CISCO-CHASSIS-MIB-V1SMI
@ -1,4 +1,4 @@
-- MIB file created 11-Nov-2009 11:09:10, by
+-- MIB file created 04-May-2010 14:00:22, by
 --   SMICng version 2.2.11-beta(PRO)(Solaris), January 20, 2001. Enterprise key cisco.com

 OLD-CISCO-CHASSIS-MIB DEFINITIONS ::= BEGIN
@ -587,6 +587,8 @@ chassisType OBJECT-TYPE
        csrp546(779),
        csrp547(780),
        cvs510-fxo(781),
+        c887-gvdsl2(782),
+        c887-srstvdsl2(783),
        c59xx(786),
        cat2960-24-lcs(787),
        cat2960-24-pcs(788),
@ -596,9 +598,18 @@ chassisType OBJECT-TYPE
        cn4kibmeth(793),
        craie1783-rms06t(796),
        craie1783-rms10t(797),
+        cesw-540-8p-k9(798),
+        cesw-520-8p-k9(799),
        cn7kc7009(815),
        cn4kibm-cisco-eth(816),
-        cmwr-2941-dca(817)
+        cmwr-2941-dca(817),
+        c1841ck9(832),
+        c2801ck9(833),
+        c2811ck9(834),
+        c2821ck9(835),
+        c3825ck9(837),
+        c3845ck9(838),
+        c1906ck9(859)
        }
    ACCESS read-only
    STATUS deprecated
@ -1327,6 +1338,8 @@ cardType OBJECT-TYPE
        ubr-mc16u-e(1041),
        ubr-mc28u-e(1042),
        ubr-dtcc(1043),
+        ubr-mc88v(1045),
+        ubr-mc2020(1046),
        gsr-8fe-tx(1050),
        gsr-8fe-fx(1051),
        ssrp-oc48-sm-sr(1052),
@ -1471,6 +1484,15 @@ cardType OBJECT-TYPE
        cpu-1941w-2ge(1260),
        cpu-3825nv-2ge(1261),
        cpu-3845nv-2ge(1262),
+        cpu-3900SPE200-4ge(1269),
+        cpu-3900spe250-4ge(1274),
+        cpu-c1841c-2fe-k9(1277),
+        cpu-c2801c-2fe-k9(1278),
+        cpu-c2811c-2fe-k9(1279),
+        cpu-c2821c-2ge-k9(1280),
+        cpu-c3825c-2ge-k9(1282),
+        cpu-c3845c-2ge-k9(1283),
+        cpu-1906c-k9(1287),
        pos-1oc12(1300),
        p6-ct3(1301),
        ge(1302),
@ -1482,6 +1504,8 @@ cardType OBJECT-TYPE
        srp-oc48-sr(1310),
        srp-oc48-ir(1311),
        atm-4oc3(1313),
+        srp-pos-1oc48-sm-sr(1315),
+        srp-pos-1oc48-sm-lr(1316),
        flashcard-48mb(1317),
        flashcard-128mb(1318),
        p24-ct1e1(1319),
@ -2038,6 +2062,11 @@ cardType OBJECT-TYPE
        pvdm3-256(4374),
        nm-2838(4375),
        pano-2838(4376),
+        vwic3-mft4-t1e1(4379),
+        vwic3-mft1-t1e1(4380),
+        vwic3-mft1-g703(4381),
+        vwic3-mft2-t1e1(4382),
+        vwic3-mft2-g703(4383),
        rsp720Base(4400),
        rsp32GEBase(4401),
        rsp3210GEBase(4402),
@ -2112,6 +2141,7 @@ cardType OBJECT-TYPE
        hwic-1ser(4559),
        hwic-2ser(4560),
        internal-service-module-aim(4561),
+        sm-1nm(4563),
        hwic-4ce1t1-pri(4576),
        dwdm-3268-sfp(4600),
        dwdm-3425-sfp(4601),
@ -2221,8 +2251,22 @@ cardType OBJECT-TYPE
        pwr-cat-2960ac-235w-12v(4779),
        pwr-cat-2960ac-525w-12v(4780),
        pwr-c1941pwr-ac(4781),
+        pwr-c7225-ac(4787),
        mds-ds-x9232x256-k9(4800),
-        mds-ds13-slot-fabric-evia3(4801)
+        mds-ds13-slot-fabric-evia3(4801),
+        mds-ds-x9530-sf2a-k9(4819),
+        hwic-2t-c(4826),
+        hwic-1t-c(4827),
+        hwic-9fes-c(4828),
+        hwic-4fes-c(4829),
+        vwic2-mft1-g703-c(4830),
+        vwic2-mft2-g703-c(4831),
+        nm-16eswitch-c(4832),
+        harddisk-idc(4835),
+        vmss-sm-sre700K9(4840),
+        vmss-sm-sre900K9(4841),
+        iss-sm-sre700K9(4842),
+        iss-sm-sre900K9(4843)
        }
    ACCESS read-only
    STATUS deprecated
--- a/mibs/PACKETLOGIC-MIB
+++ b/mibs/PACKETLOGIC-MIB
--- a/mibs/vmware/VMWARE-CIMOM-MIB
+++ b/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
+
--- a/mibs/vmware/VMWARE-ENV-MIB.mib
+++ b/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.
+
--- a/mibs/vmware/VMWARE-ESX-AGENTCAP-MIB.mib
+++ b/mibs/vmware/VMWARE-ESX-AGENTCAP-MIB.mib
--- a/mibs/vmware/VMWARE-OBSOLETE-MIB.mib
+++ b/mibs/vmware/VMWARE-OBSOLETE-MIB.mib
@ -576,3 +576,4 @@ vmwOldVCNotificationGroup NOTIFICATION-GROUP
       ::= { vmwObsMIBGroups 3 }  

 END
+
--- a/mibs/vmware/VMWARE-PRODUCTS-MIB.mib
+++ b/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
@ -11,7 +11,7 @@ IMPORTS
        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.
+
--- a/mibs/vmware/VMWARE-RESOURCES-MIB.mib
+++ b/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
+
--- a/mibs/vmware/VMWARE-ROOT-MIB.mib
+++ b/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
+
--- a/mibs/vmware/VMWARE-SRM-EVENT-MIB.mib
+++ b/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
+
--- a/mibs/vmware/VMWARE-SYSTEM-MIB.mib
+++ b/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
--- a/mibs/vmware/VMWARE-TC-MIB.mib
+++ b/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
+
--- a/mibs/vmware/VMWARE-VA-AGENTCAP-MIB
+++ b/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
+
+
--- a/mibs/vmware/VMWARE-VC-EVENT-MIB.mib
+++ b/mibs/vmware/VMWARE-VC-EVENT-MIB.mib
@ -249,3 +249,4 @@ vmwVCAlarmNotificationGroup NOTIFICATION-GROUP
    ::= { vmwVCMIBGroups 4 }

 END -- end of VMWARE-VC-EVENT-MIB.
+
--- a/mibs/vmware/VMWARE-VCOPS-EVENT-MIB
+++ b/mibs/vmware/VMWARE-VCOPS-EVENT-MIB
--- a/mibs/vmware/VMWARE-VMINFO-MIB.mib
+++ b/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
@ -36,6 +36,16 @@ DESCRIPTION
      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
    "Add to comments the Managed Object Browser (MOB) URLs which provide 
@ -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.
-                https://esx.example.com/mob/?moid=vmwVmIdx"
+                "No longer provided, use vmwVmIdx. See vmwVmUUID for cross system, 
+                 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.
+