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

Modernized Windows Support and documentation update #306

Merged
merged 2 commits into from
May 14, 2024
Merged

Modernized Windows Support and documentation update #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8eba981
Modernized Windows Support and documentation update
yakatz Mar 21, 2024
df7a85f
New Windows facts
yakatz Mar 21, 2024
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
34 changes: 7 additions & 27 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,47 +171,27 @@ FacterDB::get_facts('osfamily=Debian')
| VirtuozzoLinux 7 | | | | | | | | | | | | | | | | | | | | | | | 1 | | | | | | | | |
| Windows 7 | | | | 1 | 1 | 1 | 2 | 1 | 2 | 2 | | 1 | 1 | 1 | 1 | 1 | 1 | | | | | | | | | | | | | | |
| Windows 8.1 | | | | 1 | 1 | 1 | 1 | 1 | 1 | 1 | | 1 | 1 | 1 | 1 | 1 | 1 | | | | | | | | | | | | | | |
| Windows 10 | | | | 2 | 2 | 2 | 2 | 2 | 2 | 2 | | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | | | 1 | 1 | 1 | | | |
| Windows 10 | | | | 2 | 2 | 2 | 2 | 2 | 2 | 2 | | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | 2 | | | 1 | 1 | 1 | | 1 | 1 |
| Windows Server 2008 | | | | 1 | 1 | 1 | 1 | 1 | 1 | 1 | | 1 | 1 | 1 | 1 | 1 | 1 | | | | | | | | | | | | | | |
| Windows Server 2008 R2 | | | | 1 | 1 | 1 | 1 | 1 | 1 | 1 | | 1 | 1 | 1 | 1 | 1 | 1 | | | | | | | | | | | | | | |
| Windows Server 2012 | | | | 1 | 1 | 1 | 1 | 1 | 1 | 1 | | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | | | 1 | 1 | 1 | | | |
| Windows Server 2012 R2 | | | | 1 | 1 | 1 | 2 | 1 | 1 | 1 | | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | | | 1 | 1 | 1 | | | |
| Windows Server 2012 R2 Core | | | | 1 | 1 | 1 | 1 | 1 | 1 | 1 | | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | | | | | | | | |
| Windows Server 2016 | | | | 1 | 1 | 1 | 1 | 1 | 1 | 1 | | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | | | 1 | 1 | 1 | | | |
| Windows Server 2016 Core | | | | | | | | | | | | | | | | | | | | | | | | | | 1 | 1 | 1 | | | |
| Windows Server 2019 | | | | | | | | 1 | 1 | 1 | | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | | | 1 | 1 | 1 | | | |
| Windows Server 2019 | | | | | | | | 1 | 1 | 1 | | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | | | 1 | 1 | 1 | | 1 | 1 |
| Windows Server 2019 Core | | | | | | | | | | | | | | | | | | | | | | | | | | 1 | 1 | 1 | | | |
| Windows Server 2022 | | | | | | | | | | | | | | | | | | | | | | | | | | 1 | 1 | 1 | | 1 | 1 |
| Windows Server 2022 Core | | | | | | | | | | | | | | | | | | | | | | | | | | 1 | 1 | 1 | | | |
| openSUSE 15 | | | | | | | | | | | | | | | | | | | | | | | | 1 | 1 | 1 | 1 | 1 | 1 | | |
| windows 11 | | | | | | | | | | | | | | | | | | | | | | | | | | 1 | 1 | 1 | | | |
| windows 2022 | | | | | | | | | | | | | | | | | | | | | | | | | | 1 | 1 | 1 | | | |
| windows 11 | | | | | | | | | | | | | | | | | | | | | | | | | | 1 | 1 | 1 | | 1 | 1 |

Where the number (1, 2 etc.) are the number of factsets for that OS and facter combination (e.g., x86_64 and i386 architectures).

## Add new Operating System support

