collect OS architecture

Store the information in OPERATINGSYSTEM/ARCH #1819
fusioninventory · Oct 22, 2012 · 25b74cf · 25b74cf
1 parent eadc9ea
commit 25b74cf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/FusionInventory/Agent/Task/Inventory/Input/Win32/OS.pm b/lib/FusionInventory/Agent/Task/Inventory/Input/Win32/OS.pm
@@ -24,7 +24,7 @@ sub doInventory {
             class      => 'Win32_OperatingSystem',
             properties => [ qw/
                 OSLanguage Caption Version SerialNumber Organization \
-                RegisteredUser CSDVersion TotalSwapSpaceSize
+                RegisteredUser CSDVersion TotalSwapSpaceSize OSArchitecture
             / ]
         )) {
 
@@ -65,7 +65,8 @@ sub doInventory {
     #        VERSION       => $OSVersion,
             KERNEL_VERSION => $object->{Version},
             FULL_NAME      => $object->{Caption},
-            SERVICE_PACK   => $object->{CSDVersion}
+            SERVICE_PACK   => $object->{CSDVersion},
+            ARCH          => $object->{OSArchitecture} || 'x86',
         });
     }
 

diff --git a/lib/FusionInventory/Agent/Task/Inventory/Inventory.pm b/lib/FusionInventory/Agent/Task/Inventory/Inventory.pm
@@ -64,7 +64,8 @@ my %fields = (
                              DEFAULTGATEWAY VMSYSTEM WINOWNER WINPRODID
                              WINPRODKEY WINCOMPANY WINLANG CHASSIS_TYPE/ ],
     OPERATINGSYSTEM  => [ qw/KERNEL_NAME KERNEL_VERSION NAME VERSION FULL_NAME 
-                            SERVICE_PACK INSTALL_DATE FQDN DNS_DOMAIN SSH_KEY/ ],
+                            SERVICE_PACK INSTALL_DATE FQDN DNS_DOMAIN SSH_KEY
+                            ARCH/ ],
     ACCESSLOG        => [ qw/USERID LOGDATE/ ],
     VIRTUALMACHINES  => [ qw/MEMORY NAME UUID STATUS SUBSYSTEM VMTYPE VCPU
                              VMID MAC COMMENT OWNER/ ],
@@ -929,6 +930,10 @@ present on systems which use this notion.
 
 The operating system installation date.
 
+=item ARCH
+
+Operating system architecture.
+
 =back
 
 =head2 MONITORS