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

Load puppet versions from shared file & Add missing factsets #334

Merged
merged 3 commits into from
May 16, 2024
Merged

Load puppet versions from shared file & Add missing factsets #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77282fa
Load puppet versions from shared file
yakatz May 15, 2024
cb32548
Add new facts that weren't generated previously
yakatz May 15, 2024
3042490
And of course update the table
yakatz May 15, 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
12 changes: 6 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,22 +100,22 @@ FacterDB::get_facts('osfamily=Debian')
| Scientific 7 | 1 | | 1 | | | | | |
| Solaris 11 | 1 | | | | | | | |
| Ubuntu 18.04 | 1 | 1 | 1 | 1 | 1 | 1 | | |
| Ubuntu 20.04 | 1 | 1 | 1 | 1 | 1 | 1 | | |
| Ubuntu 20.04 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
| Ubuntu 21.04 | 1 | 1 | 1 | | | | | |
| Ubuntu 21.10 | 1 | 1 | 1 | | | | | |
| Ubuntu 22.04 | | | 1 | 1 | 1 | 1 | 1 | 1 |
| Ubuntu 22.10 | | | 1 | | | | | |
| Windows 10 | | | 1 | 1 | 1 | | 1 | 1 |
| Windows 10 | | | 1 | 1 | 1 | 1 | 1 | 1 |
| Windows 11 | | | 1 | 1 | 1 | 1 | 1 | 1 |
| Windows Server 2012 | | | 1 | 1 | 1 | | | |
| Windows Server 2012 R2 | | | 1 | 1 | 1 | | | |
| Windows Server 2016 | | | 1 | 1 | 1 | | | |
| Windows Server 2016 Core | | | 1 | 1 | 1 | | | |
| Windows Server 2019 | | | 1 | 1 | 1 | | 1 | 1 |
| Windows Server 2019 | | | 1 | 1 | 1 | 1 | 1 | 1 |
| Windows Server 2019 Core | | | 1 | 1 | 1 | | | |
| Windows Server 2022 | | | 1 | 1 | 1 | | 1 | 1 |
| Windows Server 2022 | | | 1 | 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 | | 1 | 1 |
| openSUSE 15 | 1 | 1 | 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).

Expand Down
4 changes: 2 additions & 2 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ def factset_to_os_label(fs)
db_filename = fs[:_facterdb_filename] || 'there_is_no_filename'
label = if /windows-10-/.match?(db_filename)
'Windows 10'
elsif /windows-7-/.match?(db_filename)
'Windows 7'
elsif /windows-11-/.match?(db_filename)
'Windows 11'
elsif /windows-8[\d.]*-/.match?(db_filename)
"Windows #{os__rel.sub('6.2.9200', '8').sub('6.3.9600', '8.1')}"
elsif /windows-.+-core-/.match?(db_filename)
Expand Down
227 changes: 227 additions & 0 deletions facts/4.5/windows-10-x86_64.facts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,227 @@
{
"aio_agent_version": "8.4.0",
"architecture": "x64",
"dhcp_servers": {
"Ethernet": "10.0.2.2",
"system": "10.0.2.2"
},
"dmi": {
"manufacturer": "innotek GmbH",
"product": {
"name": "VirtualBox",
"serial_number": "0",
"uuid": "6B456DEB-9630-430D-9F85-AEBD695A160B"
}
},
"domain": "example.com",
"env_windows_installdir": "C:\\Program Files\\Puppet Labs\\Puppet",
"facterversion": "4.5.2",
"fips_enabled": false,
"fqdn": "foo.example.com",
"hardwareisa": "x64",
"hardwaremodel": "x86_64",
"hostname": "foo",
"hypervisors": {
"virtualbox": {
"revision": "161095",
"version": "7.0.14"
}
},
"id": "FOO\\vagrant",
"identity": {
"privileged": true,
"user": "FOO\\vagrant"
},
"interfaces": "Ethernet",
"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": "08:00:27:85:56:BC",
"macaddress_Ethernet": "08:00:27:85:56:BC",
"manufacturer": "innotek GmbH",
"memory": {
"system": {
"available": "2.46 GiB",
"available_bytes": 2636947456,
"capacity": "38.36%",
"total": "3.98 GiB",
"total_bytes": 4277866496,
"used": "1.53 GiB",
"used_bytes": 1640919040
}
},
"memoryfree": "2.46 GiB",
"memoryfree_mb": 2514.7890625,
"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.0.2.0",
"network6": "fe80::",
"network6_Ethernet": "fe80::",
"network_Ethernet": "10.0.2.0",
"networking": {
"dhcp": "10.0.2.2",
"domain": "example.com",
"fqdn": "foo.example.com",
"hostname": "foo",
"interfaces": {
"Ethernet": {
"bindings": [
{
"address": "10.0.2.15",
"netmask": "255.255.255.0",
"network": "10.0.2.0"
}
],
"bindings6": [
{
"address": "fe80::4c6a:201b:6dd8:dfcc",
"netmask": "ffff:ffff:ffff:ffff::",
"network": "fe80::",
"scope6": "link"
}
],
"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.0.2.0",
"network6": "fe80::",
"scope6": "link"
}
},
"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.0.2.0",
"network6": "fe80::",
"primary": "Ethernet",
"scope6": "link"
},
"operatingsystem": "windows",
"operatingsystemmajrelease": "10",
"operatingsystemrelease": "10",
"os": {
"architecture": "x64",
"family": "windows",
"hardware": "x86_64",
"name": "windows",
"release": {
"full": "10",
"major": "10"
},
"windows": {
"display_version": "22H2",
"edition_id": "EnterpriseEval",
"installation_type": "Client",
"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\\OpenSSH-Win64;C:\\Users\\vagrant\\AppData\\Local\\Microsoft\\WindowsApps",
"physicalprocessorcount": 1,
"processor0": "Intel(R) Xeon(R) CPU E5-2667 v3 @ 3.20GHz",
"processorcount": 2,
"processors": {
"cores": 2,
"count": 2,
"isa": "x64",
"models": [
"Intel(R) Xeon(R) CPU E5-2667 v3 @ 3.20GHz"
],
"physicalcount": 1,
"threads": 1
},
"productname": "VirtualBox",
"puppetversion": "8.4.0",
"ruby": {
"platform": "x64-mingw32",
"sitedir": "C:/Program Files/Puppet Labs/Puppet/puppet/lib/ruby/site_ruby/3.2.0",
"version": "3.2.2"
},
"rubyplatform": "x64-mingw32",
"rubysitedir": "C:/Program Files/Puppet Labs/Puppet/puppet/lib/ruby/site_ruby/3.2.0",
"rubyversion": "3.2.2",
"scope6": "link",
"scope6_Ethernet": "link",
"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": 0,
"seconds": 555,
"uptime": "0:09 hours"
},
"timezone": "Coordinated Universal Time",
"uptime": "0:09 hours",
"uptime_days": 0,
"uptime_hours": 0,
"uptime_seconds": 555,
"uuid": "6B456DEB-9630-430D-9F85-AEBD695A160B",
"virtual": "virtualbox",
"windows_display_version": "22H2",
"windows_edition_id": "EnterpriseEval",
"windows_installation_type": "Client",
"windows_product_name": "Windows 10 Enterprise Evaluation",
"windows_release_id": "22H2"
}
Loading