diff --git a/includes/discovery/os/vrp.inc.php b/includes/discovery/os/vrp.inc.php index 78094fddba..3855fb9039 100644 --- a/includes/discovery/os/vrp.inc.php +++ b/includes/discovery/os/vrp.inc.php @@ -5,6 +5,7 @@ if (!$os) if (stristr($sysDescr, "VRP (R) Software")) { $os = "vrp"; } else if (stristr($sysDescr, "VRP Software Version")) { $os = "vrp"; } else if (stristr($sysDescr, "Software Version VRP")) { $os = "vrp"; } + else if (stristr($sysDescr, "Versatile Routing Platform Software Version")) { $os = "vrp"; } } ?> \ No newline at end of file diff --git a/includes/discovery/temperatures/cisco-envmon.inc.php b/includes/discovery/temperatures/cisco-envmon.inc.php index ccb5dff48e..c4d19967bd 100644 --- a/includes/discovery/temperatures/cisco-envmon.inc.php +++ b/includes/discovery/temperatures/cisco-envmon.inc.php @@ -2,7 +2,7 @@ if (mysql_result(mysql_query("SELECT COUNT(*) FROM `sensors` WHERE `device_id` = '".$device['device_id']."' AND `sensor_class` = 'temperature' AND (`sensor_type` = 'cisco-entity-sensor' OR `sensor_type` = 'entity-sensor')"),0) == "0" && ($device['os_group'] == "cisco")) { - echo("Cisco "); + echo("CISCO-ENVMON-MIB "); $oids = snmp_walk($device, ".1.3.6.1.4.1.9.9.13.1.3.1.2", "-Osqn", "CISCO-ENVMON-MIB"); $oids = str_replace('.1.3.6.1.4.1.9.9.13.1.3.1.2.','',$oids); $oids = trim($oids); diff --git a/includes/discovery/temperatures/lm-sensors.inc.php b/includes/discovery/temperatures/lm-sensors.inc.php index 883a3edac1..e4b05fb458 100644 --- a/includes/discovery/temperatures/lm-sensors.inc.php +++ b/includes/discovery/temperatures/lm-sensors.inc.php @@ -5,7 +5,7 @@ if ($device['os'] == "linux") $oids = snmp_walk($device, "lmTempSensorsDevice", "-Osqn", "LM-SENSORS-MIB"); if ($debug) { echo($oids."\n"); } $oids = trim($oids); - if ($oids) echo("LM-SENSORS "); + if ($oids) echo("LM-SENSORS-MIB "); foreach (explode("\n", $oids) as $data) { $data = trim($data);