There is `Vagrantfile` to automagically populate `facts` directory by spawning a new VM and launches a provisioning scripts.

```
$ cd facts
$ vagrant up --provision
```

Create i386 facts from x86_64's ones

```
for file in facts/*/*-x86_64.facts; do cat $file | sed -e 's/x86_64/i386/' -e 's/amd64/i386/' > $(echo $file | sed 's/x86_64/i386/'); done
```
Create RedHat, Scientific, OracleLinux facts from CentOS's ones

```
$ bundle exec rake rhel_alts
```

Then update the table in this README by running `bundle exec rake table`

*NOTE*: When using Facter version 4, by default some "legacy facts" are hidden from the output.
To generate a fact set with the legacy facts use the command `puppet facts show --show-legacy`
There is `Vagrantfile` to automagically populate `facts` for all supported operating systems by spawning a new VM and launches a provisioning scripts.
Details of how to generate facts for each operating system are [here](facts/README.md).

## Supplying custom external facts

Expand Down Expand Up @@ -306,7 +286,7 @@ powershell> $ENV:FACTERDB_INJECT_SOURCE = 'true'

# Contributing

Please submit issues at https://github.com/camptocamp/facterdb/issues or PRs in the same repository.
Please submit issues at https://github.com/voxpupuli/facterdb/issues or PRs in the same repository.

## Release process

