foreman_discovery 16.1.4 → 16.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93f2f0828e78292ef40c46535f34d32d616ccf00b91465a5ca103d497510de5b
-  data.tar.gz: 3f661f14112f905f9e6b4c15955ebdd8b942f5a88349ab08c6568a07b51bed5f
+  metadata.gz: accf12de8ae1253e5023ba98c65da7c3af14aa8da4691fe67dd7f18bc5717518
+  data.tar.gz: 0dd4c83a875917ccf3933679a31a747d8f559e5195415fab619cc0220bcd97c4
 SHA512:
-  metadata.gz: bbbc9c3d5fa3d24b86beecb90c7237e5ea8093331762a9667576d3472df5e7e099dcf076c0d3e277c8bc75bfc56a8ff5079dd381514e7ac4ded899bc22205e37
-  data.tar.gz: 209b24b5230750c5a428198c87405607ac925fa6bf173a45c5e593a93408d4b8a46e476f3563c93f2031b8c965bb3f3077b146283a1f87aec29df94a037c72e1
+  metadata.gz: a8fd61670a325106898043ab9533f7512835394a6141139580436e9c8fdd0027ff0aee02c0a53f6d92b5b4535d5bcbcabfb1cd91ddc0fd85ce8a0a54d2cde27e
+  data.tar.gz: 90263e8535e3d338ee335a280ff89dafd188d7e92c8f7becb340bc6ede0884bbf4ee915ad158de546c84058240c7338d1d4a736f3124e8c6c57f935862073f83

data/app/controllers/api/v2/discovered_hosts_controller.rb

@@ -102,16 +102,9 @@ module Api
         state = true
         User.as_anonymous_admin do
           @discovered_host = Host::Discovered.import_host(facts)
-          # Host::Based.set_taxonomies sets taxonomies during import from either
-          # facts or via Global Foreman setting "default_taxonomy", reset it back so
-          # the anonymous admin can see all records. We set taxonomy explicitly via
-          # discovery SubnetAndTaxonomy import hook and enforce taxnomy manually
-          # in find_discovery_rule method via validate_rule_by_taxonomy.
-          Taxonomy.no_taxonomy_scope do
-            Rails.logger.warn 'Discovered facts import unsuccessful, skipping auto provisioning' unless @discovered_host
-            if Setting['discovery_auto'] && @discovered_host && (rule = find_discovery_rule(@discovered_host))
-              state = perform_auto_provision(@discovered_host, rule)
-            end
+          Rails.logger.warn 'Discovered facts import unsuccessful, skipping auto provisioning' unless @discovered_host
+          if Setting['discovery_auto'] && @discovered_host && (rule = find_discovery_rule(@discovered_host))
+            state = perform_auto_provision(@discovered_host, rule)
           end
         end
         process_response state

data/app/models/host/discovered.rb

@@ -44,9 +44,13 @@ class Host::Discovered < ::Host::Base
 
   # Discovery import workflow:
   # discovered#import_host ->
-  #  discovered#import_facts -> base#import_facts -> base#parse_facts ->
-  #  discovered#populate_fields_from_facts -> base#populate_fields_from_facts -> base#set_interfaces
-  #  discovered#populate_discovery_fields_from_facts
+  # ForemanDiscovery::HostFactImporter#import_facts ->
+  # ::HostFactImporter#import_facts ->
+  # ::HostFactImporter#parse_facts ->
+  # discovered#populate_fields_from_facts ->
+  # base#populate_fields_from_facts ->
+  # base#set_interfaces ->
+  # discovered#populate_discovery_fields_from_facts
   def self.import_host facts
     raise(::Foreman::Exception.new(N_("Invalid facts, must be a Hash"))) unless facts.is_a?(Hash) || facts.is_a?(ActionController::Parameters)
 
@@ -92,19 +96,11 @@ class Host::Discovered < ::Host::Base
 
     # and save (interfaces are created via puppet parser extension)
     host.save(:validate => false) if host.new_record?
-    raise ::Foreman::Exception.new(N_("Facts could not be imported")) unless host.import_facts(facts)
+    importer = ForemanDiscovery::HostFactImporter.new(host)
+    raise ::Foreman::Exception.new(N_("Facts could not be imported")) unless importer.import_facts(facts)
     host
   end
 
-  def import_facts(facts)
-    # Discovered Hosts won't report in via puppet, so we can use that field to
-    # record the last time it sent facts...
-    self.last_report = Time.now
-    # Set the correct facts type for new foreman facts importing code.
-    facts[:_type] = :foreman_discovery
-    super(facts)
-  end
-
   def setup_clone
     # Nic::Managed needs this method but Discovered hosts shouldn't
     # be doing orchestration anyway...
