foreman_discovery 19.0.2 → 21.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cda16d49c5599931d1446f4cd8166f92b2671e1acb24e7d7cd8e89ed158d303
-  data.tar.gz: e126cbf08924d0e09c9b0b367dc4ab8f2aadb4bdd8cd0bf1a69edca6c46cc915
+  metadata.gz: 96449844722349c5dbde7fe09e0ca06051bf7fa1a7bb87c36de52a103d505611
+  data.tar.gz: cb1bb8e19220de291965b37329d49231b58f40898936cba633be93f6ba5e2009
 SHA512:
-  metadata.gz: 1d1269213feae40fbdc833a3eea8a98a855b600e2513f44fd3f9dc452c09fa9c631c8ef02bf3ae485b1ef4bd1bd03efa733c5393b5b833d7c9d4c01c3259f3d8
-  data.tar.gz: 507e87375c35a562bc8ddb9aaccd51f58671772ea6e8a482150bf2bfb4bb665319744090bfd265102b8f98895a3e3075b731e0ce0c48e704561f898fcf1853dc
+  metadata.gz: 5f09bca16062aba8ae5d80ec8a2b9498dbaef24eef21f12702472ae0cce9bc083fa2a8635b968b09eeeba321fe63cfc3193d4fc4376c6cbacba0692f2dc4c9aa
+  data.tar.gz: 80b2978cc54e2790cd4bb17848e92a9831dfac040c47e138b600522a17bb92f8cbd07120af2f3830e107330d057870262a7be5b7b8a2c9cb75a9e84bc7e56f47

data/app/models/concerns/discovery_taxonomy_extensions.rb

@@ -2,6 +2,6 @@ module DiscoveryTaxonomyExtensions
   extend ActiveSupport::Concern
   included do
     has_many :discovered_hosts, :class_name => 'Host::Discovered'
-    before_destroy ActiveRecord::Base::EnsureNotUsedBy.new(:discovered_hosts)
+    before_destroy EnsureNotUsedBy.new(:discovered_hosts)
   end
 end

data/app/models/host/discovered.rb

@@ -63,7 +63,8 @@ class Host::Discovered < ::Host::Base
     bootif_mac = FacterUtils::bootif_mac(facts).try(:downcase)
     hostname = ''
     if Setting[:discovery_naming] == 'MAC-name'
-      hostname = NameGenerator.new.generate_next_mac_name(bootif_mac)
+      hostname_mac = return_first_valid_mac(Setting::Discovered.discovery_hostname_fact_array, facts) || bootif_mac
+      hostname = NameGenerator.new.generate_next_mac_name(hostname_mac)
     elsif Setting[:discovery_naming] == 'Random-name'
       hostname = NameGenerator.new.generate_next_random_name
     else
@@ -226,6 +227,14 @@ class Host::Discovered < ::Host::Base
     hostname
   end
 
+  def self.return_first_valid_mac(facts_array, facts)
+    return facts[facts_array] if !facts_array.is_a?(Array)
+    facts_array.each do |value|
+      return facts[value] if !facts[value].nil? && facts[value].match(/([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})/)
+    end
+    return nil
+  end
+
   def self.return_first_valid_fact(facts_array, facts)
     return facts[facts_array] if !facts_array.is_a?(Array)
     facts_array.each do |value|

data/app/services/foreman_discovery/host_converter.rb

@@ -52,14 +52,21 @@ class ForemanDiscovery::HostConverter
     end
   end
 
+  def self.ip_for_subnet(subnet, mac, ip) 
+    return ip if ip && subnet&.unused_ip(mac)&.ip_include?(ip)
+
+    unused_ip_for_subnet(subnet, mac, ip)
+  end
+
   def self.unused_ip_for_host(host, new_subnet = nil, new_subnet6 = nil)
     host.interfaces.each do |interface|
       next unless interface.managed?
 
       interface.subnet = new_subnet if new_subnet
       interface.subnet6 = new_subnet6 if new_subnet6
