Pandora FMS Agent Windows inventory fixes

2025-07-28 16:24:54 +02:00 · 2016-02-17 14:16:28 +01:00 · 2016-02-17 14:16:28 +01:00 · e8281ea658
commit e8281ea658
parent 0c6e7164b8
14 changed files with 376 additions and 232 deletions
--- a/pandora_agents/win32/bin/util/architecture.vbs
+++ b/pandora_agents/win32/bin/util/architecture.vbs
@ -2,20 +2,29 @@
 ' (c) 2015 Borja Sanchez <fborja.sanchez@artica.es>
 ' This plugin extends agent inventory feature. Only enterprise version
 ' --------------------------------------------------------------------------
-on error resume next
 'WMI architecture

+strComputer = "."
+Set objWMIService = GetObject("winmgmts:" & "{impersonationLevel=impersonate}!\\" & strComputer & "\root\cimv2")
+Set cols = objWMIService.ExecQuery("Select osarchitecture from Win32_OperatingSystem")

+on error resume next
+flag = cols.Count
+If (err.number <> 0) Then
+  flag = true
+Else
+  flag = false
+End If
+on error goto 0 
+
+'Print only when there's results
+If (NOT flag) Then
 	Wscript.StdOut.WriteLine "<inventory>"
 	Wscript.StdOut.WriteLine "<inventory_module>"
 	Wscript.StdOut.WriteLine "<name>Architecture</name>"
 	Wscript.StdOut.WriteLine "<type><![CDATA[generic_data_string]]></type>"
 	Wscript.StdOut.WriteLine "<datalist>"

-strComputer = "."
-Set objWMIService = GetObject("winmgmts:" & "{impersonationLevel=impersonate}!\\" & strComputer & "\root\cimv2")
-Set cols = objWMIService.ExecQuery("Select osarchitecture from Win32_OperatingSystem")
-
 	For Each data In cols
 	  Wscript.StdOut.WriteLine "<data><![CDATA[" & data.osarchitecture & "]]></data>"
 	Next
@ -23,3 +32,4 @@ Next
 	Wscript.StdOut.WriteLine "</datalist>"
 	Wscript.StdOut.WriteLine "</inventory_module>"
 	Wscript.StdOut.WriteLine "</inventory>"
+End If
--- a/pandora_agents/win32/bin/util/cdromdrives.vbs
+++ b/pandora_agents/win32/bin/util/cdromdrives.vbs
@ -2,19 +2,29 @@
 ' (c) 2015 Borja Sanchez <fborja.sanchez@artica.es>
 ' This plugin extends agent inventory feature. Only enterprise version
 ' --------------------------------------------------------------------------
-on error resume next
 'WMI CD_ROM_drives_info

+strComputer = "."
+Set objWMIService = GetObject("winmgmts:" & "{impersonationLevel=impersonate}!\\" & strComputer & "\root\cimv2")
+Set colCDROMDrives = objWMIService.ExecQuery("Select caption,description,drive,deviceid from win32_CDROMDrive")
+
+on error resume next
+flag = colCDROMDrives.Count
+If (err.number <> 0) Then
+  flag = true
+Else
+  flag = false
+End If
+on error goto 0 
+
+'Print only when there's results
+If (NOT flag) Then
 	Wscript.StdOut.WriteLine "<inventory>"
 	Wscript.StdOut.WriteLine "<inventory_module>"
 	Wscript.StdOut.WriteLine "<name>CDROM</name>"
 	Wscript.StdOut.WriteLine "<type><![CDATA[generic_data_string]]></type>"
 	Wscript.StdOut.WriteLine "<datalist>"

-strComputer = "."
-Set objWMIService = GetObject("winmgmts:" & "{impersonationLevel=impersonate}!\\" & strComputer & "\root\cimv2")
-Set colCDROMDrives = objWMIService.ExecQuery("Select caption,description,drive,deviceid from win32_CDROMDrive")
-
 	For Each cdromd In colCDROMDrives
 	  Wscript.StdOut.WriteLine "<data><![CDATA[" & cdromd.caption _ 
 	    & ";" & cdromd.description _
@ -27,3 +37,4 @@ Wscript.StdOut.WriteLine "</datalist>"
 	Wscript.StdOut.WriteLine "</inventory_module>"
 	Wscript.StdOut.WriteLine "</inventory>"

