From 4081ab8a0a8bd4f782680a77005e6166ebb51cdc Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Sat, 28 May 2016 11:18:48 +0200 Subject: [PATCH 1/8] win_setup: Add missing properties We add some basic properties for Windows that are available on other platforms. --- windows/setup.ps1 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/windows/setup.ps1 b/windows/setup.ps1 index 1f1c4a3b07b..37dcf19f1c9 100644 --- a/windows/setup.ps1 +++ b/windows/setup.ps1 @@ -54,6 +54,7 @@ if ($factpath -ne $null) { $win32_os = Get-CimInstance Win32_OperatingSystem $win32_cs = Get-CimInstance Win32_ComputerSystem +$win32_bios = Get-CimInstance Win32_Bios $osversion = [Environment]::OSVersion $capacity = $win32_cs.TotalPhysicalMemory # Win32_PhysicalMemory is empty on some virtual platforms $netcfg = Get-WmiObject win32_NetworkAdapterConfiguration @@ -81,13 +82,21 @@ Set-Attr $result.ansible_facts "ansible_interfaces" $formattednetcfg Set-Attr $result.ansible_facts "ansible_architecture" $win32_os.OSArchitecture -Set-Attr $result.ansible_facts "ansible_hostname" $env:COMPUTERNAME; +# FIXME: Reformat the date to MM/DD/YEAR format +Set-Attr $result.ansible_facts "ansible_bios_date" $win32_bios.ReleaseDate +Set-Attr $result.ansible_facts "ansible_bios_version" $win32_bios.SMBIOSBIOSVersion +Set-Attr $result.ansible_facts "ansible_hostname" $env:COMPUTERNAME Set-Attr $result.ansible_facts "ansible_fqdn" "$([System.Net.Dns]::GetHostByName((hostname)).HostName)" +Set-Attr $result.ansible_facts "ansible_product_name" $win32_cs.Model +Set-Attr $result.ansible_facts "ansible_product_serial" $win32_bios.SerialNumber +Set-Attr $result.ansible_facts "ansible_product_version" $win32_cs.Name Set-Attr $result.ansible_facts "ansible_system" $osversion.Platform.ToString() +Set-Attr $result.ansible_facts "ansible_system_vendor" $win32_cs.Manufacturer Set-Attr $result.ansible_facts "ansible_os_family" "Windows" Set-Attr $result.ansible_facts "ansible_os_name" ($win32_os.Name.Split('|')[0]).Trim() Set-Attr $result.ansible_facts "ansible_distribution" $osversion.VersionString Set-Attr $result.ansible_facts "ansible_distribution_version" $osversion.Version.ToString() +Set-Attr $result.ansible_facts "ansible_windows_domain" $win32_cs.Domain $date = New-Object psobject Set-Attr $date "date" (Get-Date -format d) From 9392851ef72c695d80a4c556566a60e2cc48f3ef Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Sat, 28 May 2016 13:31:44 +0200 Subject: [PATCH 2/8] Format BIOS date string like on Linux --- windows/setup.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/setup.ps1 b/windows/setup.ps1 index 37dcf19f1c9..8465142b4a7 100644 --- a/windows/setup.ps1 +++ b/windows/setup.ps1 @@ -83,7 +83,7 @@ Set-Attr $result.ansible_facts "ansible_interfaces" $formattednetcfg Set-Attr $result.ansible_facts "ansible_architecture" $win32_os.OSArchitecture # FIXME: Reformat the date to MM/DD/YEAR format -Set-Attr $result.ansible_facts "ansible_bios_date" $win32_bios.ReleaseDate +Set-Attr $result.ansible_facts "ansible_bios_date" $win32_bios.ReleaseDate.ToString("MM/dd/yyyy") Set-Attr $result.ansible_facts "ansible_bios_version" $win32_bios.SMBIOSBIOSVersion Set-Attr $result.ansible_facts "ansible_hostname" $env:COMPUTERNAME Set-Attr $result.ansible_facts "ansible_fqdn" "$([System.Net.Dns]::GetHostByName((hostname)).HostName)" From 6225614d5fa73a9182e7b7fa8d8d7d8fa8e00c56 Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Sat, 28 May 2016 13:38:42 +0200 Subject: [PATCH 3/8] Added more properties --- windows/setup.ps1 | 61 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/windows/setup.ps1 b/windows/setup.ps1 index 8465142b4a7..8255b0d0274 100644 --- a/windows/setup.ps1 +++ b/windows/setup.ps1 @@ -55,8 +55,9 @@ if ($factpath -ne $null) { $win32_os = Get-CimInstance Win32_OperatingSystem $win32_cs = Get-CimInstance Win32_ComputerSystem $win32_bios = Get-CimInstance Win32_Bios +$ip_props = [System.Net.NetworkInformation.IPGlobalProperties]::GetIPGlobalProperties() $osversion = [Environment]::OSVersion -$capacity = $win32_cs.TotalPhysicalMemory # Win32_PhysicalMemory is empty on some virtual platforms +$user = [Security.Principal.WindowsIdentity]::GetCurrent() $netcfg = Get-WmiObject win32_NetworkAdapterConfiguration $ActiveNetcfg = @(); $ActiveNetcfg+= $netcfg | where {$_.ipaddress -ne $null} @@ -82,33 +83,66 @@ Set-Attr $result.ansible_facts "ansible_interfaces" $formattednetcfg Set-Attr $result.ansible_facts "ansible_architecture" $win32_os.OSArchitecture -# FIXME: Reformat the date to MM/DD/YEAR format Set-Attr $result.ansible_facts "ansible_bios_date" $win32_bios.ReleaseDate.ToString("MM/dd/yyyy") Set-Attr $result.ansible_facts "ansible_bios_version" $win32_bios.SMBIOSBIOSVersion Set-Attr $result.ansible_facts "ansible_hostname" $env:COMPUTERNAME -Set-Attr $result.ansible_facts "ansible_fqdn" "$([System.Net.Dns]::GetHostByName((hostname)).HostName)" -Set-Attr $result.ansible_facts "ansible_product_name" $win32_cs.Model +Set-Attr $result.ansible_facts "ansible_fqdn" ($ip_props.Hostname + "." + $ip_props.DomainName) +Set-Attr $result.ansible_facts "ansible_processor_count" $win32_cs.NumberOfProcessors +Set-Attr $result.ansible_facts "ansible_processor_vcpus" ($win32_cs.NumberOfLogicalProcessors / $win32_cs.NumberOfProcessors) +Set-Attr $result.ansible_facts "ansible_product_name" $win32_cs.Model.Trim() Set-Attr $result.ansible_facts "ansible_product_serial" $win32_bios.SerialNumber -Set-Attr $result.ansible_facts "ansible_product_version" $win32_cs.Name +Set-Attr $result.ansible_facts "ansible_product_version" ([string] $win32_cs.SystemFamily) Set-Attr $result.ansible_facts "ansible_system" $osversion.Platform.ToString() +Set-Attr $result.ansible_facts "ansible_system_description" ([string] $win32_os.Description) Set-Attr $result.ansible_facts "ansible_system_vendor" $win32_cs.Manufacturer Set-Attr $result.ansible_facts "ansible_os_family" "Windows" Set-Attr $result.ansible_facts "ansible_os_name" ($win32_os.Name.Split('|')[0]).Trim() Set-Attr $result.ansible_facts "ansible_distribution" $osversion.VersionString Set-Attr $result.ansible_facts "ansible_distribution_version" $osversion.Version.ToString() +Set-Attr $result.ansible_facts "ansible_distribution_major_version" $osversion.Version.Major.ToString() +Set-Attr $result.ansible_facts "ansible_kernel" $osversion.Version.ToString() + +Set-Attr $result.ansible_facts "ansible_machine_id" $user.User.AccountDomainSid.Value +Set-Attr $result.ansible_facts "ansible_domain" $ip_props.DomainName +Set-Attr $result.ansible_facts "ansible_nodename" ($ip_props.HostName + "." + $ip_props.DomainName) Set-Attr $result.ansible_facts "ansible_windows_domain" $win32_cs.Domain +Set-Attr $result.ansible_facts "ansible_owner_name" ([string] $win32_cs.PrimaryOwnerName) +Set-Attr $result.ansible_facts "ansible_owner_contact" ([string] $win32_cs.PrimaryOwnerContact) + +Set-Attr $result.ansible_facts "ansible_user_dir" $env:userprofile +Set-Attr $result.ansible_facts "ansible_user_gecos" ([string] $user.Label) +Set-Attr $result.ansible_facts "ansible_user_id" $env:username +Set-Attr $result.ansible_facts "ansible_user_uid" ([int] $user.User.Value.Substring(42)) +Set-Attr $result.ansible_facts "ansible_user_sid" $user.User.Value + +# Use English locale +[System.Threading.Thread]::CurrentThread.CurrentCulture = [System.Globalization.CultureInfo]::GetCultureInfo('en-US') $date = New-Object psobject -Set-Attr $date "date" (Get-Date -format d) -Set-Attr $date "year" (Get-Date -format yyyy) -Set-Attr $date "month" (Get-Date -format MM) -Set-Attr $date "day" (Get-Date -format dd) -Set-Attr $date "hour" (Get-Date -format HH) -Set-Attr $date "minute" (Get-Date -format mm) -Set-Attr $date "iso8601" (Get-Date -format s) +$datetime = (Get-Date) +$datetime_utc = $datetime.ToUniversalTime() +Set-Attr $date "date" $datetime.ToString("yyyy-MM-dd") +Set-Attr $date "day" $datetime.ToString("dd") +Set-Attr $date "epoch" (Get-Date -UFormat "%s") +Set-Attr $date "hour" $datetime.ToString("HH") +Set-Attr $date "iso8601" $datetime_utc.ToString("yyyy-MM-ddTHH:mm:ssZ") +Set-Attr $date "iso8601_basic" $datetime.ToString("yyyyMMddTHHmmssffffff") +Set-Attr $date "iso8601_basic_short" $datetime.ToString("yyyyMMddTHHmmss") +Set-Attr $date "iso8601_micro" $datetime_utc.ToString("yyyy-MM-ddTHH:mm:ss.ffffffZ") +Set-Attr $date "minute" $datetime.ToString("mm") +Set-Attr $date "month" $datetime.ToString("MM") +Set-Attr $date "second" $datetime.ToString("ss") +Set-Attr $date "time" $datetime.ToString("HH:mm:ss") +Set-Attr $date "tz_offset" $datetime.ToString("zzzz") +Set-Attr $date "tz" ([System.TimeZoneInfo]::Local.Id) +Set-Attr $date "weekday" $datetime.ToString("dddd") +Set-Attr $date "weekday_number" (Get-Date -UFormat "%w") +Set-Attr $date "weeknumber" (Get-Date -UFormat "%W") +Set-Attr $date "year" $datetime.ToString("yyyy") Set-Attr $result.ansible_facts "ansible_date_time" $date -Set-Attr $result.ansible_facts "ansible_totalmem" $capacity +Set-Attr $result.ansible_facts "ansible_memtotal_mb" ([math]::round($win32_cs.TotalPhysicalMemory / 1024 / 1024)) +Set-Attr $result.ansible_facts "ansible_swaptotal_mb" ([math]::round($win32_os.TotalSwapSpaceSize / 1024 / 1024)) Set-Attr $result.ansible_facts "ansible_lastboot" $win32_os.lastbootuptime.ToString("u") Set-Attr $result.ansible_facts "ansible_uptime_seconds" $([System.Convert]::ToInt64($(Get-Date).Subtract($win32_os.lastbootuptime).TotalSeconds)) @@ -164,6 +198,7 @@ if ($winrm_cert_expiry) $PendingReboot = Get-PendingRebootStatus Set-Attr $result.ansible_facts "ansible_reboot_pending" $PendingReboot +Set-Attr $result.ansible_facts "module_setup" $true # See if Facter is on the System Path Try { From 30151bfadc03114b5975bb4cafb980f91a525d40 Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Wed, 8 Jun 2016 22:33:50 +0200 Subject: [PATCH 4/8] Added CPU information comparable to Linux --- windows/setup.ps1 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/windows/setup.ps1 b/windows/setup.ps1 index 8255b0d0274..8ee6ccea7ed 100644 --- a/windows/setup.ps1 +++ b/windows/setup.ps1 @@ -55,6 +55,8 @@ if ($factpath -ne $null) { $win32_os = Get-CimInstance Win32_OperatingSystem $win32_cs = Get-CimInstance Win32_ComputerSystem $win32_bios = Get-CimInstance Win32_Bios +$win32_cpu = Get-CimInstance Win32_Processor + $ip_props = [System.Net.NetworkInformation.IPGlobalProperties]::GetIPGlobalProperties() $osversion = [Environment]::OSVersion $user = [Security.Principal.WindowsIdentity]::GetCurrent() @@ -79,6 +81,12 @@ foreach ($adapter in $ActiveNetcfg) $formattednetcfg += $thisadapter;$thisadapter = $null } +$cpu_list = @( ) +for ($i=1; $i -le ($win32_cpu.NumberOfLogicalProcessors / $win32_cs.NumberOfProcessors); $i++) { + $cpu_list += $win32_cpu.Manufacturer + $cpu_list += $win32_cpu.Name +} + Set-Attr $result.ansible_facts "ansible_interfaces" $formattednetcfg Set-Attr $result.ansible_facts "ansible_architecture" $win32_os.OSArchitecture @@ -87,8 +95,11 @@ Set-Attr $result.ansible_facts "ansible_bios_date" $win32_bios.ReleaseDate.ToStr Set-Attr $result.ansible_facts "ansible_bios_version" $win32_bios.SMBIOSBIOSVersion Set-Attr $result.ansible_facts "ansible_hostname" $env:COMPUTERNAME Set-Attr $result.ansible_facts "ansible_fqdn" ($ip_props.Hostname + "." + $ip_props.DomainName) +Set-Attr $result.ansible_facts "ansible_processor" $cpu_list +Set-Attr $result.ansible_facts "ansible_processor_cores" $win32_cpu.NumberOfCores Set-Attr $result.ansible_facts "ansible_processor_count" $win32_cs.NumberOfProcessors -Set-Attr $result.ansible_facts "ansible_processor_vcpus" ($win32_cs.NumberOfLogicalProcessors / $win32_cs.NumberOfProcessors) +Set-Attr $result.ansible_facts "ansible_processor_threads_per_core" ($win32_cpu.NumberOfLogicalProcessors / $win32_cs.NumberOfProcessors / $win32_cpu.NumberOfCores) +Set-Attr $result.ansible_facts "ansible_processor_vcpus" ($win32_cpu.NumberOfLogicalProcessors / $win32_cs.NumberOfProcessors) Set-Attr $result.ansible_facts "ansible_product_name" $win32_cs.Model.Trim() Set-Attr $result.ansible_facts "ansible_product_serial" $win32_bios.SerialNumber Set-Attr $result.ansible_facts "ansible_product_version" ([string] $win32_cs.SystemFamily) @@ -198,6 +209,7 @@ if ($winrm_cert_expiry) $PendingReboot = Get-PendingRebootStatus Set-Attr $result.ansible_facts "ansible_reboot_pending" $PendingReboot + Set-Attr $result.ansible_facts "module_setup" $true # See if Facter is on the System Path From c293f7208a6b069656c0414fa133f274ed54dc29 Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Thu, 9 Jun 2016 00:36:48 +0200 Subject: [PATCH 5/8] Ensure we are using an English locale for date formatting. (as hinted by @nitzmahone) --- windows/setup.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/setup.ps1 b/windows/setup.ps1 index 8ee6ccea7ed..ef881b6516d 100644 --- a/windows/setup.ps1 +++ b/windows/setup.ps1 @@ -128,7 +128,7 @@ Set-Attr $result.ansible_facts "ansible_user_uid" ([int] $user.User.Value.Substr Set-Attr $result.ansible_facts "ansible_user_sid" $user.User.Value # Use English locale -[System.Threading.Thread]::CurrentThread.CurrentCulture = [System.Globalization.CultureInfo]::GetCultureInfo('en-US') +$culture = New-Object System.Globalization.CultureInfo('en-US') $date = New-Object psobject $datetime = (Get-Date) $datetime_utc = $datetime.ToUniversalTime() @@ -146,7 +146,7 @@ Set-Attr $date "second" $datetime.ToString("ss") Set-Attr $date "time" $datetime.ToString("HH:mm:ss") Set-Attr $date "tz_offset" $datetime.ToString("zzzz") Set-Attr $date "tz" ([System.TimeZoneInfo]::Local.Id) -Set-Attr $date "weekday" $datetime.ToString("dddd") +Set-Attr $date "weekday" $datetime.ToString("dddd", $culture) Set-Attr $date "weekday_number" (Get-Date -UFormat "%w") Set-Attr $date "weeknumber" (Get-Date -UFormat "%W") Set-Attr $date "year" $datetime.ToString("yyyy") From ae7efb61e3c1ae6616ff70a9c5326a7445978121 Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Thu, 9 Jun 2016 00:52:22 +0200 Subject: [PATCH 6/8] Retain an important note regarding Win32_PhysicalMemory on virtual platforms --- windows/setup.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/windows/setup.ps1 b/windows/setup.ps1 index ef881b6516d..ebd6f7cc0cd 100644 --- a/windows/setup.ps1 +++ b/windows/setup.ps1 @@ -152,6 +152,7 @@ Set-Attr $date "weeknumber" (Get-Date -UFormat "%W") Set-Attr $date "year" $datetime.ToString("yyyy") Set-Attr $result.ansible_facts "ansible_date_time" $date +# Win32_PhysicalMemory is empty on some virtual platforms Set-Attr $result.ansible_facts "ansible_memtotal_mb" ([math]::round($win32_cs.TotalPhysicalMemory / 1024 / 1024)) Set-Attr $result.ansible_facts "ansible_swaptotal_mb" ([math]::round($win32_os.TotalSwapSpaceSize / 1024 / 1024)) From 913cfb42741e3dd698b7dcad62c4baf72392c919 Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Thu, 9 Jun 2016 12:54:08 +0200 Subject: [PATCH 7/8] Fix ansible_distribution and weekday locale (as hinted by @nitzmahone) --- windows/setup.ps1 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/windows/setup.ps1 b/windows/setup.ps1 index ebd6f7cc0cd..b766ba05358 100644 --- a/windows/setup.ps1 +++ b/windows/setup.ps1 @@ -108,7 +108,7 @@ Set-Attr $result.ansible_facts "ansible_system_description" ([string] $win32_os. Set-Attr $result.ansible_facts "ansible_system_vendor" $win32_cs.Manufacturer Set-Attr $result.ansible_facts "ansible_os_family" "Windows" Set-Attr $result.ansible_facts "ansible_os_name" ($win32_os.Name.Split('|')[0]).Trim() -Set-Attr $result.ansible_facts "ansible_distribution" $osversion.VersionString +Set-Attr $result.ansible_facts "ansible_distribution" $win32_os.Caption Set-Attr $result.ansible_facts "ansible_distribution_version" $osversion.Version.ToString() Set-Attr $result.ansible_facts "ansible_distribution_major_version" $osversion.Version.Major.ToString() Set-Attr $result.ansible_facts "ansible_kernel" $osversion.Version.ToString() @@ -127,8 +127,6 @@ Set-Attr $result.ansible_facts "ansible_user_id" $env:username Set-Attr $result.ansible_facts "ansible_user_uid" ([int] $user.User.Value.Substring(42)) Set-Attr $result.ansible_facts "ansible_user_sid" $user.User.Value -# Use English locale -$culture = New-Object System.Globalization.CultureInfo('en-US') $date = New-Object psobject $datetime = (Get-Date) $datetime_utc = $datetime.ToUniversalTime() @@ -146,7 +144,8 @@ Set-Attr $date "second" $datetime.ToString("ss") Set-Attr $date "time" $datetime.ToString("HH:mm:ss") Set-Attr $date "tz_offset" $datetime.ToString("zzzz") Set-Attr $date "tz" ([System.TimeZoneInfo]::Local.Id) -Set-Attr $date "weekday" $datetime.ToString("dddd", $culture) +# Ensure that the weekday is in English +Set-Attr $date "weekday" $datetime.ToString("dddd", [System.Globalization.CultureInfo]::InvariantCulture) Set-Attr $date "weekday_number" (Get-Date -UFormat "%w") Set-Attr $date "weeknumber" (Get-Date -UFormat "%W") Set-Attr $date "year" $datetime.ToString("yyyy") From 1e1b5c659795aebd3701cf7dad971c9f34300f4f Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Mon, 27 Jun 2016 00:29:14 +0200 Subject: [PATCH 8/8] Comment out $win32_cs.SystemFamily, cfr. @nitzmahone Since it fails on everything pre-10/2016 --- windows/setup.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/setup.ps1 b/windows/setup.ps1 index b766ba05358..8295625aaab 100644 --- a/windows/setup.ps1 +++ b/windows/setup.ps1 @@ -102,7 +102,7 @@ Set-Attr $result.ansible_facts "ansible_processor_threads_per_core" ($win32_cpu. Set-Attr $result.ansible_facts "ansible_processor_vcpus" ($win32_cpu.NumberOfLogicalProcessors / $win32_cs.NumberOfProcessors) Set-Attr $result.ansible_facts "ansible_product_name" $win32_cs.Model.Trim() Set-Attr $result.ansible_facts "ansible_product_serial" $win32_bios.SerialNumber -Set-Attr $result.ansible_facts "ansible_product_version" ([string] $win32_cs.SystemFamily) +#Set-Attr $result.ansible_facts "ansible_product_version" ([string] $win32_cs.SystemFamily) Set-Attr $result.ansible_facts "ansible_system" $osversion.Platform.ToString() Set-Attr $result.ansible_facts "ansible_system_description" ([string] $win32_os.Description) Set-Attr $result.ansible_facts "ansible_system_vendor" $win32_cs.Manufacturer