-      interface.ip = unused_ip_for_subnet(interface.subnet, interface.mac, interface.ip) if interface.subnet
-      interface.ip6 = unused_ip_for_subnet(interface.subnet6, interface.mac, interface.ip6) if interface.subnet6
+
+      interface.ip = ip_for_subnet(interface.subnet, interface.mac, interface.ip) if interface.subnet
+      interface.ip6 = ip_for_subnet(interface.subnet6, interface.mac, interface.ip6) if interface.subnet6
     end
   end
 

data/app/views/foreman_discovery/debian_kexec.erb

@@ -31,10 +31,12 @@ Extra options like --reset-vga can be set via "extra" array.
   options << 'console-setup/ask_detect=false console-setup/layout=USA console-setup/variant=USA keyboard-configuration/layoutcode=us localechooser/translation/warn-light=true localechooser/translation/warn-severe=true'
   options << "locale=#{host_param('lang') || 'en_US'}"
   options << "inst.stage2=#{@host.operatingsystem.medium_uri(@host)}" if @host.operatingsystem.name.match(/Atomic/i)
+  extra = []
+  extra << "--kexec-file-syscall" if @host.pxe_loader.include?('SecureBoot')
 -%>
 {
   "kernel": "<%= @kernel_uri %>",
   "initram": "<%= @initrd_uri %>",
   "append": "url=<%= foreman_url('provision') + "&static=yes" %> interface=<%= mac %> netcfg/get_ipaddress=<%= ip %> netcfg/get_netmask=<%= mask %> netcfg/get_gateway=<%= gw %> netcfg/get_nameservers=<%= dns %> netcfg/disable_dhcp=true netcfg/get_hostname=<%= @host.name %> BOOTIF=<%= bootif %> <%= options.compact.join(' ') %>",
-  "extra": []
+  "extra": <%= extra %>
 }

data/app/views/foreman_discovery/redhat_kexec.erb

@@ -41,6 +41,8 @@ Extra options like --reset-vga can be set via "extra" array.
   if @host.operatingsystem.name != 'Fedora' && @host.operatingsystem.major.to_i >= 7 && host_param_true?('fips_enabled')
     options.push('fips=1')
   end
+  extra = []
+  extra << "--kexec-file-syscall" if @host.pxe_loader.include?('SecureBoot')
 -%>
 {
   "kernel": "<%= @kernel_uri %>",
@@ -51,5 +53,5 @@ Extra options like --reset-vga can be set via "extra" array.
 <% else -%>
   "append": "inst.ks=<%= foreman_url('provision') + "&static=yes" %> kssendmac nicdelay=5 <%= "ip=#{ip} netmask=#{mask} gateway=#{gw} dns=#{dns} ksdevice=#{mac} BOOTIF=#{bootif} nomodeset nokaslr " + options.compact.join(' ') %>",
 <% end -%>
-  "extra": []
+  "extra": <%= extra %>
 }

data/lib/foreman_discovery/engine.rb

@@ -43,7 +43,7 @@ module ForemanDiscovery
 
     initializer 'foreman_discovery.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_discovery do
-        requires_foreman '>= 3.1'
+        requires_foreman '>= 3.2'
 
         # discovered hosts permissions
         security_block :discovery do

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "19.0.2"
+  VERSION = "21.0.0"
 end

data/locale/ca/foreman_discovery.edit.po

@@ -7,11 +7,11 @@
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015-2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 18.0.1\n"
+"Project-Id-Version: foreman_discovery 21.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-25 10:15+0100\n"
-"PO-Revision-Date: 2021-09-20 17:24+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2022-03-17 14:06+0100\n"
+"PO-Revision-Date: 2013-11-15 17:25+0000\n"
+"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2017\n"
 "Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)"
 "\n"
 "MIME-Version: 1.0\n"
@@ -464,31 +464,31 @@ msgstr "Objectes d'interès no vàlids, han de tenir un Hash"
 msgid "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:73
+#: ../app/models/host/discovered.rb:74
 msgid "Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting: %s"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:102
+#: ../app/models/host/discovered.rb:103
 msgid "Facts could not be imported"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:160
