Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update mk_inventory.vbs to include UBR in Windows OS version #745

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+27 −2
Open

Update mk_inventory.vbs to include UBR in Windows OS version #745

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions agents/windows/plugins/mk_inventory.vbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ End If

Const CMK_VERSION = "2.4.0b1"
CONST HKLM = &H80000002
Set rego = GetObject("WinMgmts:{impersonationLevel=impersonate}!\\.\root\default:StdRegProv")

Dim delay
Dim exePaths
Expand Down Expand Up @@ -121,6 +122,31 @@ Sub getWMIObject2(strClass,arrVars)
Next
End Sub

Sub getOSDetails(arrVars)
Set Entries = objClass.ExecQuery("Select * from Win32_OperatingSystem")
Dim dwValue
strKeyPath = "SOFTWARE\Microsoft\Windows NT\CurrentVersion"
strValueName = "UBR"
intUBRErrCode = rego.GetDWORDValue(HKLM, strKeyPath, strValueName, dwValue)
For Each entry in Entries
strTemp = "A"
For Each label in arrVars
strTemp = strTemp & "|"
For Each item in entry.Properties_
If LCase(item.name) = LCase(label) Then
strTemp = strTemp & item.value
End If
Next
' Modify version field to include UBR
If LCase(label) = "version" and intUBRErrCode = 0 Then
strUBR = CStr(dwValue) ' Convert DWORD to str
strTemp = strTemp & "." & strUBR
End If
Next
outPut(Mid(strTemp,3))
Next
End Sub

Sub getNetworkAdapter(arrVars)
Set objClass = GetObject("winmgmts:{impersonationLevel=impersonate}!\\.\root\cimv2")
Set Entries = objClass.ExecQuery("Select * from Win32_NetworkAdapter")
Expand Down Expand Up @@ -276,7 +302,7 @@ Call getWMIObject("Win32_Processor",cpuVars)
' OS Version
Call startSection("win_os",124,timeUntil)
osVars = Array( "csname", "caption", "version", "OSArchitecture", "servicepackmajorversion", "ServicePackMinorVersion", "InstallDate" )
Call getWMIObject2("Win32_OperatingSystem",osVars)
Call getOSDetails(osVars)

' Memory
'Get-WmiObject Win32_PhysicalMemory -ComputerName $name | select BankLabel,DeviceLocator,Capacity,Manufacturer,PartNumber,SerialNumber,Speed
Expand Down Expand Up @@ -336,7 +362,6 @@ Loop

' Search Registry
Call startSection("win_reg_uninstall",124,timeUntil)
Set rego = GetObject("WinMgmts:{impersonationLevel=impersonate}!\\.\root\default:StdRegProv")
regVars = Array("DisplayName", "Publisher", "InstallLocation", "PSChildName", "DisplayVersion", "EstimatedSize", "InstallDate", "Language")

For Each path in regPaths
Expand Down
Loading