+End If
--- a/pandora_agents/win32/bin/util/cpuinfo.vbs
+++ b/pandora_agents/win32/bin/util/cpuinfo.vbs
@ -2,19 +2,29 @@
 ' (c) 2015 Borja Sanchez <fborja.sanchez@artica.es>
 ' This plugin extends agent inventory feature. Only enterprise version
 ' --------------------------------------------------------------------------
-on error resume next
 'WMI cpuinfo

+strComputer = "."
+Set objWMIService = GetObject("winmgmts:" & "{impersonationLevel=impersonate}!\\" & strComputer & "\root\cimv2")
+Set colCPUs = objWMIService.ExecQuery("Select name,maxclockspeed,caption from Win32_Processor")
+
+on error resume next
+flag = colCPUs.Count
+If (err.number <> 0) Then
+  flag = true
+Else
+  flag = false
+End If
+on error goto 0 
+
+'Print only when there's results
+If (NOT flag) Then
 	Wscript.StdOut.WriteLine "<inventory>"
 	Wscript.StdOut.WriteLine "<inventory_module>"
 	Wscript.StdOut.WriteLine "<name>CPU</name>"
 	Wscript.StdOut.WriteLine "<type><![CDATA[generic_data_string]]></type>"
 	Wscript.StdOut.WriteLine "<datalist>"

-strComputer = "."
-Set objWMIService = GetObject("winmgmts:" & "{impersonationLevel=impersonate}!\\" & strComputer & "\root\cimv2")
-Set colCPUs = objWMIService.ExecQuery("Select name,maxclockspeed,caption from Win32_Processor")
-
 	For Each cpu In colCPUs
 	  Wscript.StdOut.WriteLine "<data><![CDATA[" & cpu.name & ";" & cpu.maxclockspeed & " MHz;" & cpu.caption & "]]></data>"
 	Next
@ -22,4 +32,4 @@ Next
 	Wscript.StdOut.WriteLine "</datalist>"
 	Wscript.StdOut.WriteLine "</inventory_module>"
 	Wscript.StdOut.WriteLine "</inventory>"
-
+End If
--- a/pandora_agents/win32/bin/util/diskdrives.vbs
+++ b/pandora_agents/win32/bin/util/diskdrives.vbs
@ -2,19 +2,29 @@
 ' (c) 2015 Borja Sanchez <fborja.sanchez@artica.es>
 ' This plugin extends agent inventory feature. Only enterprise version
 ' --------------------------------------------------------------------------
-on error resume next
 'WMI disksinfo

+strComputer = "."
+Set objWMIService = GetObject("winmgmts:" & "{impersonationLevel=impersonate}!\\" & strComputer & "\root\cimv2")
+Set colHDDs = objWMIService.ExecQuery("Select * from win32_diskdrive")
+
+on error resume next
+flag = colHDDs.Count
+If (err.number <> 0) Then
+  flag = true
+Else
+  flag = false
+End If
+on error goto 0 
+
+'Print only when there's results
+If (NOT flag) Then
 	Wscript.StdOut.WriteLine "<inventory>"
 	Wscript.StdOut.WriteLine "<inventory_module>"
 	Wscript.StdOut.WriteLine "<name>HD</name>"
 	Wscript.StdOut.WriteLine "<type><![CDATA[generic_data_string]]></type>"
 	Wscript.StdOut.WriteLine "<datalist>"

-strComputer = "."
-Set objWMIService = GetObject("winmgmts:" & "{impersonationLevel=impersonate}!\\" & strComputer & "\root\cimv2")
-Set colHDDs = objWMIService.ExecQuery("Select * from win32_diskdrive")
-
 	For Each disco In colHDDs
 	  If ((not IsNull(disco.size)) AND (disco.size > 0)) then
 		  Wscript.StdOut.Write "<data><![CDATA[" & disco.caption _ 
@ -31,4 +41,4 @@ Next
 	Wscript.StdOut.WriteLine "</datalist>"
 	Wscript.StdOut.WriteLine "</inventory_module>"
 	Wscript.StdOut.WriteLine "</inventory>"
-
+End If
--- a/pandora_agents/win32/bin/util/domain.vbs
+++ b/pandora_agents/win32/bin/util/domain.vbs
@ -2,24 +2,34 @@
 ' (c) 2015 Borja Sanchez <fborja.sanchez@artica.es>
 ' This plugin extends agent inventory feature. Only enterprise version
 ' --------------------------------------------------------------------------