+#: ../app/models/host/discovered.rb:161
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr "No s'han pogut obtenir els objectes d'interès del servidor intermediari %{url}: %{error}"
 
-#: ../app/models/host/discovered.rb:178
+#: ../app/models/host/discovered.rb:179
 msgid "Unable to perform reboot on %{name} (%{url}): %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:182 ../app/models/host/discovered.rb:205
+#: ../app/models/host/discovered.rb:183 ../app/models/host/discovered.rb:206
 msgid "Unable to perform %{action} on %{ips}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:201
+#: ../app/models/host/discovered.rb:202
 msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:225
+#: ../app/models/host/discovered.rb:226
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr ""
 
@@ -722,15 +722,15 @@ msgstr ""
 
 #: ../app/services/foreman_discovery/fact_to_category_resolver.rb:8
 msgid "Storage"
-msgstr ""
+msgstr "Emmagatzematge"
 
 #: ../app/services/foreman_discovery/fact_to_category_resolver.rb:9
 msgid "Hardware"
-msgstr ""
+msgstr "Maquinari"
 
 #: ../app/services/foreman_discovery/fact_to_category_resolver.rb:10
 msgid "Network"
-msgstr ""
+msgstr "Xarxa"
 
 #: ../app/services/foreman_discovery/fact_to_category_resolver.rb:11
 msgid "Software"
@@ -876,7 +876,7 @@ msgstr "Interfícies"
 
 #: ../app/views/discovered_hosts/show.html.erb:44
 msgid "Type"
-msgstr ""
+msgstr "Tipus"
 
 #: ../app/views/discovered_hosts/show.html.erb:45
 msgid "Identifier"
@@ -952,7 +952,7 @@ msgstr "Nom d'amfitrió per als amfitrions aprovisionats"
 
 #: ../app/views/discovery_rules/_form.html.erb:26
 msgid "Hosts Limit"
-msgstr ""
+msgstr "Límit d'amfitrions"
 
 #: ../app/views/discovery_rules/_form.html.erb:26
 msgid "Maximum hosts provisioned with this rule (0 = unlimited)"
@@ -1012,7 +1012,7 @@ msgstr "Consulta"
 
 #: ../app/views/discovery_rules/index.html.erb:9
 msgid "Host Group"
-msgstr ""
+msgstr "Grup dels amfitrions"
 
 #: ../app/views/discovery_rules/index.html.erb:10
 msgid "Hosts/Limit"
@@ -1048,11 +1048,11 @@ msgstr ""
 
 #: ../db/seeds.d/80_discovery_ui_notification.rb:13
 msgid "Details"
-msgstr ""
+msgstr "Detalls"
 
 #: ../db/seeds.d/80_discovery_ui_notification.rb:18
 msgid "Hosts"
-msgstr ""
+msgstr "Amfitrions"
 
 #: ../db/seeds.d/80_discovery_ui_notification.rb:20
 msgid "Error message goes here"
@@ -1082,6 +1082,14 @@ msgstr ""
 msgid "documentation"
 msgstr ""
 
+#: ../webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/EmptyState.js:7
+msgid "No discovered hosts found in this context. This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
+msgstr ""
+
+#: ../webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/EmptyState.js:12
+msgid "No Discovery Rules found in this context. Create Discovery Rules to perform automated provisioning on Discovered Hosts"
+msgstr ""
+
 #: action_names.rb:2
 msgid "Remote action:"
 msgstr ""

data/locale/ca/foreman_discovery.po

@@ -7,10 +7,10 @@
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015-2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 18.0.1\n"
+"Project-Id-Version: foreman_discovery 21.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-09-20 17:24+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2013-11-15 17:25+0000\n"
+"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2017\n"
 "Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)"
 "\n"
 "MIME-Version: 1.0\n"
@@ -134,7 +134,7 @@ msgid "Destroyed selected hosts"
 msgstr "S'han destruït els amfitrions seleccionats"
 
 msgid "Details"