@@ -144,7 +140,7 @@ class Host::Discovered < ::Host::Base
   def refresh_facts
     facts = ::ForemanDiscovery::NodeAPI::Inventory.new(:url => proxy_url(self.ip)).facter
     self.class.import_host facts
-    import_facts facts
+    ::ForemanDiscovery::HostFactImporter.new(self).import_facts facts
   rescue => e
     ::Foreman::Logging.exception("Unable to get facts from proxy", e)
     raise ::Foreman::WrappedException.new(e, N_("Could not get facts from proxy %{url}: %{error}"), :url => proxy_url, :error => e)

data/app/models/setting/discovered.rb

@@ -8,7 +8,9 @@ class Setting::Discovered < ::Setting
   BLANK_ATTRS << 'discovery_facts_hardware'
   BLANK_ATTRS << 'discovery_facts_network'
   BLANK_ATTRS << 'discovery_facts_ipmi'
-  BLANK_ATTRS << 'discovery_prefix'
+
+  STRING_PRESENCE_ATTRS = ['discovery_hostname', 'discovery_prefix']
+  validates :value, :presence => true, :if => proc { |s| STRING_PRESENCE_ATTRS.include?(s.name) }
 
   def self.default_settings
     [

data/app/services/foreman_discovery/host_fact_importer.rb

@@ -0,0 +1,10 @@
+class ForemanDiscovery::HostFactImporter < ::HostFactImporter
+    def import_facts(facts)
+        # Discovered Hosts won't report in via puppet, so we can use that field to
+        # record the last time it sent facts...
+        host.last_report = Time.now
+        # Set the correct facts type for new foreman facts importing code.
+        facts[:_type] = :foreman_discovery
+        super(facts)
+    end
+end

data/app/views/foreman_discovery/debian_kexec.erb

@@ -12,9 +12,10 @@ environments. The template must generate JSON format with the following items
 "kernel", "initram", "append" and "extra". The kexec command is composed in
 the following way:
 
-kexec --force --reset-vga --append=$append --initrd=$initram $extra $kernel
+kexec --force --debug --append=$append --initrd=$initram $extra $kernel
 
 Please read kexec(8) man page for more information about semantics.
+Extra options like --reset-vga can be set via "extra" array.
 -%>
 <%
   mac = @host.facts['discovery_bootif']

data/app/views/foreman_discovery/redhat_kexec.erb

@@ -22,9 +22,10 @@ environments. The template must generate JSON format with the following items
 "kernel", "initram", "append" and "extra". The kexec command is composed in
 the following way:
 
-kexec --force --reset-vga --append=$append --initrd=$initram $extra $kernel
+kexec --force --debug --append=$append --initrd=$initram $extra $kernel
 
 Please read kexec(8) man page for more information about semantics.
+Extra options like --reset-vga can be set via "extra" array.
 -%>
 <%
   mac = @host.facts['discovery_bootif']

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 '>= 1.24.0'
+        requires_foreman '>= 2.2'
 
         # discovered hosts permissions
         security_block :discovery do

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "16.1.4"
+  VERSION = "16.2.0"
 end

data/locale/ca/foreman_discovery.edit.po

@@ -7,10 +7,10 @@
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015-2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 16.3.4\n"
+"Project-Id-Version: foreman_discovery 16.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2020-10-29 17:16+0000\n"
-"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
+"PO-Revision-Date: 2020-05-26 17:21+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)"
 "\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgstr "Nombre d'entrades per petició"
 msgid "Show a discovered host"
 msgstr "Mostra un amfitrió descobert"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:37 ../app/controllers/api/v2/discovered_hosts_controller.rb:85
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:37 ../app/controllers/api/v2/discovered_hosts_controller.rb:79
 msgid "DHCP filename option (Grub2 or PXELinux by default)"
 msgstr ""
 
@@ -55,10 +55,6 @@ msgstr "Crea un amfitrió descobert per a provar-ho  (utilitzeu /facts per crear
 msgid "Provision a discovered host"
 msgstr "Aprovisiona un amfitrió descobert"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:54 ../app/controllers/api/v2/discovered_hosts_controller.rb:57 ../app/controllers/api/v2/discovered_hosts_controller.rb:58 ../app/controllers/api/v2/discovered_hosts_controller.rb:61 ../app/controllers/api/v2/discovered_hosts_controller.rb:64
-msgid "required if host is managed and value is not inherited from host group"
-msgstr ""
-
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:55
 msgid "not required if using a subnet with DHCP proxy"
 msgstr "no es requereix si s'està utilitzant una subxarxa amb servidor intermediari DHCP"
@@ -67,99 +63,71 @@ msgstr "no es requereix si s'està utilitzant una subxarxa amb servidor intermed
 msgid "not required if it's a virtual machine"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:62
-msgid "required if not imaged based provisioning and host is managed and value is not inherited from host group"
-msgstr ""
-
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:63
-msgid "required if host is managed and custom partition has not been defined"
-msgstr "es requereix si l'amfitrió està gestionat i no s'ha definit la partició personalitzada"
-
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:69
-msgid "Host's owner type"
-msgstr "Tipus de propietari de l'amfitrió"
-
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:72
-msgid "Host's parameters (array or indexed hash)"
-msgstr ""
-
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:73
-msgid "Name of the parameter"
-msgstr "Nom del paràmetre"
-
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:74
-msgid "Parameter value"
-msgstr "Valor del paràmetre"
-
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:75
-msgid "Type of value"
-msgstr ""
-
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:82
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:76
 msgid "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:84
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:78
 msgid "required if value is not inherited from host group or default password in settings"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:95
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:89
 msgid "Delete a discovered host"
 msgstr "Suprimeix un amfitrió descobert"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:102
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:96
 msgid "Upload facts for a host, creating the host if required"
 msgstr "Puja els objectes d'interès per a un amfitrió, creant el nou amfitrió si fos necessari"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:103
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:97
 msgid "hash containing facts for the host with minimum set of facts: discovery_bootif, macaddress_eth0, ipaddress, ipaddress_eth0, interfaces: eth0 (example in case primary interface is named eth0)"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:129
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:116
 msgid "Execute rules against a discovered host"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:135 ../app/controllers/discovered_hosts_controller.rb:160
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:122 ../app/controllers/discovered_hosts_controller.rb:160
 msgid "Host %{host} was provisioned with rule %{rule}"
 msgstr "L'amfitrió %{host} va ser aprovisionat amb la regla %{rule}"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:138
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:125
 msgid "Unable to provision %{host}: %{errors}"
 msgstr "No es pot aprovisionar a %{host}: %{errors}"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:144 ../app/controllers/discovered_hosts_controller.rb:167
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:131 ../app/controllers/discovered_hosts_controller.rb:167
 msgid "No rule found for host %s"
 msgstr "No s'ha trobat cap regla per a l'amfitrió %s"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:151
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:138
 msgid "Execute rules against all currently discovered hosts"
 msgstr "Executa les regles contra tots els amfitrions detectats actualment"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:155 ../app/controllers/discovered_hosts_controller.rb:173
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:142 ../app/controllers/discovered_hosts_controller.rb:173
 msgid "Errors during auto provisioning: %s"
 msgstr "Erros durant l'auto aprovisionament: %s"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:158 ../app/controllers/discovered_hosts_controller.rb:176
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:145 ../app/controllers/discovered_hosts_controller.rb:176
 msgid "No discovered hosts to provision"
 msgstr "Sense amfitrions descoberts per aprovisionar"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:180
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:167
 msgid "%s discovered hosts were provisioned"
 msgstr "%s amfitrions descoberts van ser aprovisionats"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:191
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:178
 msgid "Refreshing the facts of a discovered host"
 msgstr "S'estan refrescant els objectes d'interès d'un amfitrió descobert"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:200
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:187
 msgid "Rebooting a discovered host"
 msgstr "S'està reiniciant un amfitrió descobert"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:209
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:196
 msgid "Rebooting all discovered hosts"
 msgstr "S'estan reiniciant tots els amfitrions descoberts"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:220 ../app/controllers/discovered_hosts_controller.rb:129
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:207 ../app/controllers/discovered_hosts_controller.rb:129
 msgid "Discovered hosts are rebooting now"
 msgstr "Ara s'estan reiniciant els amfitrions descoberts"
 
@@ -331,11 +299,11 @@ msgstr "Cap amfitrió seleccionat"
 msgid "Something went wrong while selecting hosts - %s"
 msgstr "Alguna cosa va anar malament mentre se seleccionaven els amfitrions - %s"
 
-#: ../app/controllers/discovery_rules_controller.rb:72
+#: ../app/controllers/discovery_rules_controller.rb:68
 msgid "Rule enabled"
 msgstr "Regla habilitada"
 
-#: ../app/controllers/discovery_rules_controller.rb:72
+#: ../app/controllers/discovery_rules_controller.rb:68
 msgid "Rule disabled"
 msgstr "Regla inhabilitada"
 
@@ -343,15 +311,15 @@ msgstr "Regla inhabilitada"
 msgid "%s ago"
 msgstr "fa %s"
 
-#: ../app/helpers/discovered_hosts_helper.rb:14 ../app/helpers/discovered_hosts_helper.rb:29 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:40
+#: ../app/helpers/discovered_hosts_helper.rb:14 ../app/helpers/discovered_hosts_helper.rb:29 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:37
 msgid "Auto Provision"
 msgstr "Auto aprovisiona"
 
-#: ../app/helpers/discovered_hosts_helper.rb:15 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:41
+#: ../app/helpers/discovered_hosts_helper.rb:15 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:38
 msgid "Refresh facts"
 msgstr "Refresca els objectes d'interès"
 
-#: ../app/helpers/discovered_hosts_helper.rb:16 ../app/helpers/discovered_hosts_helper.rb:30 ../app/models/setting/discovered.rb:24 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:42
+#: ../app/helpers/discovered_hosts_helper.rb:16 ../app/helpers/discovered_hosts_helper.rb:30 ../app/models/setting/discovered.rb:24 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:39
 msgid "Reboot"
 msgstr "Reinicia"
 
@@ -363,7 +331,7 @@ msgstr "Enrere"
 msgid "Select Action"
 msgstr "Selecciona l'acció"
 
-#: ../app/helpers/discovered_hosts_helper.rb:23 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:43
+#: ../app/helpers/discovered_hosts_helper.rb:23 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:40
 msgid "Delete %s?"
 msgstr "Voleu suprimir %s?"
 
@@ -403,7 +371,7 @@ msgstr "Es va informar en els últims 7 dies"
 msgid "Provision"
 msgstr "Aprovisiona"
 
-#: ../app/helpers/discovery_rules_helper.rb:26 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:1 ../app/views/discovered_hosts/welcome.html.erb:8 ../lib/foreman_discovery/engine.rb:159 ../lib/foreman_discovery/engine.rb:174
+#: ../app/helpers/discovery_rules_helper.rb:26 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:1 ../app/views/discovered_hosts/welcome.html.erb:1 ../app/views/discovered_hosts/welcome.html.erb:6 ../lib/foreman_discovery/engine.rb:158 ../lib/foreman_discovery/engine.rb:173
 msgid "Discovered Hosts"
 msgstr ""
 
@@ -753,15 +721,15 @@ msgstr ""
 msgid "Host"
 msgstr "Amfitrió"
 
-#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:4 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:7 ../app/views/discovered_hosts/_selected_hosts.html.erb:8 ../app/views/discovered_mailer/discovered_summary.html.erb:18 ../app/views/discovered_mailer/discovered_summary.text.erb:10
+#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:4 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:6 ../app/views/discovered_hosts/_selected_hosts.html.erb:8 ../app/views/discovered_mailer/discovered_summary.html.erb:18 ../app/views/discovered_mailer/discovered_summary.text.erb:10
 msgid "Model"
 msgstr "Model"
 
-#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:5 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:9 ../app/views/discovered_mailer/discovered_summary.html.erb:20 ../app/views/discovered_mailer/discovered_summary.text.erb:12
+#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:5 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:8 ../app/views/discovered_mailer/discovered_summary.html.erb:20 ../app/views/discovered_mailer/discovered_summary.text.erb:12
 msgid "CPUs"
 msgstr "Les CPU"
 
-#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:6 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:10 ../app/views/discovered_mailer/discovered_summary.html.erb:21 ../app/views/discovered_mailer/discovered_summary.text.erb:13
+#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:6 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:9 ../app/views/discovered_mailer/discovered_summary.html.erb:21 ../app/views/discovered_mailer/discovered_summary.text.erb:13
 msgid "Memory"
 msgstr "Memòria"
 
@@ -773,59 +741,59 @@ msgstr ""
 msgid "Create Host"
 msgstr "Crea un amfitrió"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:5
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:4
 msgid "Select all items in this page"
 msgstr "Selecciona tots els ítems en aquesta pàgina"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:5
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:4
 msgid "items selected. Uncheck to Clear"
 msgstr "ítems seleccionats. Desmarca per netejar"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:6 ../app/views/discovered_hosts/_selected_hosts.html.erb:7 ../app/views/discovered_mailer/discovered_summary.html.erb:17 ../app/views/discovered_mailer/discovered_summary.text.erb:9
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:5 ../app/views/discovered_hosts/_selected_hosts.html.erb:7 ../app/views/discovered_mailer/discovered_summary.html.erb:17 ../app/views/discovered_mailer/discovered_summary.text.erb:9
 msgid "Name"
 msgstr "Nom"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:8 ../app/views/discovered_mailer/discovered_summary.html.erb:19 ../app/views/discovered_mailer/discovered_summary.text.erb:11
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:7 ../app/views/discovered_mailer/discovered_summary.html.erb:19 ../app/views/discovered_mailer/discovered_summary.text.erb:11
 msgid "IP Address"
 msgstr "Adreça IP"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:11
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:10
 msgid "Disk Count"
 msgstr ""
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:12
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:11
 msgid "Disks Size"
 msgstr ""
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:16 ../app/views/discovered_hosts/_selected_hosts.html.erb:9
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:15 ../app/views/discovered_hosts/_selected_hosts.html.erb:9
 msgid "Location"
 msgstr "Ubicació"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:17 ../app/views/discovered_hosts/_selected_hosts.html.erb:10
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:16 ../app/views/discovered_hosts/_selected_hosts.html.erb:10
 msgid "Organization"
 msgstr "Organització"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:18
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:17
 msgid "Subnet"
 msgstr "Subxarxa"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:19
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:18
 msgid "Last Facts Upload"
 msgstr ""
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:20 ../app/views/discovery_rules/index.html.erb:12
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:19 ../app/views/discovery_rules/index.html.erb:12
 msgid "Actions"
 msgstr "Accions"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:55
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:51
 msgid "Please Confirm"
 msgstr "Si us plau, confirmeu"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:61
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:57
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:62
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:58
 msgid "Submit"
 msgstr "Envia"
 
@@ -873,6 +841,18 @@ msgstr "Adreça IP"
 msgid "Collapse All"
 msgstr ""
 
+#: ../app/views/discovered_hosts/welcome.html.erb:7
+msgid "No discovered hosts found in this context."
+msgstr ""
+
+#: ../app/views/discovered_hosts/welcome.html.erb:8
+msgid "This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
+msgstr ""
+
+#: ../app/views/discovered_hosts/welcome.html.erb:9
+msgid "Learn more about this in the documentation."
+msgstr "Obteniu més informació sobre això a la documentació."
+
 #: ../app/views/discovered_mailer/discovered_summary.html.erb:6
 msgid "Summary report for discovered hosts from Foreman"
 msgstr ""
@@ -965,11 +945,11 @@ msgstr ""
 msgid "Edit %s"
 msgstr "Edita %s"
 
-#: ../app/views/discovery_rules/index.html.erb:1 ../lib/foreman_discovery/engine.rb:164
+#: ../app/views/discovery_rules/index.html.erb:1 ../lib/foreman_discovery/engine.rb:163
 msgid "Discovery Rules"
 msgstr "Regles de descobriment"
 
-#: ../app/views/discovery_rules/index.html.erb:2 ../webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/EmptyState.js:9
+#: ../app/views/discovery_rules/index.html.erb:2
 msgid "Create Rule"
 msgstr ""
 
@@ -1001,10 +981,6 @@ msgstr "Habilitada"
 msgid "New Discovery Rule"
 msgstr "Regla de descobriment nova"
 
-#: ../app/views/discovery_rules/welcome.html.erb:8
-msgid "Discovered Rules"
-msgstr ""
-
 #: ../db/seeds.d/50_discovery_templates.rb:5
 msgid "Command line options for kexec during PXE-less provisioning."
 msgstr ""
@@ -1025,42 +1001,34 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:180
+#: ../lib/foreman_discovery/engine.rb:179
 msgid "Discovery Kexec template"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:189
+#: ../lib/foreman_discovery/engine.rb:188
 msgid "Discovery Proxy"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:190
+#: ../lib/foreman_discovery/engine.rb:189
 msgid "Discovery Proxy to use within this subnet for managing connection to discovered hosts"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:191
+#: ../lib/foreman_discovery/engine.rb:190
 msgid "ID of Discovery Proxy to use within this subnet for managing connection to discovered hosts"
 msgstr ""
 
-#: ../webpack/__mocks__/foremanReact/components/common/EmptyState/EmptyStatePattern.js:33
-msgid "For more information please see "
-msgstr ""
-
-#: ../webpack/__mocks__/foremanReact/components/common/EmptyState/EmptyStatePattern.js:34
-msgid "documentation"
-msgstr ""
-
 #: action_names.rb:2
-msgid "Action with sub plans"
+msgid "Remote action:"
 msgstr ""
 
 #: action_names.rb:3
-msgid "Import facts"
+msgid "Import Puppet classes"
 msgstr ""
 
 #: action_names.rb:4
-msgid "Import Puppet classes"
+msgid "Import facts"
 msgstr ""
 
 #: action_names.rb:5
-msgid "Remote action:"
+msgid "Action with sub plans"
 msgstr ""