-on error resume next
 'WMI domain/workgroup info

+strComputer = "."
+Set objWMIService = GetObject("winmgmts:\\" & strComputer & "\root\CIMV2")
+Set colItems = objWMIService.ExecQuery("SELECT Domain FROM Win32_ComputerSystem")

+on error resume next
+flag = colItems.Count
+If (err.number <> 0) Then
+  flag = true
+Else
+  flag = false
+End If
+on error goto 0 
+
+'Print only when there's results
+If (NOT flag) Then
 	Wscript.StdOut.WriteLine "<inventory>"
 	Wscript.StdOut.WriteLine "<inventory_module>"
 	Wscript.StdOut.WriteLine "<name>Domain</name>"
 	Wscript.StdOut.WriteLine "<type><![CDATA[generic_data_string]]></type>"
 	Wscript.StdOut.WriteLine "<datalist>"

-strComputer = "."
-Set objWMIService = GetObject("winmgmts:\\" & strComputer & "\root\CIMV2")
-Set colItems = objWMIService.ExecQuery("SELECT Domain FROM Win32_ComputerSystem")
 	For Each objItem In colItems
 	  WScript.StdOut.WriteLine "<data><![CDATA[" & objItem.Domain & "]]></data>"
 	Next

-
 	Wscript.StdOut.WriteLine "</datalist>"
 	Wscript.StdOut.WriteLine "</inventory_module>"
 	Wscript.StdOut.WriteLine "</inventory>"
+End If
--- a/pandora_agents/win32/bin/util/ifaces.vbs
+++ b/pandora_agents/win32/bin/util/ifaces.vbs
@ -2,7 +2,6 @@
 ' (c) 2015 Borja Sanchez <fborja.sanchez@artica.es>
 ' This plugin extends agent inventory feature. Only enterprise version
 ' --------------------------------------------------------------------------
-on error resume next
 'WMI real interfaces info
 '  exlusions: 
 '     VBox network interfaces
@ -10,12 +9,6 @@ on error resume next
 '
 'nic where "guid is not null and not PNPDeviceID like 'ROOT%'"

