Update VMWare guest IDs (#10338)

63 added others changed
move into Rewrite class
This commit is contained in:
Tony Murray
2019-06-14 22:27:14 -05:00
committed by GitHub
parent 0baeb07754
commit d4017c1428
4 changed files with 170 additions and 111 deletions

View File

@@ -84,9 +84,6 @@ class Config
$macros = json_decode(file_get_contents($install_dir . '/misc/macros.json'), true);
self::set('alert.macros.rule', $macros);
// variable definitions (remove me)
require $install_dir . '/includes/vmware_guestid.inc.php';
// Load user config
@include $install_dir . '/config.php';

View File

@@ -195,4 +195,173 @@ class Rewrite
return $device['hardware'];
}
public static function vmwareGuest($guest_id)
{
$guests = [
'asianux3_64Guest' => 'Asianux Server 3 (64 bit)',
'asianux3Guest' => 'Asianux Server 3',
'asianux4_64Guest' => 'Asianux Server 4 (64 bit)',
'asianux4Guest' => 'Asianux Server 4',
'asianux5_64Guest' => 'Asianux Server 5 (64 bit)',
'asianux7_64Guest' => 'Asianux Server 7 (64 bit)',
'asianux8_64Guest' => 'Asianux Server 8 (64 bit)',
'centos6_64Guest' => 'CentOS 6 (64-bit)',
'centos64Guest' => 'CentOS 4/5 (64-bit)',
'centos6Guest' => 'CentOS 6',
'centos7_64Guest' => 'CentOS 7 (64-bit)',
'centos7Guest' => 'CentOS 7',
'centos8_64Guest' => 'CentOS 8 (64-bit)',
'centosGuest' => 'CentOS 4/5',
'coreos64Guest' => 'CoreOS Linux (64 bit)',
'darwin10_64Guest' => 'Mac OS 10.6 (64 bit)',
'darwin10Guest' => 'Mac OS 10.6',
'darwin11_64Guest' => 'Mac OS 10.7 (64 bit)',
'darwin11Guest' => 'Mac OS 10.7',
'darwin12_64Guest' => 'Mac OS 10.8 (64 bit)',
'darwin13_64Guest' => 'Mac OS 10.9 (64 bit)',
'darwin14_64Guest' => 'Mac OS 10.10 (64 bit)',
'darwin15_64Guest' => 'Mac OS 10.11 (64 bit)',
'darwin16_64Guest' => 'Mac OS 10.12 (64 bit)',
'darwin17_64Guest' => 'macOS 10.13 (64 bit)',
'darwin18_64Guest' => 'macOS 10.14 (64 bit)',
'darwin64Guest' => 'Mac OS 10.5 (64 bit)',
'darwinGuest' => 'Mac OS 10.5',
'debian10_64Guest' => 'Debian GNU/Linux 10 (64 bit)',
'debian10Guest' => 'Debian GNU/Linux 10',
'debian4_64Guest' => 'Debian GNU/Linux 4 (64 bit)',
'debian4Guest' => 'Debian GNU/Linux 4',
'debian5_64Guest' => 'Debian GNU/Linux 5 (64 bit)',
'debian5Guest' => 'Debian GNU/Linux 5',
'debian6_64Guest' => 'Debian GNU/Linux 6 (64 bit)',
'debian6Guest' => 'Debian GNU/Linux 6',
'debian7_64Guest' => 'Debian GNU/Linux 7 (64 bit)',
'debian7Guest' => 'Debian GNU/Linux 7',
'debian8_64Guest' => 'Debian GNU/Linux 8 (64 bit)',
'debian8Guest' => 'Debian GNU/Linux 8',
'debian9_64Guest' => 'Debian GNU/Linux 9 (64 bit)',
'debian9Guest' => 'Debian GNU/Linux 9',
'dosGuest' => 'MS-DOS.',
'eComStation2Guest' => 'eComStation 2.0',
'eComStationGuest' => 'eComStation 1.x',
'fedora64Guest' => 'Fedora Linux (64 bit)',
'fedoraGuest' => 'Fedora Linux',
'freebsd11_64Guest' => 'FreeBSD 11 x64',
'freebsd11Guest' => 'FreeBSD 11',
'freebsd12_64Guest' => 'FreeBSD 12 x64',
'freebsd12Guest' => 'FreeBSD 12',
'freebsd64Guest' => 'FreeBSD x64',
'freebsdGuest' => 'FreeBSD',
'genericLinuxGuest' => 'Other Linux',
'mandrakeGuest' => 'Mandrake Linux',
'mandriva64Guest' => 'Mandriva Linux (64 bit)',
'mandrivaGuest' => 'Mandriva Linux',
'netware4Guest' => 'Novell NetWare 4',
'netware5Guest' => 'Novell NetWare 5.1',
'netware6Guest' => 'Novell NetWare 6.x',
'nld9Guest' => 'Novell Linux Desktop 9',
'oesGuest' => 'Open Enterprise Server',
'openServer5Guest' => 'SCO OpenServer 5',
'openServer6Guest' => 'SCO OpenServer 6',
'opensuse64Guest' => 'OpenSUSE Linux (64 bit)',
'opensuseGuest' => 'OpenSUSE Linux',
'oracleLinux6_64Guest' => 'Oracle 6 (64-bit)',
'oracleLinux64Guest' => 'Oracle Linux 4/5 (64-bit)',
'oracleLinux6Guest' => 'Oracle 6',
'oracleLinux7_64Guest' => 'Oracle 7 (64-bit)',
'oracleLinux7Guest' => 'Oracle 7',
'oracleLinux8_64Guest' => 'Oracle 8 (64-bit)',
'oracleLinuxGuest' => 'Oracle Linux 4/5',
'os2Guest' => 'OS/2',
'other24xLinux64Guest' => 'Linux 2.4x Kernel (64 bit) (experimental)',
'other24xLinuxGuest' => 'Linux 2.4x Kernel',
'other26xLinux64Guest' => 'Linux 2.6x Kernel (64 bit) (experimental)',
'other26xLinuxGuest' => 'Linux 2.6x Kernel',
'other3xLinux64Guest' => 'Linux 3.x Kernel (64 bit)',
'other3xLinuxGuest' => 'Linux 3.x Kernel',
'other4xLinux64Guest' => 'Linux 4.x Kernel (64 bit)',
'other4xLinuxGuest' => 'Linux 4.x Kernel',
'otherGuest' => 'Other Operating System',
'otherGuest64' => 'Other Operating System (64 bit) (experimental)',
'otherLinux64Guest' => 'Linux (64 bit) (experimental)',
'otherLinuxGuest' => 'Linux 2.2x Kernel',
'redhatGuest' => 'Red Hat Linux 2.1',
'rhel2Guest' => 'Red Hat Enterprise Linux 2',
'rhel3_64Guest' => 'Red Hat Enterprise Linux 3 (64 bit)',
'rhel3Guest' => 'Red Hat Enterprise Linux 3',
'rhel4_64Guest' => 'Red Hat Enterprise Linux 4 (64 bit)',
'rhel4Guest' => 'Red Hat Enterprise Linux 4',
'rhel5_64Guest' => 'Red Hat Enterprise Linux 5 (64 bit) (experimental)',
'rhel5Guest' => 'Red Hat Enterprise Linux 5',
'rhel6_64Guest' => 'Red Hat Enterprise Linux 6 (64 bit)',
'rhel6Guest' => 'Red Hat Enterprise Linux 6',
'rhel7_64Guest' => 'Red Hat Enterprise Linux 7 (64 bit)',
'rhel7Guest' => 'Red Hat Enterprise Linux 7',
'rhel8_64Guest' => 'Red Hat Enterprise Linux 8 (64 bit)',
'sjdsGuest' => 'Sun Java Desktop System',
'sles10_64Guest' => 'Suse Linux Enterprise Server 10 (64 bit) (experimental)',
'sles10Guest' => 'Suse linux Enterprise Server 10',
'sles11_64Guest' => 'Suse Linux Enterprise Server 11 (64 bit)',
'sles11Guest' => 'Suse linux Enterprise Server 11',
'sles12_64Guest' => 'Suse Linux Enterprise Server 12 (64 bit)',
'sles12Guest' => 'Suse linux Enterprise Server 12',
'sles15_64Guest' => 'Suse Linux Enterprise Server 15 (64 bit)',
'sles64Guest' => 'Suse Linux Enterprise Server 9 (64 bit)',
'slesGuest' => 'Suse Linux Enterprise Server 9',
'solaris10_64Guest' => 'Solaris 10 (64 bit) (experimental)',
'solaris10Guest' => 'Solaris 10 (32 bit) (experimental)',
'solaris11_64Guest' => 'Solaris 11 (64 bit)',
'solaris6Guest' => 'Solaris 6',
'solaris7Guest' => 'Solaris 7',
'solaris8Guest' => 'Solaris 8',
'solaris9Guest' => 'Solaris 9',
'suse64Guest' => 'Suse Linux (64 bit)',
'suseGuest' => 'Suse Linux',
'turboLinux64Guest' => 'Turbolinux (64 bit)',
'turboLinuxGuest' => 'Turbolinux',
'ubuntu64Guest' => 'Ubuntu Linux (64 bit)',
'ubuntuGuest' => 'Ubuntu Linux',
'unixWare7Guest' => 'SCO UnixWare 7',
'vmkernel5Guest' => 'VMware ESX 5',
'vmkernel65Guest' => 'VMware ESX 6.5',
'vmkernel6Guest' => 'VMware ESX 6',
'vmkernelGuest' => 'VMware ESX 4',
'vmwarePhoton64Guest' => 'VMware Photon (64 bit)',
'win2000AdvServGuest' => 'Windows 2000 Advanced Server',
'win2000ProGuest' => 'Windows 2000 Professional',
'win2000ServGuest' => 'Windows 2000 Server',
'win31Guest' => 'Windows 3.1',
'win95Guest' => 'Windows 95',
'win98Guest' => 'Windows 98',
'windows7_64Guest' => 'Windows 7 (64 bit)',
'windows7Guest' => 'Windows 7',
'windows7Server64Guest' => 'Windows Server 2008 R2 (64 bit)',
'windows8_64Guest' => 'Windows 8 (64 bit)',
'windows8Guest' => 'Windows 8',
'windows8Server64Guest' => 'Windows 8 Server (64 bit)',
'windows9_64Guest' => 'Windows 10 (64 bit)',
'windows9Guest' => 'Windows 10',
'windows9Server64Guest' => 'Windows 10 Server (64 bit)',
'windowsHyperVGuest' => 'Windows Hyper-V',
'winLonghorn64Guest' => 'Windows Longhorn (64 bit) (experimental)',
'winLonghornGuest' => 'Windows Longhorn (experimental)',
'winMeGuest' => 'Windows Millenium Edition',
'winNetBusinessGuest' => 'Windows Small Business Server 2003',
'winNetDatacenter64Guest' => 'Windows Server 2003, Datacenter Edition (64 bit) (experimental)',
'winNetDatacenterGuest' => 'Windows Server 2003, Datacenter Edition',
'winNetEnterprise64Guest' => 'Windows Server 2003, Enterprise Edition (64 bit)',
'winNetEnterpriseGuest' => 'Windows Server 2003, Enterprise Edition',
'winNetStandard64Guest' => 'Windows Server 2003, Standard Edition (64 bit)',
'winNetStandardGuest' => 'Windows Server 2003, Standard Edition',
'winNetWebGuest' => 'Windows Server 2003, Web Edition',
'winNTGuest' => 'Windows NT 4',
'winVista64Guest' => 'Windows Vista (64 bit)',
'winVistaGuest' => 'Windows Vista',
'winXPHomeGuest' => 'Windows XP Home Edition',
'winXPPro64Guest' => 'Windows XP Professional Edition (64 bit)',
'winXPProGuest' => 'Windows XP Professional',
];
return $guests[$guest_id] ?? $guest_id;
}
}

