tighter

murrant · Apr 26, 2023 · e6d22f0 · e6d22f0
1 parent 1f82607
commit e6d22f0
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/LibreNMS/OS/VmwareEsxi.php b/LibreNMS/OS/VmwareEsxi.php
@@ -53,25 +53,19 @@ public function discoverOS(Device $device): void
         $vm_info = \SnmpQuery::hideMib()->walk('VMWARE-VMINFO-MIB::vmwVmTable');
 
         $vms = $vm_info->mapTable(function ($data, $vmwVmVMID) {
-            $vm_data = [
-                'vm_type' => 'vmware',
-                'vmwVmVMID' => $vmwVmVMID,
-                'vmwVmDisplayName' => $data['vmwVmDisplayName'],
-                'vmwVmGuestOS' => $data['vmwVmGuestOS'],
-                'vmwVmMemSize' => $data['vmwVmMemSize'],
-                'vmwVmCpus' => $data['vmwVmCpus'],
-                'vmwVmState' => PowerState::STATES[$data['vmwVmState']] ?? PowerState::UNKNOWN,
-            ];
+            $data['vm_type'] = 'vmware';
+            $data['vmwVmVMID'] = $vmwVmVMID;
+            $data['vmwVmState'] = PowerState::STATES[$data['vmwVmState']] ?? PowerState::UNKNOWN;
 
             /*
              * If VMware Tools is not running then don't overwrite the GuestOS with the error
              * message, but just leave it as it currently is.
              */
-            if (str_contains($vm_data['vmwVmGuestOS'], 'tools not ')) {
-                unset($vm_data['vmwVmGuestOS']);
+            if (str_contains($data['vmwVmGuestOS'], 'tools not ')) {
+                unset($data['vmwVmGuestOS']);
             }
 
-            return new Vminfo($vm_data);
+            return new Vminfo($data);
         });
 
         ModuleModelObserver::observe(Vminfo::class);