-msgstr ""
+msgstr "Detalls"
 
 msgid "Disable"
 msgstr "Inhabilita"
@@ -310,7 +310,7 @@ msgid "Foreman discovered hosts summary"
 msgstr ""
 
 msgid "Hardware"
-msgstr ""
+msgstr "Maquinari"
 
 msgid "Hardware facts"
 msgstr ""
@@ -331,7 +331,7 @@ msgid "Host %{host} was provisioned with rule %{rule}"
 msgstr "L'amfitrió %{host} va ser aprovisionat amb la regla %{rule}"
 
 msgid "Host Group"
-msgstr ""
+msgstr "Grup dels amfitrions"
 
 msgid "Host group location %s must also be associated to the discovery rule"
 msgid_plural "Host group locations %s must also be associated to the discovery rule"
@@ -365,10 +365,10 @@ msgid "Hostnames must not start with numbers. A good approach is to use unique i
 msgstr ""
 
 msgid "Hosts"
-msgstr ""
+msgstr "Amfitrions"
 
 msgid "Hosts Limit"
-msgstr ""
+msgstr "Límit d'amfitrions"
 
 msgid "Hosts/Limit"
 msgstr ""
@@ -497,7 +497,7 @@ msgid "Name of the parameter"
 msgstr "Nom del paràmetre"
 
 msgid "Network"
-msgstr ""
+msgstr "Xarxa"
 
 msgid "Network facts"
 msgstr ""
@@ -511,12 +511,18 @@ msgstr ""
 msgid "New in the last 24 hours"
 msgstr "Nou en les últimes 24 hores"
 
+msgid "No Discovery Rules found in this context. Create Discovery Rules to perform automated provisioning on Discovered Hosts"
+msgstr ""
+
 msgid "No discovered hosts available"
 msgstr ""
 
 msgid "No discovered hosts for the selected period"
 msgstr ""
 
+msgid "No discovered hosts found in this context. This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
+msgstr ""
+
 msgid "No discovered hosts to provision"
 msgstr "Sense amfitrions descoberts per aprovisionar"
 
@@ -677,7 +683,7 @@ msgid "Specify target hostname template pattern in the same syntax as in Provisi
 msgstr ""
 
 msgid "Storage"
-msgstr ""
+msgstr "Emmagatzematge"
 
 msgid "Storage facts"
 msgstr ""
@@ -716,7 +722,7 @@ msgid "This might take a while, as all hosts, facts and reports will be destroye
 msgstr ""
 
 msgid "Type"
-msgstr ""
+msgstr "Tipus"
 
 msgid "Type of name generator"
 msgstr ""

data/locale/de/foreman_discovery.edit.po

@@ -15,11 +15,11 @@
 # stbenjam <stephen@redhat.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 18.0.1\n"
+"Project-Id-Version: foreman_discovery 21.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-25 10:15+0100\n"
-"PO-Revision-Date: 2021-10-13 15:12+0000\n"
-"Last-Translator: Patrick Dolinic\n"
+"POT-Creation-Date: 2022-03-17 14:06+0100\n"
+"PO-Revision-Date: 2013-11-15 17:25+0000\n"
+"Last-Translator: Patrick Dolinic, 2021\n"
 "Language-Team: German (http://www.transifex.com/foreman/foreman/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -471,31 +471,31 @@ msgstr "Ungültige Fakten, es muss sich um einen Hash handeln"
 msgid "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
 msgstr "Erwartetes discovery_fact '%s' fehlt, primäre Schnittstelle kann nicht gefunden und Hostname nicht eingestellt werden"
 
-#: ../app/models/host/discovered.rb:73
+#: ../app/models/host/discovered.rb:74
 msgid "Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting: %s"
 msgstr "Ungültige Fakten: Hash enthält keinen gültigen Wert für einen der Fakten in der Einstellung Discovery_Hostname: %s"
 
-#: ../app/models/host/discovered.rb:102
+#: ../app/models/host/discovered.rb:103
 msgid "Facts could not be imported"
 msgstr "Fakten konnten nicht importiert werden"
 
