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

Make the parser read in the correct values (at least for my setup)

Browse Source
This commit is contained in:
Alexander Kratzsch
2016-09-29 13:35:14 +02:00
parent 6a876295f0
commit 6fb43d4ee0
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
includes/discovery/libvirt-vminfo.inc.php
View File

@@ -66,10 +66,34 @@ if ($config['enable_libvirt'] == '1' && $device['os'] == 'linux') {
$vmwVmDisplayName = $xml->name;
$vmwVmGuestOS = '';
// libvirt does not supply this
$vmwVmMemSize = ($xml->currentMemory / 1024);
exec($config['virsh'].' -rc '.$uri.' domstate '.$dom_id, $vm_state);
$vmwVmState = ucfirst($vm_state[0]);
$vmwVmCpus = $xml->vcpu;
$vmwVmCpus = null;
$vmwVmMemSize = null;
if ($xml->xpath("//sysinfo/system/entry[@name='manufacturer'][.='oVirt']")) {
d_echo("Parsing information for $vmwVmDisplayName with oVirt quirx");
// oVirt does not fully comply with the example above
switch ($xml->memory['unit']) {
case 'MiB':
$vmwVmMemSize = $xml->memory;
break;
case 'GiB':
$vmwVmMemSize = $xml->memory * 1024;
break;
default:
// includes KiB
$vmwVmMemSize = $xml->memory / 1024;
break;
}
$vmwVmCpus = $xml->vcpu['current'];
if (!isset($vmwVmCpus)) {
$vmwVmCpus = $xml->vcpu;
}
} else {
$vmwVmMemSize = ($xml->currentMemory / 1024);
$vmwVmCpus = $xml->vcpu;
}
// Check whether the Virtual Machine is already known for this host.
$result = dbFetchRow("SELECT * FROM `vminfo` WHERE `device_id` = ? AND `vmwVmVMID` = ? AND `vm_type` = 'libvirt'", array($device['device_id'], $dom_id));