WebApps/Observium_CE
1
0
Fork 0
Code Pull Requests Activity

Commit version 24.12.13800

Browse Source
This commit is contained in:
Chris Hammer
2025-01-06 17:35:06 -05:00
parent b7f6a79c2c
commit 55d9218816
6133 changed files with 4239740 additions and 1374287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,16 +4,16 @@
*
* This file is part of Observium.
*
* @package observium
* @subpackage poller
* @copyright (C) 2006-2013 Adam Armstrong, (C) 2013-2021 Observium Limited
* @package observium
* @subpackage poller
* @copyright (C) Adam Armstrong
*
*/
// Common unix hardware
if (empty($hardware)) {
$hw = is_array($entPhysical) ? $entPhysical['entPhysicalDescr'] : '';
$hardware = rewrite_unix_hardware($poll_device['sysDescr'], $hw);
$hw = is_array($entPhysical) ? $entPhysical['entPhysicalDescr'] : '';
$hardware = rewrite_unix_hardware($poll_device['sysDescr'], $hw);
}
/*
@ -37,26 +37,26 @@ if (empty($hardware)) {
* version: vCenter Server 6.7.0.43000
* features: build-15976714
*/
$oids = [ 'vmwProdName.0', 'vmwProdVersion.0', 'vmwProdBuild.0', 'vmwProdUpdate.0' ];
$oids = ['vmwProdName.0', 'vmwProdVersion.0', 'vmwProdBuild.0', 'vmwProdUpdate.0'];
$data = [];
if (str_icontains_array($poll_device['sysDescr'], [ 'VMware vCenter Server', 'VMware-vCenter-Server-Appliance' ])) {
// Use old method when VCSA detected, does not handle multiple oid request
foreach ($oids as $oid) {
$data = snmp_get_multi_oid($device, $oid, $data, 'VMWARE-SYSTEM-MIB');
}
if (str_icontains_array($poll_device['sysDescr'], ['VMware vCenter Server', 'VMware-vCenter-Server-Appliance'])) {
// Use old method when VCSA detected, does not handle multiple oid request
foreach ($oids as $oid) {
$data = snmp_get_multi_oid($device, $oid, $data, 'VMWARE-SYSTEM-MIB');
}
$type = 'server';
$type = 'server';
} else {
$data = snmp_get_multi_oid($device, $oids, $data, 'VMWARE-SYSTEM-MIB');
$data = snmp_get_multi_oid($device, $oids, $data, 'VMWARE-SYSTEM-MIB');
}
$data = $data[0];
$data = $data[0];
$data['vmwProdName'] = str_replace('-', ' ', $data['vmwProdName']);
$data['vmwProdName'] = str_replace([ 'VMware ', ' Appliance' ], '', $data['vmwProdName']);
$version = $data['vmwProdName'] . ' ' . $data['vmwProdVersion'];
$data['vmwProdName'] = str_replace(['VMware ', ' Appliance'], '', $data['vmwProdName']);
$version = $data['vmwProdName'] . ' ' . $data['vmwProdVersion'];
if ($data['vmwProdUpdate']) {
// Only add update info if update > 0
$version .= ' U' . $data['vmwProdUpdate'];
// Only add update info if update > 0
$version .= ' U' . $data['vmwProdUpdate'];
}
$features = 'build-' . $data['vmwProdBuild'];