-#: ../app/models/host/discovered.rb:160
+#: ../app/models/host/discovered.rb:161
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr "Fakten konnten nicht vom Proxy %{url} abgerufen werden: %{error}"
 
-#: ../app/models/host/discovered.rb:178
+#: ../app/models/host/discovered.rb:179
 msgid "Unable to perform reboot on %{name} (%{url}): %{msg}"
 msgstr "Neustart auf %{name} (%{url}) nicht möglich: %{msg}"
 
-#: ../app/models/host/discovered.rb:182 ../app/models/host/discovered.rb:205
+#: ../app/models/host/discovered.rb:183 ../app/models/host/discovered.rb:206
 msgid "Unable to perform %{action} on %{ips}"
 msgstr "%{action} auf %{ips} kann nicht ausgeführt werden"
 
-#: ../app/models/host/discovered.rb:201
+#: ../app/models/host/discovered.rb:202
 msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
 msgstr "Kexec kann auf %{name} (%{url}) nicht ausgeführt werden: %{msg}"
 
-#: ../app/models/host/discovered.rb:225
+#: ../app/models/host/discovered.rb:226
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr "Ungültiger Hostname: Konnte den Hostnamen nicht normalisieren"
 
@@ -1089,6 +1089,14 @@ msgstr "Weitere Informationen finden Sie unter"
 msgid "documentation"
 msgstr "Dokumentation"
 
+#: ../webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/EmptyState.js:7
+msgid "No discovered hosts found in this context. This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
+msgstr ""
+
+#: ../webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/EmptyState.js:12
+msgid "No Discovery Rules found in this context. Create Discovery Rules to perform automated provisioning on Discovered Hosts"
+msgstr ""
+
 #: action_names.rb:2
 msgid "Remote action:"
 msgstr "Entfernte Aktion:"

data/locale/de/foreman_discovery.po

@@ -15,10 +15,10 @@
 # stbenjam <stephen@redhat.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 18.0.1\n"
+"Project-Id-Version: foreman_discovery 21.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-10-13 15:12+0000\n"
-"Last-Translator: Patrick Dolinic\n"
+"PO-Revision-Date: 2013-11-15 17:25+0000\n"
+"Last-Translator: Patrick Dolinic, 2021\n"
 "Language-Team: German (http://www.transifex.com/foreman/foreman/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -518,12 +518,18 @@ msgstr "Neue Hosts"
 msgid "New in the last 24 hours"
 msgstr "Neu in den letzten 24 Stunden"
 
+msgid "No Discovery Rules found in this context. Create Discovery Rules to perform automated provisioning on Discovered Hosts"
+msgstr ""
+
 msgid "No discovered hosts available"
 msgstr "Keine entdeckten Hosts verfügbar"
 
 msgid "No discovered hosts for the selected period"
 msgstr "Keine entdeckten Hosts für den ausgewählten Zeitraum"
 
+msgid "No discovered hosts found in this context. This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
+msgstr ""
+
 msgid "No discovered hosts to provision"
 msgstr "Keine entdeckten Hosts zur Bereitstellung"
 

data/locale/en/foreman_discovery.edit.po

@@ -2,7 +2,7 @@
 # This file is distributed under the same license as the foreman_discovery package.
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 18.0.1\n"
+"Project-Id-Version: foreman_discovery 21.0.0\n"
 "Report-Msgid-Bugs-To: foreman-dev@googlegroups.com\n"
 "PO-Revision-Date: 2015-12-27 01:18+0000\n"
 "Last-Translator: \n"
@@ -456,31 +456,31 @@ msgstr ""
 msgid "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:73
+#: ../app/models/host/discovered.rb:74
 msgid "Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting: %s"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:102
+#: ../app/models/host/discovered.rb:103
 msgid "Facts could not be imported"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:160
+#: ../app/models/host/discovered.rb:161
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:178
+#: ../app/models/host/discovered.rb:179
 msgid "Unable to perform reboot on %{name} (%{url}): %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:182 ../app/models/host/discovered.rb:205
