* Updated Database->_find_behind_databases() to not run unless it's on a Striker.

* Updated scan_network to properly mark virtio network interfaces as being full duplex. Also updated it to purge interfaces flagged as 'DELETED'.
* Updated the VM OS list.

Signed-off-by: Digimer <digimer@alteeve.ca>

Anvil/Tools/Database.pm

@@ -17634,7 +17634,7 @@ sub _find_column
 
 This returns the most up to date database ID, the time it was last updated and an array or DB IDs that are behind.
 
-If there is a problem, C<< !!error!! >> is returned.
+If there is a problem, C<< !!error!! >> is returned. If this is called by a host that isn't a Striker, C<< 0 >> is returned and no actions are take.
 
 Parameters;
 
@@ -17662,6 +17662,14 @@ sub _find_behind_databases
 		tables => $tables, 
 	}});
 	
+	# If we're not a striker, return.
+	my $host_type = $anvil->Get->host_type();
+	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { host_type => $host_type }});
+	if ($host_type ne "striker")
+	{
+		return(0);
+	}
+	
 	# This should always be set, but just in case...
 	if (not $source)
 	{

scancore-agents/scan-network/scan-network

@@ -85,6 +85,9 @@ process_health($anvil);
 # This clears the TX and RX variable data for interfaces older than 'scancore::database::age_out'.
 clear_old_variables($anvil);
 
+# This removes network interfaces that have been marked as DELETED for a while now.
+clear_old_interfaces($anvil);
+
 # Shut down.
 $anvil->ScanCore->agent_shutdown({agent => $THIS_FILE});
 
@@ -93,6 +96,81 @@ $anvil->ScanCore->agent_shutdown({agent => $THIS_FILE});
 # Functions                                                                                                 #
 #############################################################################################################
 
+# This removes network interfaces that have been marked as DELETED for a while now.
+sub clear_old_interfaces
+{
+	my ($anvil) = @_;
+	
+	# Read in all interfaces and for each, delete historical records over the age-out time.
+	my $age = $anvil->data->{scancore}{database}{age_out};
+	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { age => $age }});
+	
+	if ($age =~ /\D/)
+	{
+		# Age is not valid, set it to defaults.
+		$age = 24;
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { age => $age }});
+	}
+	
+	my $query         = "SELECT now() - '".$age."h'::interval;";
+	my $old_timestamp = $anvil->Database->query({query => $query, source => $THIS_FILE, line => __LINE__})->[0]->[0];
+	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { 
+		query         => $query, 
+		old_timestamp => $old_timestamp, 
+	}});
+	
+	$query = "
+SELECT 
+    network_interface_uuid, 
+    network_interface_mac_address, 
+    network_interface_name 
+FROM 
+    network_interfaces 
+WHERE 
+    network_interface_host_uuid = ".$anvil->Database->quote($anvil->Get->host_uuid)." 
+AND 
+    network_interface_operational = 'DELETED' 
+AND 
+    modified_date < '".$old_timestamp."' 
+ORDER BY 
+    network_interface_name ASC;
+;";
+	my $results = $anvil->Database->query({query => $query, source => $THIS_FILE, line => __LINE__});
+	my $count   = @{$results};
+	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
+		results => $results, 
+		count   => $count,
+	}});
+	foreach my $row (@{$results})
+	{
+		my $network_interface_uuid        = $row->[0];
+		my $network_interface_mac_address = $row->[1];
+		my $network_interface_name        = $row->[2];
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
+			's1:network_interface_uuid'        => $network_interface_uuid, 
+			's2:network_interface_mac_address' => $network_interface_mac_address, 
+			's3:network_interface_name'        => $network_interface_name,
+		}});
+	
+		$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "scan_network_log_0002", variables => { 
+			age  => $age, 
+			mac  => $network_interface_mac_address,
+			name => $network_interface_name,
+		}});
+		
+		my $queries = [];
+		push @{$queries}, "DELETE FROM history.network_interfaces WHERE network_interface_uuid = '".$network_interface_uuid."';";
+		push @{$queries}, "DELETE FROM network_interfaces WHERE network_interface_uuid = '".$network_interface_uuid."';";
+		foreach my $query (@{$queries})
+		{
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { query => $query }});
+		}
+		$anvil->Database->write({query => $queries, source => $THIS_FILE, line => __LINE__});
+	}
+	
+	return(0);
+}
+
 # This clears the TX and RX variable data for interfaces older than 'scancore::database::age_out'.
 sub clear_old_variables
 {
@@ -416,8 +494,14 @@ sub collect_data
 			{
 				### Set some fake values.
 				# Speed is "as fast as possible", so we'll record 100 Gbps, but that is really kind of arbitrary.
-				$speed  = 1000   if ((not $speed) or ($speed eq "-1"));
+				if ((not $speed) or ($speed eq "-1"))
-				$duplex = "full" if not $duplex;
+				{
+					$speed = 10000;
+				}
+				if ((not $duplex) or ($duplex eq "unknown"))
+				{
+					$duplex = "full";
+				}
 				$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
 					speed  => $speed, 
 					duplex => $duplex,

scancore-agents/scan-network/scan-network.xml

@@ -215,5 +215,6 @@ This mode is NOT supported by the Anvil! Intelligent Availability™ platform!
 		</key>
 
 		<key name="scan_network_log_0001">Aging out RX and TX data under: [#!variable!records!#] interfaces. These have 1 or more historical records older than: [#!variable!age!#] hours old from the database host: [#!variable!host!#].</key>
+		<key name="scan_network_log_0002">The old network interface: [#!variable!name!#] with the MAC address: [#!variable!mac!#] was marked as deleted more than: [#!variable!age!#] hours ago. Purging it from the database.</key>
 	</language>
 </words>

share/words.xml

@@ -3188,15 +3188,19 @@ We will sleep a bit and try again.
 
 		<!-- The entries below here are not sequential, but use a key to find the entry. -->
 		<!-- Run 'striker-parse-os-list to find new entries. --> 
+		<key name="os_list_almalinux8"><![CDATA[AlmaLinux 8]]></key>
+		<key name="os_list_alpinelinux3.10"><![CDATA[Alpine Linux 3.10]]></key>
+		<key name="os_list_alpinelinux3.11"><![CDATA[Alpine Linux 3.11]]></key>
+		<key name="os_list_alpinelinux3.12"><![CDATA[Alpine Linux 3.12]]></key>
+		<key name="os_list_alpinelinux3.13"><![CDATA[Alpine Linux 3.13]]></key>
+		<key name="os_list_alpinelinux3.14"><![CDATA[Alpine Linux 3.14]]></key>
+		<key name="os_list_alpinelinux3.15"><![CDATA[Alpine Linux 3.15]]></key>
 		<key name="os_list_alpinelinux3.5"><![CDATA[Alpine Linux 3.5]]></key>
 		<key name="os_list_alpinelinux3.6"><![CDATA[Alpine Linux 3.6]]></key>
 		<key name="os_list_alpinelinux3.7"><![CDATA[Alpine Linux 3.7]]></key>
 		<key name="os_list_alpinelinux3.8"><![CDATA[Alpine Linux 3.8]]></key>
 		<key name="os_list_alpinelinux3.9"><![CDATA[Alpine Linux 3.9]]></key>
-		<key name="os_list_alpinelinux3.10"><![CDATA[Alpine Linux 3.10]]></key>
+		<key name="os_list_alt.p10"><![CDATA[ALT p10 StarterKits]]></key>
-		<key name="os_list_alpinelinux3.11"><![CDATA[Alpine Linux 3.11]]></key>
-		<key name="os_list_alpinelinux3.12"><![CDATA[Alpine Linux 3.12]]></key>
-		<key name="os_list_alpinelinux3.13"><![CDATA[Alpine Linux 3.13]]></key>
 		<key name="os_list_alt.p8"><![CDATA[ALT p8 StarterKits]]></key>
 		<key name="os_list_alt.p9"><![CDATA[ALT p9 StarterKits]]></key>
 		<key name="os_list_alt.sisyphus"><![CDATA[ALT regular]]></key>
@@ -3204,6 +3208,8 @@ We will sleep a bit and try again.
 		<key name="os_list_alt8.1"><![CDATA[ALT 8.1]]></key>
 		<key name="os_list_alt8.2"><![CDATA[ALT 8.2]]></key>
 		<key name="os_list_alt9.0"><![CDATA[ALT 9.0]]></key>
+		<key name="os_list_alt9.1"><![CDATA[ALT 9.1]]></key>
+		<key name="os_list_alt9.2"><![CDATA[ALT 9.2]]></key>
 		<key name="os_list_altlinux1.0"><![CDATA[Mandrake RE Spring 2001]]></key>
 		<key name="os_list_altlinux2.0"><![CDATA[ALT Linux 2.0]]></key>
 		<key name="os_list_altlinux2.2"><![CDATA[ALT Linux 2.2]]></key>
@@ -3230,6 +3236,7 @@ We will sleep a bit and try again.
 		<key name="os_list_caasp2.0"><![CDATA[SUSE CaaS Platform 2.0]]></key>
 		<key name="os_list_caasp3.0"><![CDATA[SUSE CaaS Platform 3.0]]></key>
 		<key name="os_list_centos-stream8"><![CDATA[CentOS Stream 8]]></key>
+		<key name="os_list_centos-stream9"><![CDATA[CentOS Stream 9]]></key>
 		<key name="os_list_centos5.0"><![CDATA[CentOS 5.0]]></key>
 		<key name="os_list_centos5.1"><![CDATA[CentOS 5.1]]></key>
 		<key name="os_list_centos5.10"><![CDATA[CentOS 5.10]]></key>
@@ -3255,6 +3262,12 @@ We will sleep a bit and try again.
 		<key name="os_list_centos6.9"><![CDATA[CentOS 6.9]]></key>
 		<key name="os_list_centos7.0"><![CDATA[CentOS 7]]></key>
 		<key name="os_list_centos8"><![CDATA[CentOS 8]]></key>
+		<key name="os_list_circle-unknown"><![CDATA[Circle Linux Unknown]]></key>
+		<key name="os_list_circle8-unknown"><![CDATA[Circle Linux 8 Unknown]]></key>
+		<key name="os_list_circle8.4"><![CDATA[Circle Linux 8.4]]></key>
+		<key name="os_list_circle8.5"><![CDATA[Circle Linux 8.5]]></key>
+		<key name="os_list_circle9-unknown"><![CDATA[Circle Linux 9 Unknown]]></key>
+		<key name="os_list_circle9.0"><![CDATA[Circle Linux 9.0]]></key>
 		<key name="os_list_cirros0.3.0"><![CDATA[CirrOS 0.3.0]]></key>
 		<key name="os_list_cirros0.3.1"><![CDATA[CirrOS 0.3.1]]></key>
 		<key name="os_list_cirros0.3.2"><![CDATA[CirrOS 0.3.2]]></key>
@@ -3262,11 +3275,15 @@ We will sleep a bit and try again.
 		<key name="os_list_cirros0.3.4"><![CDATA[CirrOS 0.3.4]]></key>
 		<key name="os_list_cirros0.3.5"><![CDATA[CirrOS 0.3.5]]></key>
 		<key name="os_list_cirros0.4.0"><![CDATA[CirrOS 0.4.0]]></key>
+		<key name="os_list_cirros0.5.0"><![CDATA[CirrOS 0.5.0]]></key>
+		<key name="os_list_cirros0.5.1"><![CDATA[CirrOS 0.5.1]]></key>
+		<key name="os_list_cirros0.5.2"><![CDATA[CirrOS 0.5.2]]></key>
 		<key name="os_list_clearlinux"><![CDATA[Clear Linux OS]]></key>
 		<key name="os_list_debian1.1"><![CDATA[Debian GNU/Linux 1.1]]></key>
 		<key name="os_list_debian1.2"><![CDATA[Debian GNU/Linux 1.2]]></key>
 		<key name="os_list_debian1.3"><![CDATA[Debian GNU/Linux 1.3]]></key>
 		<key name="os_list_debian10"><![CDATA[Debian 10]]></key>
+		<key name="os_list_debian11"><![CDATA[Debian 11]]></key>
 		<key name="os_list_debian2.0"><![CDATA[Debian GNU/Linux 2.0]]></key>
 		<key name="os_list_debian2.1"><![CDATA[Debian GNU/Linux 2.1]]></key>
 		<key name="os_list_debian2.2"><![CDATA[Debian GNU/Linux 2.2]]></key>
@@ -3347,6 +3364,7 @@ We will sleep a bit and try again.
 		<key name="os_list_dragonflybsd5.6"><![CDATA[DragonFlyBSD 5.6]]></key>
 		<key name="os_list_elementary5.0"><![CDATA[Elementary OS 5.0 Juno]]></key>
 		<key name="os_list_eos3.1"><![CDATA[Endless OS 3.1]]></key>
+		<key name="os_list_eos3.10"><![CDATA[Endless OS 3.10]]></key>
 		<key name="os_list_eos3.2"><![CDATA[Endless OS 3.2]]></key>
 		<key name="os_list_eos3.3"><![CDATA[Endless OS 3.3]]></key>
 		<key name="os_list_eos3.4"><![CDATA[Endless OS 3.4]]></key>
@@ -3355,7 +3373,10 @@ We will sleep a bit and try again.
 		<key name="os_list_eos3.7"><![CDATA[Endless OS 3.7]]></key>
 		<key name="os_list_eos3.8"><![CDATA[Endless OS 3.8]]></key>
 		<key name="os_list_eos3.9"><![CDATA[Endless OS 3.9]]></key>
-		<key name="os_list_eos3.10"><![CDATA[Endless OS 3.10]]></key>
+		<key name="os_list_eos4.0"><![CDATA[Endless OS 4.0]]></key>
+		<key name="os_list_fedora-coreos-next"><![CDATA[Fedora CoreOS]]></key>
+		<key name="os_list_fedora-coreos-stable"><![CDATA[Fedora CoreOS]]></key>
+		<key name="os_list_fedora-coreos-testing"><![CDATA[Fedora CoreOS]]></key>
 		<key name="os_list_fedora-rawhide"><![CDATA[Fedora Rawhide]]></key>
 		<key name="os_list_fedora-unknown"><![CDATA[Fedora]]></key>
 		<key name="os_list_fedora1"><![CDATA[Fedora Core 1]]></key>
@@ -3385,15 +3406,14 @@ We will sleep a bit and try again.
 		<key name="os_list_fedora31"><![CDATA[Fedora 31]]></key>
 		<key name="os_list_fedora32"><![CDATA[Fedora 32]]></key>
 		<key name="os_list_fedora33"><![CDATA[Fedora 33]]></key>
+		<key name="os_list_fedora34"><![CDATA[Fedora 34]]></key>
+		<key name="os_list_fedora35"><![CDATA[Fedora 35]]></key>
 		<key name="os_list_fedora4"><![CDATA[Fedora Core 4]]></key>
 		<key name="os_list_fedora5"><![CDATA[Fedora Core 5]]></key>
 		<key name="os_list_fedora6"><![CDATA[Fedora Core 6]]></key>
 		<key name="os_list_fedora7"><![CDATA[Fedora 7]]></key>
 		<key name="os_list_fedora8"><![CDATA[Fedora 8]]></key>
 		<key name="os_list_fedora9"><![CDATA[Fedora 9]]></key>
-		<key name="os_list_fedora-coreos-next"><![CDATA[Fedora CoreOS]]></key>
-		<key name="os_list_fedora-coreos-stable"><![CDATA[Fedora CoreOS]]></key>
-		<key name="os_list_fedora-coreos-testing"><![CDATA[Fedora CoreOS]]></key>
 		<key name="os_list_freebsd1.0"><![CDATA[FreeBSD 1.0]]></key>
 		<key name="os_list_freebsd10.0"><![CDATA[FreeBSD 10.0]]></key>
 		<key name="os_list_freebsd10.1"><![CDATA[FreeBSD 10.1]]></key>
@@ -3408,6 +3428,8 @@ We will sleep a bit and try again.
 		<key name="os_list_freebsd12.0"><![CDATA[FreeBSD 12.0]]></key>
 		<key name="os_list_freebsd12.1"><![CDATA[FreeBSD 12.1]]></key>
 		<key name="os_list_freebsd12.2"><![CDATA[FreeBSD 12.2]]></key>
+		<key name="os_list_freebsd12.3"><![CDATA[FreeBSD 12.3]]></key>
+		<key name="os_list_freebsd13.0"><![CDATA[FreeBSD 13.0]]></key>
 		<key name="os_list_freebsd2.0"><![CDATA[FreeBSD 2.0]]></key>
 		<key name="os_list_freebsd2.0.5"><![CDATA[FreeBSD 2.0.5]]></key>
 		<key name="os_list_freebsd2.2.8"><![CDATA[FreeBSD 2.2.8]]></key>
@@ -3453,6 +3475,7 @@ We will sleep a bit and try again.
 		<key name="os_list_freebsd9.2"><![CDATA[FreeBSD 9.2]]></key>
 		<key name="os_list_freebsd9.3"><![CDATA[FreeBSD 9.3]]></key>
 		<key name="os_list_freedos1.2"><![CDATA[FreeDOS 1.2]]></key>
+		<key name="os_list_freenix14.2"><![CDATA[Freenix 14.2]]></key>
 		<key name="os_list_gentoo"><![CDATA[Gentoo Linux]]></key>
 		<key name="os_list_gnome-continuous-3.10"><![CDATA[GNOME 3.10]]></key>
 		<key name="os_list_gnome-continuous-3.12"><![CDATA[GNOME 3.12]]></key>
@@ -3460,12 +3483,18 @@ We will sleep a bit and try again.
 		<key name="os_list_gnome3.6"><![CDATA[GNOME 3.6]]></key>
 		<key name="os_list_gnome3.8"><![CDATA[GNOME 3.8]]></key>
 		<key name="os_list_guix-1.1"><![CDATA[Guix 1.1]]></key>
+		<key name="os_list_guix-1.3"><![CDATA[Guix 1.3]]></key>
+		<key name="os_list_guix-hurd-latest"><![CDATA[Guix Hurd Latest]]></key>
+		<key name="os_list_guix-latest"><![CDATA[Guix latest]]></key>
 		<key name="os_list_haikunightly"><![CDATA[Haiku Nightly]]></key>
 		<key name="os_list_haikur1alpha1"><![CDATA[Haiku R1/Alpha1]]></key>
 		<key name="os_list_haikur1alpha2"><![CDATA[Haiku R1/Alpha2]]></key>
 		<key name="os_list_haikur1alpha3"><![CDATA[Haiku R1/Alpha3]]></key>
 		<key name="os_list_haikur1alpha4.1"><![CDATA[Haiku R1/Alpha4.1]]></key>
 		<key name="os_list_haikur1beta1"><![CDATA[Haiku R1/Beta1]]></key>
+		<key name="os_list_haikur1beta2"><![CDATA[Haiku R1/Beta2]]></key>
+		<key name="os_list_haikur1beta3"><![CDATA[Haiku R1/Beta3]]></key>
+		<key name="os_list_hyperbola03"><![CDATA[Hyperbola]]></key>
 		<key name="os_list_linux2016"><![CDATA[Generic Linux 2016]]></key>
 		<key name="os_list_linux2018"><![CDATA[Generic Linux 2018]]></key>
 		<key name="os_list_linux2020"><![CDATA[Generic Linux 2020]]></key>
@@ -3484,6 +3513,7 @@ We will sleep a bit and try again.
 		<key name="os_list_mageia5"><![CDATA[Mageia 5]]></key>
 		<key name="os_list_mageia6"><![CDATA[Mageia 6]]></key>
 		<key name="os_list_mageia7"><![CDATA[Mageia 7]]></key>
+		<key name="os_list_mageia8"><![CDATA[Mageia 8]]></key>
 		<key name="os_list_mandrake10.0"><![CDATA[Mandrake Linux 10.0]]></key>
 		<key name="os_list_mandrake10.1"><![CDATA[Mandrake Linux 10.1]]></key>
 		<key name="os_list_mandrake10.2"><![CDATA[Mandrake Linux 10.2]]></key>
@@ -3516,6 +3546,7 @@ We will sleep a bit and try again.
 		<key name="os_list_mbs1.0"><![CDATA[Mandriva Business Server 1.0]]></key>
 		<key name="os_list_mes5"><![CDATA[Mandriva Enterprise Server 5.0]]></key>
 		<key name="os_list_mes5.1"><![CDATA[Mandriva Enterprise Server 5.1]]></key>
+		<key name="os_list_miraclelinux8.4"><![CDATA[MIRACLE LINUX 8.4]]></key>
 		<key name="os_list_msdos6.22"><![CDATA[Microsoft MS-DOS 6.22]]></key>
 		<key name="os_list_netbsd0.8"><![CDATA[NetBSD 0.8]]></key>
 		<key name="os_list_netbsd0.9"><![CDATA[NetBSD 0.9]]></key>
@@ -3547,6 +3578,7 @@ We will sleep a bit and try again.
 		<key name="os_list_netware6"><![CDATA[Novell Netware 6]]></key>
 		<key name="os_list_nixos-20.03"><![CDATA[NixOS 20.03]]></key>
 		<key name="os_list_nixos-20.09"><![CDATA[NixOS 20.09]]></key>
+		<key name="os_list_nixos-21.05"><![CDATA[NixOS 21.05]]></key>
 		<key name="os_list_nixos-unknown"><![CDATA[NixOS]]></key>
 		<key name="os_list_nixos-unstable"><![CDATA[NixOS Unstable]]></key>
 		<key name="os_list_oel4.4"><![CDATA[Oracle Enterprise Linux 4.4]]></key>
@@ -3587,9 +3619,13 @@ We will sleep a bit and try again.
 		<key name="os_list_ol7.6"><![CDATA[Oracle Linux 7.6]]></key>
 		<key name="os_list_ol7.7"><![CDATA[Oracle Linux 7.7]]></key>
 		<key name="os_list_ol7.8"><![CDATA[Oracle Linux 7.8]]></key>
+		<key name="os_list_ol7.9"><![CDATA[Oracle Linux 7.9]]></key>
 		<key name="os_list_ol8.0"><![CDATA[Oracle Linux 8.0]]></key>
 		<key name="os_list_ol8.1"><![CDATA[Oracle Linux 8.1]]></key>
 		<key name="os_list_ol8.2"><![CDATA[Oracle Linux 8.2]]></key>
+		<key name="os_list_ol8.3"><![CDATA[Oracle Linux 8.3]]></key>
+		<key name="os_list_ol8.4"><![CDATA[Oracle Linux 8.4]]></key>
+		<key name="os_list_ol8.5"><![CDATA[Oracle Linux 8.5]]></key>
 		<key name="os_list_openbsd4.2"><![CDATA[OpenBSD 4.2]]></key>
 		<key name="os_list_openbsd4.3"><![CDATA[OpenBSD 4.3]]></key>
 		<key name="os_list_openbsd4.4"><![CDATA[OpenBSD 4.4]]></key>
@@ -3614,6 +3650,8 @@ We will sleep a bit and try again.
 		<key name="os_list_openbsd6.5"><![CDATA[OpenBSD 6.5]]></key>
 		<key name="os_list_openbsd6.6"><![CDATA[OpenBSD 6.6]]></key>
 		<key name="os_list_openbsd6.7"><![CDATA[OpenBSD 6.7]]></key>
+		<key name="os_list_openbsd6.8"><![CDATA[OpenBSD 6.8]]></key>
+		<key name="os_list_openbsd6.9"><![CDATA[OpenBSD 6.9]]></key>
 		<key name="os_list_opensolaris2009.06"><![CDATA[OpenSolaris 2009.06]]></key>
 		<key name="os_list_opensuse-factory"><![CDATA[openSUSE]]></key>
 		<key name="os_list_opensuse-unknown"><![CDATA[openSUSE]]></key>
@@ -3632,6 +3670,7 @@ We will sleep a bit and try again.
 		<key name="os_list_opensuse15.0"><![CDATA[openSUSE Leap 15.0]]></key>
 		<key name="os_list_opensuse15.1"><![CDATA[openSUSE Leap 15.1]]></key>
 		<key name="os_list_opensuse15.2"><![CDATA[openSUSE Leap 15.2]]></key>
+		<key name="os_list_opensuse15.3"><![CDATA[openSUSE Leap 15.3]]></key>
 		<key name="os_list_opensuse42.1"><![CDATA[openSUSE Leap 42.1]]></key>
 		<key name="os_list_opensuse42.2"><![CDATA[openSUSE Leap 42.2]]></key>
 		<key name="os_list_opensuse42.3"><![CDATA[openSUSE Leap 42.3]]></key>
@@ -3719,6 +3758,7 @@ We will sleep a bit and try again.
 		<key name="os_list_rhel8.2"><![CDATA[Red Hat Enterprise Linux 8.2]]></key>
 		<key name="os_list_rhel8.3"><![CDATA[Red Hat Enterprise Linux 8.3]]></key>
 		<key name="os_list_rhel8.4"><![CDATA[Red Hat Enterprise Linux 8.4]]></key>
+		<key name="os_list_rhel8.5"><![CDATA[Red Hat Enterprise Linux 8.5]]></key>
 		<key name="os_list_rhel9-unknown"><![CDATA[Red Hat Enterprise Linux 9 Unknown]]></key>
 		<key name="os_list_rhel9.0"><![CDATA[Red Hat Enterprise Linux 9.0]]></key>
 		<key name="os_list_rhl1.0"><![CDATA[Red Hat Linux 1.0]]></key>
@@ -3741,6 +3781,13 @@ We will sleep a bit and try again.
 		<key name="os_list_rhl7.3"><![CDATA[Red Hat Linux 7.3]]></key>
 		<key name="os_list_rhl8.0"><![CDATA[Red Hat Linux 8.0]]></key>
 		<key name="os_list_rhl9"><![CDATA[Red Hat Linux 9]]></key>
+		<key name="os_list_rocky-unknown"><![CDATA[Rocky Linux Unknown]]></key>
+		<key name="os_list_rocky8-unknown"><![CDATA[Rocky Linux 8 Unknown]]></key>
+		<key name="os_list_rocky8.4"><![CDATA[Rocky Linux 8.4]]></key>
+		<key name="os_list_rocky8.5"><![CDATA[Rocky Linux 8.5]]></key>
+		<key name="os_list_rocky8.6"><![CDATA[Rocky Linux 8.6]]></key>
+		<key name="os_list_rocky9-unknown"><![CDATA[Rocky Linux 9 Unknown]]></key>
+		<key name="os_list_rocky9.0"><![CDATA[Rocky Linux 9.0]]></key>
 		<key name="os_list_scientificlinux5.0"><![CDATA[Scientific Linux 5.0]]></key>
 		<key name="os_list_scientificlinux5.1"><![CDATA[Scientific Linux 5.1]]></key>
 		<key name="os_list_scientificlinux5.10"><![CDATA[Scientific Linux 5.10]]></key>
@@ -3772,14 +3819,16 @@ We will sleep a bit and try again.
 		<key name="os_list_scientificlinux7.4"><![CDATA[Scientific Linux 7.4]]></key>
 		<key name="os_list_scientificlinux7.5"><![CDATA[Scientific Linux 7.5]]></key>
 		<key name="os_list_scientificlinux7.6"><![CDATA[Scientific Linux 7.6]]></key>
+		<key name="os_list_silverblue-rawhide"><![CDATA[Fedora Silverblue Rawhide]]></key>
+		<key name="os_list_silverblue-unknown"><![CDATA[Fedora Silverblue]]></key>
 		<key name="os_list_silverblue28"><![CDATA[Fedora Silverblue 28]]></key>
 		<key name="os_list_silverblue29"><![CDATA[Fedora Silverblue 29]]></key>
 		<key name="os_list_silverblue30"><![CDATA[Fedora Silverblue 30]]></key>
 		<key name="os_list_silverblue31"><![CDATA[Fedora Silverblue 31]]></key>
 		<key name="os_list_silverblue32"><![CDATA[Fedora Silverblue 32]]></key>
-		<key name="os_list_silverblue-rawhide"><![CDATA[Fedora Silverblue Rawhide]]></key>
-		<key name="os_list_silverblue-unknown"><![CDATA[Fedora Silverblue]]></key>
 		<key name="os_list_silverblue33"><![CDATA[Fedora Silverblue 33]]></key>
+		<key name="os_list_silverblue34"><![CDATA[Fedora Silverblue 34]]></key>
+		<key name="os_list_silverblue35"><![CDATA[Fedora Silverblue 35]]></key>
 		<key name="os_list_slackware-current"><![CDATA[Slackware -current]]></key>
 		<key name="os_list_slackware14.2"><![CDATA[Slackware 14.2]]></key>
 		<key name="os_list_sle-unknown"><![CDATA[SUSE Linux Enterprise Unknown]]></key>
@@ -3787,6 +3836,7 @@ We will sleep a bit and try again.
 		<key name="os_list_sle15-unknown"><![CDATA[SUSE Linux Enterprise 15 Unknown]]></key>
 		<key name="os_list_sle15sp1"><![CDATA[SUSE Linux Enterprise 15 SP1]]></key>
 		<key name="os_list_sle15sp2"><![CDATA[SUSE Linux Enterprise 15 SP2]]></key>
+		<key name="os_list_sle15sp3"><![CDATA[SUSE Linux Enterprise 15 SP3]]></key>
 		<key name="os_list_sled10"><![CDATA[SUSE Linux Enterprise Desktop 10]]></key>
 		<key name="os_list_sled10sp1"><![CDATA[SUSE Linux Enterprise Desktop 10 SP1]]></key>
 		<key name="os_list_sled10sp2"><![CDATA[SUSE Linux Enterprise Desktop 10 SP2]]></key>
@@ -3805,6 +3855,7 @@ We will sleep a bit and try again.
 		<key name="os_list_sled12sp4"><![CDATA[SUSE Linux Enterprise Desktop 12 SP4]]></key>
 		<key name="os_list_sled12sp5"><![CDATA[SUSE Linux Enterprise Desktop 12 SP5]]></key>
 		<key name="os_list_sled9"><![CDATA[SUSE Linux Enterprise Desktop 9]]></key>
+		<key name="os_list_slem5.0"><![CDATA[SUSE Linux Enterprise Micro]]></key>
 		<key name="os_list_sles10"><![CDATA[SUSE Linux Enterprise Server 10]]></key>
 		<key name="os_list_sles10sp1"><![CDATA[SUSE Linux Enterprise Server 10 SP1]]></key>
 		<key name="os_list_sles10sp2"><![CDATA[SUSE Linux Enterprise Server 10 SP2]]></key>
@@ -3826,6 +3877,7 @@ We will sleep a bit and try again.
 		<key name="os_list_solaris10"><![CDATA[Solaris 10]]></key>
 		<key name="os_list_solaris11"><![CDATA[Oracle Solaris 11]]></key>
 		<key name="os_list_solaris9"><![CDATA[Solaris 9]]></key>
+		<key name="os_list_trisquel9"><![CDATA[Trisquel]]></key>
 		<key name="os_list_ubuntu10.04"><![CDATA[Ubuntu 10.04 LTS]]></key>
 		<key name="os_list_ubuntu10.10"><![CDATA[Ubuntu 10.10]]></key>
 		<key name="os_list_ubuntu11.04"><![CDATA[Ubuntu 11.04]]></key>
@@ -3846,8 +3898,10 @@ We will sleep a bit and try again.
 		<key name="os_list_ubuntu18.10"><![CDATA[Ubuntu 18.10]]></key>
 		<key name="os_list_ubuntu19.04"><![CDATA[Ubuntu 19.04]]></key>
 		<key name="os_list_ubuntu19.10"><![CDATA[Ubuntu 19.10]]></key>
-		<key name="os_list_ubuntu20.04"><![CDATA[Ubuntu 20.04]]></key>
+		<key name="os_list_ubuntu20.04"><![CDATA[Ubuntu 20.04 LTS]]></key>
 		<key name="os_list_ubuntu20.10"><![CDATA[Ubuntu 20.10]]></key>
+		<key name="os_list_ubuntu21.04"><![CDATA[Ubuntu 21.04]]></key>
+		<key name="os_list_ubuntu21.10"><![CDATA[Ubuntu 21.10]]></key>
 		<key name="os_list_ubuntu4.10"><![CDATA[Ubuntu 4.10]]></key>
 		<key name="os_list_ubuntu5.04"><![CDATA[Ubuntu 5.04]]></key>
 		<key name="os_list_ubuntu5.10"><![CDATA[Ubuntu 5.10]]></key>
@@ -3859,6 +3913,7 @@ We will sleep a bit and try again.
 		<key name="os_list_ubuntu8.10"><![CDATA[Ubuntu 8.10]]></key>
 		<key name="os_list_ubuntu9.04"><![CDATA[Ubuntu 9.04]]></key>
 		<key name="os_list_ubuntu9.10"><![CDATA[Ubuntu 9.10]]></key>
+		<key name="os_list_unknown"><![CDATA[Unknown]]></key>
 		<key name="os_list_voidlinux"><![CDATA[Void Linux]]></key>
 		<key name="os_list_win1.0"><![CDATA[Microsoft Windows 1.0]]></key>
 		<key name="os_list_win10"><![CDATA[Microsoft Windows 10]]></key>
@@ -3869,6 +3924,7 @@ We will sleep a bit and try again.
 		<key name="os_list_win2k12r2"><![CDATA[Microsoft Windows Server 2012 R2]]></key>
 		<key name="os_list_win2k16"><![CDATA[Microsoft Windows Server 2016]]></key>
 		<key name="os_list_win2k19"><![CDATA[Microsoft Windows Server 2019]]></key>
+		<key name="os_list_win2k22"><![CDATA[Microsoft Windows Server 2022]]></key>
 		<key name="os_list_win2k3"><![CDATA[Microsoft Windows Server 2003]]></key>
 		<key name="os_list_win2k3r2"><![CDATA[Microsoft Windows Server 2003 R2]]></key>
 		<key name="os_list_win2k8"><![CDATA[Microsoft Windows Server 2008]]></key>
@@ -3886,7 +3942,6 @@ We will sleep a bit and try again.
 		<key name="os_list_winnt4.0"><![CDATA[Microsoft Windows NT Server 4.0]]></key>
 		<key name="os_list_winvista"><![CDATA[Microsoft Windows Vista]]></key>
 		<key name="os_list_winxp"><![CDATA[Microsoft Windows XP]]></key>
-		<key name="os_list_unknown"><![CDATA[Unknown]]></key>
 		
 	</language>
 	<!-- 日本語 -->