mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- BUGFIX: getidbyname() did not pass parameters to MySQL correctly.

Browse Source 
- Restructured sysContact and sysLocation "not set" code.
- Do not display "SNMP Location" when empty or unset.


git-svn-id: http://www.observium.org/svn/observer/trunk@2299 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Geert Hauwaerts
2011-05-13 12:28:57 +00:00
parent bc0cdd2415
commit ad1ca375e2
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/includes/dev-overview-data.inc.php
View File

@ -57,7 +57,7 @@ if ($device['location'])
<td class="list-bold">Location</td> <td class="list-bold">Location</td>
<td>' . $device['location']. '</td> <td>' . $device['location']. '</td>
</tr>'); </tr>');
if (get_dev_attrib($device,'override_sysLocation_bool')) if (get_dev_attrib($device,'override_sysLocation_bool') && !empty($device['real_location']))
{ {
echo('<tr> echo('<tr>
<td class="list-bold">SNMP Location</td> <td class="list-bold">SNMP Location</td>

2
includes/common.php
View File

@ -182,7 +182,7 @@ function getifdescrbyid($id)
function getidbyname($domain) function getidbyname($domain)
{ {
return dbFetchCell("SELECT `device_id` FROM `devices` WHERE `hostname` = ?", mres($domain)); return dbFetchCell("SELECT `device_id` FROM `devices` WHERE `hostname` = ?", array($domain));
} }
function gethostosbyid($id) function gethostosbyid($id)

14
includes/polling/os/vmware.inc.php
View File

@ -15,20 +15,6 @@ $data = snmp_get_multi($device, "VMWARE-SYSTEM-MIB::vmwProdName.0 VMWARE-SYSTE
$version = preg_replace("/^VMware /", "", $data[0]["vmwProdName"]) . " " . $data[0]["vmwProdVersion"]; $version = preg_replace("/^VMware /", "", $data[0]["vmwProdName"]) . " " . $data[0]["vmwProdVersion"];
$features = "build-" . $data[0]["vmwProdBuild"]; $features = "build-" . $data[0]["vmwProdBuild"];
/*
* VMware ESXi returns "not set" instead of a NULL value.
*/
if ($sysLocation == "not set")
{
$sysLocation = "";
}
if ($sysContact == "not set")
{
$sysContact = "";
}
/* /*
* CONSOLE: Start the VMware discovery process. * CONSOLE: Start the VMware discovery process.
*/ */

10
includes/polling/system.inc.php
View File

@ -75,6 +75,16 @@
$poll_device['sysLocation'] = str_replace("\"","", $poll_device['sysLocation']); $poll_device['sysLocation'] = str_replace("\"","", $poll_device['sysLocation']);
$poll_device['sysContact'] = str_replace("\"","", $poll_device['sysContact']); $poll_device['sysContact'] = str_replace("\"","", $poll_device['sysContact']);
if ($poll_device['sysLocation'] == "not set")
{
$poll_device['sysLocation'] = "";
}
if ($poll_device['sysContact'] == "not set")
{
$poll_device['sysContact'] = "";
}
if ($poll_device['sysContact'] && $poll_device['sysContact'] != $device['sysContact']) if ($poll_device['sysContact'] && $poll_device['sysContact'] != $device['sysContact'])
{ {
$update_array['sysContact'] = $poll_device['sysContact']; $update_array['sysContact'] = $poll_device['sysContact'];