View File

@@ -20,10 +20,8 @@ if ($vm['vmwVmGuestOS'] == 'E: tools not installed') {
echo '<td class="box-desc">Unknown (VMware Tools not installed)</td>';
} elseif ($vm['vmwVmGuestOS'] == '') {
echo '<td class="box-desc"><i>(Unknown)</i></td>';
} elseif (isset($config['vmware_guestid'][$vm['vmwVmGuestOS']])) {
echo '<td class="list">'.$config['vmware_guestid'][$vm['vmwVmGuestOS']].'</td>';
} else {
echo '<td class="list">'.$vm['vmwVmGuestOS'].'</td>';
echo '<td class="list">' . \LibreNMS\Util\Rewrite::vmwareGuest($vm['vmwVmGuestOS']) . '</td>';
}
if ($vm['vmwVmMemSize'] >= 1024) {

View File

@@ -1,105 +0,0 @@
<?php
/*
* Translate the VMware guestId properties to their
* corresponding full OS name.
*/
$config['vmware_guestid']['asianux3_64Guest'] = 'Asianux Server 3 (64 bit)';
$config['vmware_guestid']['asianux3Guest'] = 'Asianux Server 3';
$config['vmware_guestid']['asianux4_64Guest'] = 'Asianux Server 4 (64 bit)';
$config['vmware_guestid']['asianux4Guest'] = 'Asianux Server 4';
$config['vmware_guestid']['centos64Guest'] = 'CentOS 4/5 (64-bit)';
$config['vmware_guestid']['centosGuest'] = 'CentOS 4/5';
$config['vmware_guestid']['darwin64Guest'] = 'Mac OS 10.5 (64 bit)';
$config['vmware_guestid']['darwinGuest'] = 'Mac OS 10.5';
$config['vmware_guestid']['debian4_64Guest'] = 'Debian GNU/Linux 4 (64 bit)';
$config['vmware_guestid']['debian4Guest'] = 'Debian GNU/Linux 4';
$config['vmware_guestid']['debian5_64Guest'] = 'Debian GNU/Linux 5 (64 bit)';
$config['vmware_guestid']['debian5Guest'] = 'Debian GNU/Linux 5';
$config['vmware_guestid']['debian6_64Guest'] = 'Debian GNU/Linux 6 (64 bit)';
$config['vmware_guestid']['debian6Guest'] = 'Debian GNU/Linux 6';
$config['vmware_guestid']['debian7_64Guest'] = 'Debian GNU/Linux 7 (64 bit)';
$config['vmware_guestid']['debian7Guest'] = 'Debian GNU/Linux 7';
$config['vmware_guestid']['debian8_64Guest'] = 'Debian GNU/Linux 8 (64 bit)';
$config['vmware_guestid']['debian8Guest'] = 'Debian GNU/Linux 8';
$config['vmware_guestid']['dosGuest'] = 'MS-DOS.';
$config['vmware_guestid']['eComStationGuest'] = 'eComStation';
$config['vmware_guestid']['freebsd64Guest'] = 'FreeBSD x64';
$config['vmware_guestid']['freebsdGuest'] = 'FreeBSD';
$config['vmware_guestid']['mandriva64Guest'] = 'Mandriva Linux (64 bit)';
$config['vmware_guestid']['mandrivaGuest'] = 'Mandriva Linux';
$config['vmware_guestid']['netware4Guest'] = 'Novell NetWare 4';
$config['vmware_guestid']['netware5Guest'] = 'Novell NetWare 5.1';
$config['vmware_guestid']['netware6Guest'] = 'Novell NetWare 6.x';
$config['vmware_guestid']['nld9Guest'] = 'Novell Linux Desktop 9';
$config['vmware_guestid']['oesGuest'] = 'Open Enterprise Server';
$config['vmware_guestid']['openServer5Guest'] = 'SCO OpenServer 5';
$config['vmware_guestid']['openServer6Guest'] = 'SCO OpenServer 6';
$config['vmware_guestid']['oracleLinux64Guest'] = 'Oracle Linux 4/5 (64-bit)';
$config['vmware_guestid']['oracleLinuxGuest'] = 'Oracle Linux 4/5';
$config['vmware_guestid']['os2Guest'] = 'OS/2';
$config['vmware_guestid']['other24xLinux64Guest'] = 'Linux 2.4x Kernel (64 bit) (experimental)';
$config['vmware_guestid']['other24xLinuxGuest'] = 'Linux 2.4x Kernel';
$config['vmware_guestid']['other26xLinux64Guest'] = 'Linux 2.6x Kernel (64 bit) (experimental)';
$config['vmware_guestid']['other26xLinuxGuest'] = 'Linux 2.6x Kernel';
$config['vmware_guestid']['otherGuest'] = 'Other Operating System';
$config['vmware_guestid']['otherGuest64'] = 'Other Operating System (64 bit) (experimental)';
$config['vmware_guestid']['otherLinux64Guest'] = 'Linux (64 bit) (experimental)';
$config['vmware_guestid']['otherLinuxGuest'] = 'Other Linux';
$config['vmware_guestid']['redhatGuest'] = 'Red Hat Linux 2.1';
$config['vmware_guestid']['rhel2Guest'] = 'Red Hat Enterprise Linux 2';
$config['vmware_guestid']['rhel3_64Guest'] = 'Red Hat Enterprise Linux 3 (64 bit)';
$config['vmware_guestid']['rhel3Guest'] = 'Red Hat Enterprise Linux 3';
$config['vmware_guestid']['rhel4_64Guest'] = 'Red Hat Enterprise Linux 4 (64 bit)';
$config['vmware_guestid']['rhel4Guest'] = 'Red Hat Enterprise Linux 4';
$config['vmware_guestid']['rhel5_64Guest'] = 'Red Hat Enterprise Linux 5 (64 bit) (experimental)';
$config['vmware_guestid']['rhel5Guest'] = 'Red Hat Enterprise Linux 5';
$config['vmware_guestid']['rhel6_64Guest'] = 'Red Hat Enterprise Linux 6 (64 bit)';
$config['vmware_guestid']['rhel6Guest'] = 'Red Hat Enterprise Linux 6';
$config['vmware_guestid']['sjdsGuest'] = 'Sun Java Desktop System';
$config['vmware_guestid']['sles10_64Guest'] = 'Suse Linux Enterprise Server 10 (64 bit) (experimental)';
$config['vmware_guestid']['sles10Guest'] = 'Suse linux Enterprise Server 10';
$config['vmware_guestid']['sles11_64Guest'] = 'Suse Linux Enterprise Server 11 (64 bit)';
$config['vmware_guestid']['sles11Guest'] = 'Suse linux Enterprise Server 11';
$config['vmware_guestid']['sles64Guest'] = 'Suse Linux Enterprise Server 9 (64 bit)';
$config['vmware_guestid']['slesGuest'] = 'Suse Linux Enterprise Server 9';
$config['vmware_guestid']['solaris10_64Guest'] = 'Solaris 10 (64 bit) (experimental)';
$config['vmware_guestid']['solaris10Guest'] = 'Solaris 10 (32 bit) (experimental)';
$config['vmware_guestid']['solaris6Guest'] = 'Solaris 6';
$config['vmware_guestid']['solaris7Guest'] = 'Solaris 7';
$config['vmware_guestid']['solaris8Guest'] = 'Solaris 8';
$config['vmware_guestid']['solaris9Guest'] = 'Solaris 9';
$config['vmware_guestid']['suse64Guest'] = 'Suse Linux (64 bit)';
$config['vmware_guestid']['suseGuest'] = 'Suse Linux';
$config['vmware_guestid']['turboLinux64Guest'] = 'Turbolinux (64 bit)';
$config['vmware_guestid']['turboLinuxGuest'] = 'Turbolinux';
$config['vmware_guestid']['ubuntu64Guest'] = 'Ubuntu Linux (64 bit)';
$config['vmware_guestid']['ubuntuGuest'] = 'Ubuntu Linux';
$config['vmware_guestid']['unixWare7Guest'] = 'SCO UnixWare 7';
$config['vmware_guestid']['win2000AdvServGuest'] = 'Windows 2000 Advanced Server';
$config['vmware_guestid']['win2000ProGuest'] = 'Windows 2000 Professional';
$config['vmware_guestid']['win2000ServGuest'] = 'Windows 2000 Server';
$config['vmware_guestid']['win31Guest'] = 'Windows 3.1';
$config['vmware_guestid']['win95Guest'] = 'Windows 95';
$config['vmware_guestid']['win98Guest'] = 'Windows 98';
$config['vmware_guestid']['windows7_64Guest'] = 'Windows 7 (64 bit)';
$config['vmware_guestid']['windows7Guest'] = 'Windows 7';
$config['vmware_guestid']['windows7Server64Guest'] = 'Windows Server 2008 R2 (64 bit)';
$config['vmware_guestid']['winLonghorn64Guest'] = 'Windows Longhorn (64 bit) (experimental)';
$config['vmware_guestid']['winLonghornGuest'] = 'Windows Longhorn (experimental)';
$config['vmware_guestid']['winMeGuest'] = 'Windows Millenium Edition';
$config['vmware_guestid']['winNetBusinessGuest'] = 'Windows Small Business Server 2003';
$config['vmware_guestid']['winNetDatacenter64Guest'] = 'Windows Server 2003, Datacenter Edition (64 bit) (experimental)';
$config['vmware_guestid']['winNetDatacenterGuest'] = 'Windows Server 2003, Datacenter Edition';
$config['vmware_guestid']['winNetEnterprise64Guest'] = 'Windows Server 2003, Enterprise Edition (64 bit)';
$config['vmware_guestid']['winNetEnterpriseGuest'] = 'Windows Server 2003, Enterprise Edition';
$config['vmware_guestid']['winNetStandard64Guest'] = 'Windows Server 2003, Standard Edition (64 bit)';
$config['vmware_guestid']['winNetStandardGuest'] = 'Windows Server 2003, Standard Edition';
$config['vmware_guestid']['winNetWebGuest'] = 'Windows Server 2003, Web Edition';
$config['vmware_guestid']['winNTGuest'] = 'Windows NT 4';
$config['vmware_guestid']['winVista64Guest'] = 'Windows Vista (64 bit)';
$config['vmware_guestid']['winVistaGuest'] = 'Windows Vista';
$config['vmware_guestid']['winXPHomeGuest'] = 'Windows XP Home Edition';
$config['vmware_guestid']['winXPPro64Guest'] = 'Windows XP Professional Edition (64 bit)';
$config['vmware_guestid']['winXPProGuest'] = 'Windows XP Professional';