nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-28 08:02:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

libvirt VM listing support (qemu/kvm over ssh only for now), renamed vmware table to something a little more generic

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2030 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-04-06 15:25:35 +00:00
parent f55a30f744
commit e3f4361e15
9 changed files with 146 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/print-vm.inc.php
+16 -10
View File
@@ -2,23 +2,29 @@
if (!is_integer($i/2)) { $bg_colour = $list_colour_a; } else { $bg_colour = $list_colour_b; }
echo("<tr bgcolor='$bg_colour'>");
echo('<tr bgcolor="' . $bg_colour . '">');
echo("<td class=list>" . $vm['vmwVmDisplayName'] . "</td>");
echo("<td class=list>" . $vm['vmwVmState'] . "</td>");
echo('<td class="list">' . $vm['vmwVmDisplayName'] . "</td>");
echo('<td class="list">' . $vm['vmwVmState'] . "</td>");
if ($vm['vmwVmGuestOS'] == "E: tools not installed") {
echo("<td class=box-desc>Unknown (VMware Tools not installed)</td>");
if ($vm['vmwVmGuestOS'] == "E: tools not installed")
{
echo('<td class="box-desc">Unknown (VMware Tools not installed)</td>');
}
else if ($vm['vmwVmGuestOS'] == "")
{
echo('<td class="box-desc"><i>(Unknown)</i></td>');
} else {
echo("<td class=list>" . $config['vmware_guestid'][$vm['vmwVmGuestOS']] . "</td>");
echo('<td class="list">' . $config['vmware_guestid'][$vm['vmwVmGuestOS']] . "</td>");
}
if ($vm['vmwVmMemSize'] >= 1024) {
echo("<td class=list>" . $vm['vmwVmMemSize']/1024 . " GB</td>");
if ($vm['vmwVmMemSize'] >= 1024)
{
echo("<td class=list>" . $vm['vmwVmMemSize']/1024 . " GB</td>");
} else {
echo("<td class=list>" . $vm['vmwVmMemSize'] . " MB</td>");
echo("<td class=list>" . $vm['vmwVmMemSize'] . " MB</td>");
}
echo("<td class=list>" . $vm['vmwVmCpus'] . " CPU</td>");
echo('<td class="list">' . $vm['vmwVmCpus'] . " CPU</td>");
?>
html/pages/device.inc.php
+1 -1
View File
@@ -104,7 +104,7 @@ if (device_permitted($_GET['id']) || $check_device == $_GET['id'])
</li>');
}
if (@mysql_result(mysql_query("SELECT COUNT(id) FROM vmware_vminfo WHERE device_id = '" . $device["device_id"] . "'"), 0) > '0')
if (@mysql_result(mysql_query("SELECT COUNT(id) FROM vminfo WHERE device_id = '" . $device["device_id"] . "'"), 0) > '0')
{
echo('<li class="' . $select['vm'] . '">
<a href="'.$config['base_url'].'/device/' . $device['device_id'] . '/vm/">
html/pages/device/vm.inc.php
+1 -1
View File
@@ -3,7 +3,7 @@
echo('<table border="0" cellspacing="0" cellpadding="5" width="100%" class="sortable"><tr class="tablehead"><th>Server Name</th><th>Power Status</th><th>Operating System</th><th>Memory</th><th>CPU</th></tr>');
$i = "1";
$vm_query = mysql_query("SELECT id, vmwVmVMID, vmwVmDisplayName, vmwVmGuestOS, vmwVmMemSize, vmwVmCpus, vmwVmState FROM vmware_vminfo WHERE device_id = '".$device['device_id']."' ORDER BY vmwVmDisplayName");
$vm_query = mysql_query("SELECT id, vmwVmVMID, vmwVmDisplayName, vmwVmGuestOS, vmwVmMemSize, vmwVmCpus, vmwVmState FROM vminfo WHERE device_id = '".$device['device_id']."' ORDER BY vmwVmDisplayName");
while ($vm = mysql_fetch_assoc($vm_query))
{