-Wscript.StdOut.WriteLine "<inventory>"
-Wscript.StdOut.WriteLine "<inventory_module>"
-Wscript.StdOut.WriteLine "<name>NIC</name>"
-Wscript.StdOut.WriteLine "<type><![CDATA[generic_data_string]]></type>"
-Wscript.StdOut.WriteLine "<datalist>"
-
 strComputer = "."
 Set objWMIService = GetObject("winmgmts:" & "{impersonationLevel=impersonate}!\\" & strComputer & "\root\cimv2")
 Set colAdapters = objWMIService.ExecQuery("Select * from Win32_NetworkAdapter " & _
@ -24,6 +17,23 @@ Set colAdapters = objWMIService.ExecQuery("Select * from Win32_NetworkAdapter "
 						"and not ServiceName is null " & _
 						"and not ServiceName like 'vwifimp' ")

+on error resume next
+flag = colAdapters.Count
+If (err.number <> 0) Then
+  flag = true
+Else
+  flag = false
+End If
+on error goto 0 
+
+'Print only when there's results
+If (NOT flag) Then
+  Wscript.StdOut.WriteLine "<inventory>"
+  Wscript.StdOut.WriteLine "<inventory_module>"
+  Wscript.StdOut.WriteLine "<name>NIC</name>"
+  Wscript.StdOut.WriteLine "<type><![CDATA[generic_data_string]]></type>"
+  Wscript.StdOut.WriteLine "<datalist>"
+
  For Each iface In colAdapters 
  ' return model MACAddress IPAddress

@ -40,3 +50,4 @@ Next
  Wscript.StdOut.WriteLine "</datalist>"
  Wscript.StdOut.WriteLine "</inventory_module>"
  Wscript.StdOut.WriteLine "</inventory>"
+End If
--- a/pandora_agents/win32/bin/util/moboinfo.vbs
+++ b/pandora_agents/win32/bin/util/moboinfo.vbs
@ -2,20 +2,30 @@
 ' (c) 2015 Borja Sanchez <fborja.sanchez@artica.es>
 ' This plugin extends agent inventory feature. Only enterprise version
 ' --------------------------------------------------------------------------
-on error resume next
 'WMI mobo info

-Wscript.StdOut.WriteLine "<inventory>"
-Wscript.StdOut.WriteLine "<inventory_module>"
-Wscript.StdOut.WriteLine "<name>Motherboard</name>"
-Wscript.StdOut.WriteLine "<type><![CDATA[generic_data_string]]></type>"
-Wscript.StdOut.WriteLine "<datalist>"
-
 strComputer = "."
 Set objWMIService = GetObject("winmgmts:" & "{impersonationLevel=impersonate}!\\" & strComputer & "\root\cimv2")
 'Set colMobos = objWMIService.ExecQuery("Select name,product,manufacturer from Win32_baseboard")
 Set colMobos2 = objWMIService.ExecQuery("Select manufacturer,model,OEMStringArray from Win32_computersystem")

+on error resume next
+flag = colItems.Count
+If (err.number <> 0) Then
+  flag = true
+Else
+  flag = false
+End If
+on error goto 0 
+
+'Print only when there's results
+If (NOT flag) Then
+	Wscript.StdOut.WriteLine "<inventory>"
+	Wscript.StdOut.WriteLine "<inventory_module>"
+	Wscript.StdOut.WriteLine "<name>Motherboard</name>"
+	Wscript.StdOut.WriteLine "<type><![CDATA[generic_data_string]]></type>"
+	Wscript.StdOut.WriteLine "<datalist>"
+
 	For Each mobo In colMobos2
 	  Wscript.StdOut.WriteLine "<data><![CDATA[" & mobo.manufacturer & ";" & mobo.model & ";" & mobo.OEMStringArray(0) & "]]></data>"
 	Next
@ -23,4 +33,4 @@ Next
 	Wscript.StdOut.WriteLine "</datalist>"
 	Wscript.StdOut.WriteLine "</inventory_module>"
 	Wscript.StdOut.WriteLine "</inventory>"
-
+End If
--- a/pandora_agents/win32/bin/util/monitors.vbs
+++ b/pandora_agents/win32/bin/util/monitors.vbs
@ -2,19 +2,29 @@
 ' (c) 2015 Borja Sanchez <fborja.sanchez@artica.es>
 ' This plugin extends agent inventory feature. Only enterprise version
 ' --------------------------------------------------------------------------
-on error resume next
 'WMI monitorsinfo

+strComputer = "."
+Set objWMIService = GetObject("winmgmts:" & "{impersonationLevel=impersonate}!\\" & strComputer & "\root\cimv2")
+Set colDisplays = objWMIService.ExecQuery("Select caption,pnpdeviceid from win32_desktopmonitor")
+
+on error resume next
+flag = colDisplays.Count
+If (err.number <> 0) Then
+  flag = true
+Else
+  flag = false
+End If
+on error goto 0 
+
+'Print only when there's results
+If (NOT flag) Then
 	Wscript.StdOut.WriteLine "<inventory>"
 	Wscript.StdOut.WriteLine "<inventory_module>"
 	Wscript.StdOut.WriteLine "<name>Monitors</name>"
 	Wscript.StdOut.WriteLine "<type><![CDATA[generic_data_string]]></type>"
 	Wscript.StdOut.WriteLine "<datalist>"

-strComputer = "."
-Set objWMIService = GetObject("winmgmts:" & "{impersonationLevel=impersonate}!\\" & strComputer & "\root\cimv2")
-Set colDisplays = objWMIService.ExecQuery("Select caption,pnpdeviceid from win32_desktopmonitor")
-
 	For Each display In colDisplays
 	  if (NOT isNull(display.pnpdeviceid)) then
 	    Wscript.StdOut.WriteLine "<data><![CDATA[" & display.caption _ 
@ -26,4 +36,4 @@ Next
 	Wscript.StdOut.WriteLine "</datalist>"
 	Wscript.StdOut.WriteLine "</inventory_module>"
 	Wscript.StdOut.WriteLine "</inventory>"
-
+End If
--- a/pandora_agents/win32/bin/util/osversion.vbs
+++ b/pandora_agents/win32/bin/util/osversion.vbs
@ -2,20 +2,29 @@
 ' (c) 2015 Borja Sanchez <fborja.sanchez@artica.es>
 ' This plugin extends agent inventory feature. Only enterprise version
 ' --------------------------------------------------------------------------
-on error resume next
 'WMI OS version

+strComputer = "."
+Set objWMIService = GetObject("winmgmts:" & "{impersonationLevel=impersonate}!\\" & strComputer & "\root\cimv2")
+Set cols = objWMIService.ExecQuery("SELECT version from win32_operatingsystem")

+on error resume next
+flag = cols.Count
+If (err.number <> 0) Then
+  flag = true
+Else
+  flag = false
+End If
+on error goto 0 
+
+'Print only when there's results
+If (NOT flag) Then
 	Wscript.StdOut.WriteLine "<inventory>"
 	Wscript.StdOut.WriteLine "<inventory_module>"
 	Wscript.StdOut.WriteLine "<name>OSVersion</name>"
 	Wscript.StdOut.WriteLine "<type><![CDATA[generic_data_string]]></type>"
 	Wscript.StdOut.WriteLine "<datalist>"

-strComputer = "."
-Set objWMIService = GetObject("winmgmts:" & "{impersonationLevel=impersonate}!\\" & strComputer & "\root\cimv2")
-Set cols = objWMIService.ExecQuery("SELECT version from win32_operatingsystem")
-
 	For Each data In cols
 	  Wscript.StdOut.WriteLine "<data><![CDATA[" & data.version & "]]></data>"
 	Next
@ -23,3 +32,4 @@ Next
 	Wscript.StdOut.WriteLine "</datalist>"
 	Wscript.StdOut.WriteLine "</inventory_module>"
 	Wscript.StdOut.WriteLine "</inventory>"
+End If
--- a/pandora_agents/win32/bin/util/printers.vbs
+++ b/pandora_agents/win32/bin/util/printers.vbs
@ -2,16 +2,8 @@
 ' (c) 2015 Borja Sanchez <fborja.sanchez@artica.es>
 ' This plugin extends agent inventory feature. Only enterprise version
 ' --------------------------------------------------------------------------
-On Error Resume Next
-
 'WMI printers attached

-Wscript.StdOut.WriteLine "<inventory>"
-Wscript.StdOut.WriteLine "<inventory_module>"
-Wscript.StdOut.WriteLine "<name>Printers</name>"
-Wscript.StdOut.WriteLine "<type><![CDATA[generic_data_string]]></type>"
-Wscript.StdOut.WriteLine "<datalist>"
-
 function validPort(port)
 	if strComp(port,"SHRFAX:") = 0 then
 		validPort = false
@ -31,6 +23,23 @@ end function
 Set oWMI = GetObject("winmgmts:\\" & "." & "\root\cimv2")
 Set colPrinters = oWMI.ExecQuery("Select * from Win32_Printer",,48)

+on error resume next
+flag = colPrinters.Count
+If (err.number <> 0) Then
+  flag = true
+Else
+  flag = false
+End If
+on error goto 0 
+
+'Print only when there's results
+If (NOT flag) Then
+	Wscript.StdOut.WriteLine "<inventory>"
+	Wscript.StdOut.WriteLine "<inventory_module>"
+	Wscript.StdOut.WriteLine "<name>Printers</name>"
+	Wscript.StdOut.WriteLine "<type><![CDATA[generic_data_string]]></type>"
+	Wscript.StdOut.WriteLine "<datalist>"
+
 	For Each objPrinter in colPrinters
 		if validPort (objPrinter.PortName) then
 			set tcp_port_exists = 0
@ -39,10 +48,22 @@ For Each objPrinter in colPrinters
 				objPrinter.DriverName & ";"
 			If (objPrinter.Local) Then
 				Set colPorts = oWMI.ExecQuery("Select HostAddress from Win32_TCPIPPrinterPort where Name like '" & objPrinter.PortName & "'",,48)
+				on error resume next
+				flag = colPorts.Count
+				If (err.number <> 0) Then
+				  flag = true
+				Else
+				  flag = false
+				End If
+				on error goto 0 
+
+				'Print only when there's results
+				If (NOT flag) Then
 					For Each objPort in colPorts
 						tcp_port_exists = 1
 						Wscript.stdOut.Write objPort.HostAddress
 					Next
+				End If
 				If (tcp_port_exists = 0) Then
 					Wscript.stdOut.Write objPrinter.PortName
 				End If
@ -53,7 +74,7 @@ For Each objPrinter in colPrinters
 		end if
 	Next

-
 	Wscript.StdOut.WriteLine "</datalist>"
 	Wscript.StdOut.WriteLine "</inventory_module>"
 	Wscript.StdOut.WriteLine "</inventory>"
+End If
--- a/pandora_agents/win32/bin/util/productID.vbs
+++ b/pandora_agents/win32/bin/util/productID.vbs
@ -3,21 +3,20 @@
 ' (c) 2015 Sancho Lerena <slerena@artica.es>
 ' This plugin extends agent inventory feature. Only enterprise version
 ' ----------------------------------------------------------------
-on error resume next
+
+Set oShell = WScript.CreateObject ("WScript.Shell")
+Set objExec = oShell.Exec("cmd.exe /C wmic os get ""SerialNumber"" | find /v ""SerialNumber"" ")
+
+Do
+    line = objExec.StdOut.ReadLine()
+    s = s & line 
+Loop While Not objExec.Stdout.atEndOfStream

 Wscript.StdOut.WriteLine "<inventory>"
 Wscript.StdOut.WriteLine "<inventory_module>"
 Wscript.StdOut.WriteLine "<name>product_ID</name>"
 Wscript.StdOut.WriteLine "<type><![CDATA[generic_data_string]]></type>"
 Wscript.StdOut.WriteLine "<datalist>"
-
-Set oShell = WScript.CreateObject ("WScript.Shell")
-Set objExec = oShell.Exec("cmd.exe /C wmic os get ""SerialNumber"" | find /v ""SerialNumber"" ")
-Do
-    line = objExec.StdOut.ReadLine()
-    s = s & line 
-Loop While Not objExec.Stdout.atEndOfStream
-
 Wscript.StdOut.WriteLine "<data><![CDATA[" & Replace(Replace(s, chr(013), ""), chr(010), "") & "]]></data>"
 Wscript.StdOut.WriteLine "</datalist>"
 Wscript.StdOut.WriteLine "</inventory_module>"
--- a/pandora_agents/win32/bin/util/productkey.vbs
+++ b/pandora_agents/win32/bin/util/productkey.vbs
@ -4,18 +4,27 @@
 ' This plugin extends agent inventory feature. Only enterprise version
 ' ----------------------------------------------------------------

-on error resume next
+strComputer = "."
+Set objWMIService = GetObject("winmgmts:" & "{impersonationLevel=impersonate}!\\" & strComputer & "\root\cimv2")
+Set colProducts = objWMIService.ExecQuery("Select OA3xOriginalProductKey from SoftwareLicensingService")

+on error resume next
+flag = colProducts.Count
+If (err.number <> 0) Then
+  flag = true
+Else
+  flag = false
+End If
+on error goto 0 
+
+'Print only when there's results
+If (NOT flag) Then
 	Wscript.StdOut.WriteLine "<inventory>"
 	Wscript.StdOut.WriteLine "<inventory_module>"
 	Wscript.StdOut.WriteLine "<name>product_key</name>"
 	Wscript.StdOut.WriteLine "<type><![CDATA[generic_data_string]]></type>"
 	Wscript.StdOut.WriteLine "<datalist>"

-strComputer = "."
-Set objWMIService = GetObject("winmgmts:" & "{impersonationLevel=impersonate}!\\" & strComputer & "\root\cimv2")
-Set colProducts = objWMIService.ExecQuery("Select OA3xOriginalProductKey from SoftwareLicensingService")
-
 	For Each product In colProducts
 	  Wscript.StdOut.WriteLine "<data><![CDATA["  & product.OA3xOriginalProductKey & "]]></data>"
 	Next
@ -23,3 +32,4 @@ Next
 	Wscript.StdOut.WriteLine "</datalist>"
 	Wscript.StdOut.WriteLine "</inventory_module>"
 	Wscript.StdOut.WriteLine "</inventory>"
+End If
--- a/pandora_agents/win32/bin/util/raminfo.vbs
+++ b/pandora_agents/win32/bin/util/raminfo.vbs
@ -2,19 +2,29 @@
 ' (c) 2015 Borja Sanchez <fborja.sanchez@artica.es>
 ' This plugin extends agent inventory feature. Only enterprise version
 ' --------------------------------------------------------------------------
-on error resume next
 'WMI raminfo

+strComputer = "."
+Set objWMIService = GetObject("winmgmts:" & "{impersonationLevel=impersonate}!\\" & strComputer & "\root\cimv2")
+Set colRAMs = objWMIService.ExecQuery("Select deviceLocator,capacity,speed from Win32_PhysicalMemory")
+
+on error resume next
+flag = colRAMs.Count
+If (err.number <> 0) Then
+  flag = true
+Else
+  flag = false
+End If
+on error goto 0 
+
+'Print only when there's results
+If (NOT flag) Then
 	Wscript.StdOut.WriteLine "<inventory>"
 	Wscript.StdOut.WriteLine "<inventory_module>"
 	Wscript.StdOut.WriteLine "<name>RAM</name>"
 	Wscript.StdOut.WriteLine "<type><![CDATA[generic_data_string]]></type>"
 	Wscript.StdOut.WriteLine "<datalist>"

-strComputer = "."
-Set objWMIService = GetObject("winmgmts:" & "{impersonationLevel=impersonate}!\\" & strComputer & "\root\cimv2")
-Set colRAMs = objWMIService.ExecQuery("Select deviceLocator,capacity,speed from Win32_PhysicalMemory")
-
 	For Each ram In colRAMs
 	  Wscript.StdOut.WriteLine "<data><![CDATA[" & ram.deviceLocator _ 
 		& ";" & Abs(Round((ram.capacity/(1024*1024)),2)) & " MB" _
@ -25,4 +35,4 @@ Next
 	Wscript.StdOut.WriteLine "</datalist>"
 	Wscript.StdOut.WriteLine "</inventory_module>"
 	Wscript.StdOut.WriteLine "</inventory>"
-
+End If
--- a/pandora_agents/win32/bin/util/videocardinfo.vbs
+++ b/pandora_agents/win32/bin/util/videocardinfo.vbs
@ -2,27 +2,39 @@
 ' (c) 2015 Borja Sanchez <fborja.sanchez@artica.es>
 ' This plugin extends agent inventory feature. Only enterprise version
 ' --------------------------------------------------------------------------
-on error resume next
 'WMI video_card_info

+strComputer = "."
+Set objWMIService = GetObject("winmgmts:" & "{impersonationLevel=impersonate}!\\" & strComputer & "\root\cimv2")
+Set colVideoCards = objWMIService.ExecQuery("Select caption,AdapterRAM,PNPDeviceID from win32_videocontroller")
+
+on error resume next
+flag = colVideoCards.Count
+If (err.number <> 0) Then
+  flag = true
+Else
+  flag = false
+End If
+on error goto 0 
+
+'Print only when there's results
+If (NOT flag) Then
 	Wscript.StdOut.WriteLine "<inventory>"
 	Wscript.StdOut.WriteLine "<inventory_module>"
 	Wscript.StdOut.WriteLine "<name>Video</name>"
 	Wscript.StdOut.WriteLine "<type><![CDATA[generic_data_string]]></type>"
 	Wscript.StdOut.WriteLine "<datalist>"

-strComputer = "."
-Set objWMIService = GetObject("winmgmts:" & "{impersonationLevel=impersonate}!\\" & strComputer & "\root\cimv2")
-Set colVideoCards = objWMIService.ExecQuery("Select caption,AdapterRAM,PNPDeviceID from win32_videocontroller")
-
 	For Each vcard In colVideoCards
-  Wscript.StdOut.WriteLine "<data><![CDATA["  & vcard.caption _ 
-	& ";" & Round(Abs(vcard.AdapterRAM/(1024*1024)),2) & " MB" _
-	& ";" & vcard.PNPDeviceID _
-	& "]]></data>"
+	  Wscript.StdOut.Write "<data><![CDATA["  & vcard.caption & ";"
+	  on error resume next
+	  Wscript.StdOut.Write Round(Abs(vcard.AdapterRAM/(1024*1024)),2) & " MB"
+	  on error goto 0
+	  Wscript.StdOut.Write ";" & vcard.PNPDeviceID
+	  Wscript.StdOut.WriteLine "]]></data>"
 	Next

 	Wscript.StdOut.WriteLine "</datalist>"
 	Wscript.StdOut.WriteLine "</inventory_module>"
 	Wscript.StdOut.WriteLine "</inventory>"
-
+End If