+#: ../app/models/host/discovered.rb:183 ../app/models/host/discovered.rb:206
 msgid "Unable to perform %{action} on %{ips}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:201
+#: ../app/models/host/discovered.rb:202
 msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:225
+#: ../app/models/host/discovered.rb:226
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr ""
 
@@ -1074,6 +1074,14 @@ msgstr ""
 msgid "documentation"
 msgstr ""
 
+#: ../webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/EmptyState.js:7
+msgid "No discovered hosts found in this context. This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
+msgstr ""
+
+#: ../webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/EmptyState.js:12
+msgid "No Discovery Rules found in this context. Create Discovery Rules to perform automated provisioning on Discovered Hosts"
+msgstr ""
+
 #: action_names.rb:2
 msgid "Remote action:"
 msgstr ""

data/locale/en/foreman_discovery.po

@@ -2,7 +2,7 @@
 # This file is distributed under the same license as the foreman_discovery package.
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 18.0.1\n"
+"Project-Id-Version: foreman_discovery 21.0.0\n"
 "Report-Msgid-Bugs-To: foreman-dev@googlegroups.com\n"
 "PO-Revision-Date: 2015-12-27 01:18+0000\n"
 "Last-Translator: \n"
@@ -504,12 +504,18 @@ msgstr ""
 msgid "New in the last 24 hours"
 msgstr ""
 
+msgid "No Discovery Rules found in this context. Create Discovery Rules to perform automated provisioning on Discovered Hosts"
+msgstr ""
+
 msgid "No discovered hosts available"
 msgstr ""
 
 msgid "No discovered hosts for the selected period"
 msgstr ""
 
+msgid "No discovered hosts found in this context. This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
+msgstr ""
+
 msgid "No discovered hosts to provision"
 msgstr ""
 

data/locale/en_GB/foreman_discovery.edit.po

@@ -10,11 +10,11 @@
 # Lukáš Zapletal, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 18.0.1\n"
+"Project-Id-Version: foreman_discovery 21.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-25 10:15+0100\n"
-"PO-Revision-Date: 2021-09-20 17:24+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2022-03-17 14:06+0100\n"
+"PO-Revision-Date: 2013-11-15 17:25+0000\n"
+"Last-Translator: Andi Chandler <andi@gowling.com>, 2015-2019\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/foreman/fore"
 "man/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -467,31 +467,31 @@ msgstr "Invalid facts, must be a Hash"
 msgid "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
 msgstr "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
 
-#: ../app/models/host/discovered.rb:73
+#: ../app/models/host/discovered.rb:74
 msgid "Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting: %s"
 msgstr "Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting: %s"
 
-#: ../app/models/host/discovered.rb:102
+#: ../app/models/host/discovered.rb:103
 msgid "Facts could not be imported"
 msgstr "Facts could not be imported"
 
-#: ../app/models/host/discovered.rb:160
+#: ../app/models/host/discovered.rb:161
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr "Could not get facts from proxy %{url}: %{error}"
 
-#: ../app/models/host/discovered.rb:178
+#: ../app/models/host/discovered.rb:179
 msgid "Unable to perform reboot on %{name} (%{url}): %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:182 ../app/models/host/discovered.rb:205
+#: ../app/models/host/discovered.rb:183 ../app/models/host/discovered.rb:206
 msgid "Unable to perform %{action} on %{ips}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:201
+#: ../app/models/host/discovered.rb:202
 msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:225
+#: ../app/models/host/discovered.rb:226
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr "Invalid hostname: Could not normalise the hostname"
 
@@ -1085,6 +1085,14 @@ msgstr ""
 msgid "documentation"
 msgstr ""
 
+#: ../webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/EmptyState.js:7
+msgid "No discovered hosts found in this context. This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
+msgstr ""
+
+#: ../webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/EmptyState.js:12
+msgid "No Discovery Rules found in this context. Create Discovery Rules to perform automated provisioning on Discovered Hosts"
+msgstr ""
+
 #: action_names.rb:2
 msgid "Remote action:"
 msgstr "Remote action:"