Expand Down
2 changes: 2 additions & 0 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ def factset_to_os_label(fs)
'2016')}"
elsif /windows-2019/.match?(db_filename)
'Windows Server 2019'
elsif /windows-2022/.match?(db_filename)
'Windows Server 2022'
else
"#{os_name} #{os__rel}"
end
Expand Down
169 changes: 107 additions & 62 deletions facts/4.3/windows-10-x86_64.facts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"aio_agent_version": "7.24.0",
"architecture": "x64",
"dhcp_servers": {
"Ethernet": "168.63.129.16",
"system": "168.63.129.16"
"Ethernet": "10.0.2.2",
"system": "10.0.2.2"
},
"dmi": {
"manufacturer": "American Megatrends Inc.",
"manufacturer": "innotek GmbH",
"product": {
"name": "Virtual Machine",
"serial_number": "0000-0009-6402-6941-5339-5438-01",
"uuid": "85C91DF4-F860-4CF9-BEEB-2371A5318681"
"name": "VirtualBox",
"serial_number": "0",
"uuid": "6B456DEB-9630-430D-9F85-AEBD695A160B"
}
},
"domain": "example.com",
Expand All @@ -22,92 +22,94 @@
"hardwaremodel": "x86_64",
"hostname": "foo",
"hypervisors": {
"hyperv": {
"virtualbox": {
"revision": "161095",
"version": "7.0.14"
}
},
"id": "foo\\windows",
"id": "FOO\\vagrant",
"identity": {
"privileged": true,
"user": "foo\\windows"
"user": "FOO\\vagrant"
},
"interfaces": "Ethernet",
"ipaddress": "10.138.1.6",
"ipaddress6": "fe80::5111:281c:6d79:d8c5",
"ipaddress6_Ethernet": "fe80::5111:281c:6d79:d8c5",
"ipaddress_Ethernet": "10.138.1.6",
"ipaddress": "10.0.2.15",
"ipaddress6": "fe80::4c6a:201b:6dd8:dfcc",
"ipaddress6_Ethernet": "fe80::4c6a:201b:6dd8:dfcc",
"ipaddress_Ethernet": "10.0.2.15",
"is_virtual": true,
"kernel": "windows",
"kernelmajversion": "10.0",
"kernelrelease": "10.0.19045",
"kernelversion": "10.0.19045",
"macaddress": "60:45:BD:D0:87:D9",
"macaddress_Ethernet": "60:45:BD:D0:87:D9",
"manufacturer": "American Megatrends Inc.",
"macaddress": "08:00:27:85:56:BC",
"macaddress_Ethernet": "08:00:27:85:56:BC",
"manufacturer": "innotek GmbH",
"memory": {
"system": {
"available": "12.52 GiB",
"available_bytes": 13447675904,
"capacity": "21.72%",
"total": "16.00 GiB",
"total_bytes": 17179398144,
"used": "3.48 GiB",
"used_bytes": 3731722240
"available": "2.48 GiB",
"available_bytes": 2665177088,
"capacity": "37.70%",
"total": "3.98 GiB",
"total_bytes": 4277866496,
"used": "1.50 GiB",
"used_bytes": 1612689408
}
},
"memoryfree": "12.52 GiB",
"memoryfree_mb": 12824.703125,
"memorysize": "16.00 GiB",
"memorysize_mb": 16383.55078125,
"memoryfree": "2.48 GiB",
"memoryfree_mb": 2541.7109375,
"memorysize": "3.98 GiB",
"memorysize_mb": 4079.69140625,
"mtu_Ethernet": 1500,
"netmask": "255.255.255.0",
"netmask6": "ffff:ffff:ffff:ffff::",
"netmask6_Ethernet": "ffff:ffff:ffff:ffff::",
"netmask_Ethernet": "255.255.255.0",
"network": "10.138.1.0",
"network": "10.0.2.0",
"network6": "fe80::",
"network6_Ethernet": "fe80::",
"network_Ethernet": "10.138.1.0",
"network_Ethernet": "10.0.2.0",
"networking": {
"dhcp": "168.63.129.16",
"dhcp": "10.0.2.2",
"domain": "example.com",
"fqdn": "foo.example.com",
"hostname": "foo",
"interfaces": {
"Ethernet": {
"bindings": [
{
"address": "10.138.1.6",
"address": "10.0.2.15",
"netmask": "255.255.255.0",
"network": "10.138.1.0"
"network": "10.0.2.0"
}
],
"bindings6": [
{
"address": "fe80::5111:281c:6d79:d8c5",
"address": "fe80::4c6a:201b:6dd8:dfcc",
"netmask": "ffff:ffff:ffff:ffff::",
"network": "fe80::",
"scope6": "link"
}
],
"dhcp": "168.63.129.16",
"ip": "10.138.1.6",
"ip6": "fe80::5111:281c:6d79:d8c5",
"mac": "60:45:BD:D0:87:D9",
"dhcp": "10.0.2.2",
"ip": "10.0.2.15",
"ip6": "fe80::4c6a:201b:6dd8:dfcc",
"mac": "08:00:27:85:56:BC",
"mtu": 1500,
"netmask": "255.255.255.0",
"netmask6": "ffff:ffff:ffff:ffff::",
"network": "10.138.1.0",
"network": "10.0.2.0",
"network6": "fe80::",
"scope6": "link"
}
},
"ip": "10.138.1.6",
"ip6": "fe80::5111:281c:6d79:d8c5",
"mac": "60:45:BD:D0:87:D9",
"ip": "10.0.2.15",
"ip6": "fe80::4c6a:201b:6dd8:dfcc",
"mac": "08:00:27:85:56:BC",
"mtu": 1500,
"netmask": "255.255.255.0",
"netmask6": "ffff:ffff:ffff:ffff::",
"network": "10.138.1.0",
"network": "10.0.2.0",
"network6": "fe80::",
"primary": "Ethernet",
"scope6": "link"
Expand All @@ -126,29 +128,30 @@
},
"windows": {
"display_version": "22H2",
"edition_id": "Professional",
"edition_id": "EnterpriseEval",
"installation_type": "Client",
"product_name": "Windows 10 Pro",
"product_name": "Windows 10 Enterprise Evaluation",
"release_id": "22H2",
"system32": "C:\\Windows\\system32"
}
},
"osfamily": "windows",
"path": "C:\\Program Files\\Puppet Labs\\Puppet\\puppet\\bin;C:\\Program Files\\Puppet Labs\\Puppet\\bin;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Windows\\System32\\OpenSSH\\;C:\\Program Files\\Puppet Labs\\Puppet\\bin;C:\\Users\\windows\\AppData\\Local\\Microsoft\\WindowsApps;",
"path": "C:\\Program Files\\Puppet Labs\\Puppet\\puppet\\bin;C:\\Program Files\\Puppet Labs\\Puppet\\bin;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Windows\\System32\\OpenSSH\\;C:\\Program Files\\OpenSSH-Win64;C:\\Users\\vagrant\\AppData\\Local\\Microsoft\\WindowsApps",
"physicalprocessorcount": 1,
"processor0": "Intel(R) Xeon(R) Platinum 8272CL CPU @ 2.60GHz",
"processorcount": 4,
"processor0": "Intel(R) Xeon(R) CPU E5-2667 v3 @ 3.20GHz",
"processorcount": 2,
"processors": {
"cores": 2,
"count": 4,
"count": 2,
"isa": "x64",
"models": [
"Intel(R) Xeon(R) Platinum 8272CL CPU @ 2.60GHz"
"Intel(R) Xeon(R) CPU E5-2667 v3 @ 3.20GHz"
],
"physicalcount": 1,
"threads": 2
"threads": 1
},
"productname": "Virtual Machine",
"productname": "VirtualBox",
"puppetversion": "7.24.0",
"ruby": {
"platform": "x64-mingw32",
"sitedir": "C:/Program Files/Puppet Labs/Puppet/puppet/lib/ruby/site_ruby/2.7.0",
Expand All @@ -159,24 +162,66 @@
"rubyversion": "2.7.7",
"scope6": "link",
"scope6_Ethernet": "link",
"serialnumber": "0000-0009-6402-6941-5339-5438-01",
"serialnumber": "0",
"ssh": {
"dsa": {
"fingerprints": {
"sha1": "SSHFP 2 1 2881c8a0dd7619743804d8eacbe84f6ed6710c5c",
"sha256": "SSHFP 2 2 7093fa18285ea8c300c8e7a2f02806858b916d11e290107f313f2035d29885ec"
},
"key": "AAAAB3NzaC1kc3MAAACBALRVpVrInQNBmpTrjs7+E5PpIimZKMOZVqe81FYEY34q6q/No1LjgoNFj4RrGfD6YRMNtrKPSH0Er7PnkawVH+b5j85utXSNl3Lg7nLfSdrETbHzJgTWDRMhuzfmQ2E3sJUkVyDt07DQT6GPSd9dhoDY6uYU+sPjGYmChB1UdUZXAAAAFQDeBA9SXKvk14OISVneBt3WhjpHUwAAAH8ZQDtMdhihhqcQ6nHyA+belgHx+HP0pJ+wdwwvsmxnyrllqInJZ/+wGv6Gt0lqGaR0jDAwX5vhEnfTlFi5EPqBXi5Hv1Thv/3QnoVbINF5DkN/b0pnhc2w/wS7H6KhMQAJOxOEk1YlDJxxsmdULe7tpE7EASbSOV2QpDvq906dAAAAgGB+xiD1+xP1Q6DhOYPWkd+zubTBZvhtOivSc2GupaHuZcjqnMEXsF5M++pVjmqXPaM3XvZc2mMAuReo64AqSoSar3QlRTAD+/JxcSXo+uBMN9PAguGyv0O4RYQPxnHl/t4JDjw20eJgmFjH7BuaIRvIm8UH3aVFOUNmT4PLAFQ2",
"type": "ssh-dss"
},
"ecdsa": {
"fingerprints": {
"sha1": "SSHFP 3 1 51cf57dae34addd4770d3be0c6e994143a324fa1",
"sha256": "SSHFP 3 2 b0bf51964da6640bd498ce286604ec25fa0e4477944f37a123289628d9be2042"
},
"key": "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAIZL0c75xKTmUlbJOiVjPooRCWxUuA8FI7E6n+LRVkZnz9RCZnXmOfPwJQRfISSxNL3D9l5hdWMNo2QEA25p1M=",
"type": "ecdsa-sha2-nistp256"
},
"ed25519": {
"fingerprints": {
"sha1": "SSHFP 4 1 5b2b28c04b8a81b54399e20e2d36946298ed0984",
"sha256": "SSHFP 4 2 ee29a9053223bb924a4da7a89d16be7f041d9dd422428a31d1c3694b57d7a05e"
},
"key": "AAAAC3NzaC1lZDI1NTE5AAAAIOboWujRPKTjO4E35fHRpR9DLVqZb4oGYGWEJ9FwKMz/",
"type": "ssh-ed25519"
},
"rsa": {
"fingerprints": {
"sha1": "SSHFP 1 1 31acd9fc22a72d0cad2f671cb8fb61e60a40172b",
"sha256": "SSHFP 1 2 35c2e8c6c2416d20539b2c42afff5b21c9b4f6795dbab497038d1d369d76771b"
},
"key": "AAAAB3NzaC1yc2EAAAADAQABAAABgQDBaNeXcnDCdoHwqqk6NjPsbHQ25/btQOzW9UzeV7AIF5lFqeshEIvyJXnSnQbgO770dNMcsTi4/lXbTs/0GsrLFQwZL/h0a+hDO0Nb8ZecNsev82Jnhmxw0ikMLfRysdPePhQxKeHD8T8Q/X20TWvpHQ8eJ47P2jHEB6muSP/9eCTSQzlvZ90a4CnyiJa0ambx8qw9nrLnA8pXH3xiHvhDi9FwFbUlkqt49EzayglsumIhC2VZPvJpylT4dIcMPAkpPHfjCKtjfKTU32EGygDuFtCw9KreUw7eOAPqoRBYSH8TEl/pxBEY32Wo3l5GImVMx7JRKdv89nzB2wB6v8630F9/07WczAkeeCoJ9vW+JRPvNngSeRKvR2E5QEAkHu6d7zT0BFXVocDI5P+NFlmgj87vliBuX6O8fVWLWOGgsQLaMbDuUI5VXI475llGU/hrEFwsQjpsHEu+A1UYJgvhge3TRzVYwB/7A4m9+MPwTyKD45WhEp3vMoV3dTKzleU=",
"type": "ssh-rsa"
}
},
"sshdsakey": "AAAAB3NzaC1kc3MAAACBALRVpVrInQNBmpTrjs7+E5PpIimZKMOZVqe81FYEY34q6q/No1LjgoNFj4RrGfD6YRMNtrKPSH0Er7PnkawVH+b5j85utXSNl3Lg7nLfSdrETbHzJgTWDRMhuzfmQ2E3sJUkVyDt07DQT6GPSd9dhoDY6uYU+sPjGYmChB1UdUZXAAAAFQDeBA9SXKvk14OISVneBt3WhjpHUwAAAH8ZQDtMdhihhqcQ6nHyA+belgHx+HP0pJ+wdwwvsmxnyrllqInJZ/+wGv6Gt0lqGaR0jDAwX5vhEnfTlFi5EPqBXi5Hv1Thv/3QnoVbINF5DkN/b0pnhc2w/wS7H6KhMQAJOxOEk1YlDJxxsmdULe7tpE7EASbSOV2QpDvq906dAAAAgGB+xiD1+xP1Q6DhOYPWkd+zubTBZvhtOivSc2GupaHuZcjqnMEXsF5M++pVjmqXPaM3XvZc2mMAuReo64AqSoSar3QlRTAD+/JxcSXo+uBMN9PAguGyv0O4RYQPxnHl/t4JDjw20eJgmFjH7BuaIRvIm8UH3aVFOUNmT4PLAFQ2",
"sshecdsakey": "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAIZL0c75xKTmUlbJOiVjPooRCWxUuA8FI7E6n+LRVkZnz9RCZnXmOfPwJQRfISSxNL3D9l5hdWMNo2QEA25p1M=",
"sshed25519key": "AAAAC3NzaC1lZDI1NTE5AAAAIOboWujRPKTjO4E35fHRpR9DLVqZb4oGYGWEJ9FwKMz/",
"sshfp_dsa": "SSHFP 2 1 2881c8a0dd7619743804d8eacbe84f6ed6710c5c\nSSHFP 2 2 7093fa18285ea8c300c8e7a2f02806858b916d11e290107f313f2035d29885ec",
"sshfp_ecdsa": "SSHFP 3 1 51cf57dae34addd4770d3be0c6e994143a324fa1\nSSHFP 3 2 b0bf51964da6640bd498ce286604ec25fa0e4477944f37a123289628d9be2042",
"sshfp_ed25519": "SSHFP 4 1 5b2b28c04b8a81b54399e20e2d36946298ed0984\nSSHFP 4 2 ee29a9053223bb924a4da7a89d16be7f041d9dd422428a31d1c3694b57d7a05e",
"sshfp_rsa": "SSHFP 1 1 31acd9fc22a72d0cad2f671cb8fb61e60a40172b\nSSHFP 1 2 35c2e8c6c2416d20539b2c42afff5b21c9b4f6795dbab497038d1d369d76771b",
"sshrsakey": "AAAAB3NzaC1yc2EAAAADAQABAAABgQDBaNeXcnDCdoHwqqk6NjPsbHQ25/btQOzW9UzeV7AIF5lFqeshEIvyJXnSnQbgO770dNMcsTi4/lXbTs/0GsrLFQwZL/h0a+hDO0Nb8ZecNsev82Jnhmxw0ikMLfRysdPePhQxKeHD8T8Q/X20TWvpHQ8eJ47P2jHEB6muSP/9eCTSQzlvZ90a4CnyiJa0ambx8qw9nrLnA8pXH3xiHvhDi9FwFbUlkqt49EzayglsumIhC2VZPvJpylT4dIcMPAkpPHfjCKtjfKTU32EGygDuFtCw9KreUw7eOAPqoRBYSH8TEl/pxBEY32Wo3l5GImVMx7JRKdv89nzB2wB6v8630F9/07WczAkeeCoJ9vW+JRPvNngSeRKvR2E5QEAkHu6d7zT0BFXVocDI5P+NFlmgj87vliBuX6O8fVWLWOGgsQLaMbDuUI5VXI475llGU/hrEFwsQjpsHEu+A1UYJgvhge3TRzVYwB/7A4m9+MPwTyKD45WhEp3vMoV3dTKzleU=",
"system32": "C:\\Windows\\system32",
"system_uptime": {
"days": 0,
"hours": 19,
"seconds": 68474,
"uptime": "19:01 hours"
"hours": 0,
"seconds": 103,
"uptime": "0:01 hours"
},
"timezone": "Coordinated Universal Time",
"uptime": "19:01 hours",
"uptime": "0:01 hours",
"uptime_days": 0,
"uptime_hours": 19,
"uptime_seconds": 68474,
"uuid": "85C91DF4-F860-4CF9-BEEB-2371A5318681",
"virtual": "hyperv",
"uptime_hours": 0,
"uptime_seconds": 103,
"uuid": "6B456DEB-9630-430D-9F85-AEBD695A160B",
"virtual": "virtualbox",
"windows_display_version": "22H2",
"windows_edition_id": "Professional",
"windows_edition_id": "EnterpriseEval",
"windows_installation_type": "Client",
"windows_product_name": "Windows 10 Pro",
"windows_product_name": "Windows 10 Enterprise Evaluation",
"windows_release_id": "22H2"
}
Loading