foreman_discovery 16.1.4 → 16.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93f2f0828e78292ef40c46535f34d32d616ccf00b91465a5ca103d497510de5b
-  data.tar.gz: 3f661f14112f905f9e6b4c15955ebdd8b942f5a88349ab08c6568a07b51bed5f
+  metadata.gz: 5404d1b999eff25f29e39cf14d77a7e85473e29a50a677ac3254aadfd1bc53a4
+  data.tar.gz: 803b2278dd981b8123cd88593f7fb00fd974b69711e848da60f31fd85dabbb90
 SHA512:
-  metadata.gz: bbbc9c3d5fa3d24b86beecb90c7237e5ea8093331762a9667576d3472df5e7e099dcf076c0d3e277c8bc75bfc56a8ff5079dd381514e7ac4ded899bc22205e37
-  data.tar.gz: 209b24b5230750c5a428198c87405607ac925fa6bf173a45c5e593a93408d4b8a46e476f3563c93f2031b8c965bb3f3077b146283a1f87aec29df94a037c72e1
+  metadata.gz: b4d290ab7aeb3cd8ed2254159ccead4c2ad69138b68e3758c9724e9eac5e99cfefcc654af9a12dda964201cca307f87f161682000f878a70dbcb1241996a57ad
+  data.tar.gz: 6398fa38e8625aee40bc6bc4ea387cced9ee50eba1e06fcdd711256e587f96c3d4d782738fd3efaf5b3bc0a3c2330f0f733088fdc5f8eafa8e3360a8bdeaea09

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

@@ -51,24 +51,30 @@ module Api
       param :id, :identifier, :required => true
       param :discovered_host, Hash, :action_aware => true do
         param :name, String
-        param :environment_id, String
+        param :environment_id, String, :desc => N_("required if host is managed and value is not inherited from host group")
         param :ip, String, :desc => N_("not required if using a subnet with DHCP proxy")
         param :mac, String, :desc => N_("not required if it's a virtual machine")
-        param :architecture_id, :number
-        param :domain_id, :number
+        param :architecture_id, :number, :desc => N_("required if host is managed and value is not inherited from host group")
+        param :domain_id, :number, :desc => N_("required if host is managed and value is not inherited from host group")
         param :puppet_proxy_id, :number
         param :puppet_class_ids, Array
-        param :operatingsystem_id, String
-        param :medium_id, :number
-        param :ptable_id, :number
-        param :subnet_id, :number
+        param :operatingsystem_id, :number, :desc => N_("required if host is managed and value is not inherited from host group")
+        param :medium_id, String, :desc => N_("required if not imaged based provisioning and host is managed and value is not inherited from host group")
+        param :ptable_id, :number, :desc => N_("required if host is managed and custom partition has not been defined")
+        param :subnet_id, :number, :desc => N_("required if host is managed and value is not inherited from host group")
         param :sp_subnet_id, :number
         param :model_id, :number
         param :hostgroup_id, :number
         param :owner_id, :number
+        param :owner_type, Host::Base::OWNER_TYPES, :desc => N_("Host's owner type")
         param :puppet_ca_proxy_id, :number
         param :image_id, :number
-        param :host_parameters_attributes, Array
+        param :host_parameters_attributes, Array, :desc => N_("Host's parameters (array or indexed hash)") do
+          param :name, String, :desc => N_("Name of the parameter"), :required => true
+          param :value, String, :desc => N_("Parameter value"), :required => true
+          param :parameter_type, Parameter::KEY_TYPES, :desc => N_("Type of value")
+          param :hidden_value, :bool
+        end
         param :build, :bool
         param :enabled, :bool
         param :provision_method, String

data/app/helpers/discovered_hosts_helper.rb

@@ -97,4 +97,9 @@ module DiscoveredHostsHelper
     return super unless controller_name == 'discovered_hosts'
     discovered_host_path(host)
   end
+
+  def discovery_doc_url
+    doc_version = Foreman::Plugin.find(:foreman_discovery).version.scan(/\d+\.\d+/).first
+    "https://theforeman.org/plugins/foreman_discovery/#{doc_version}"
+  end
 end

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,10 +140,10 @@ 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)
+    raise ::Foreman::WrappedException.new(e, N_("Could not get facts from proxy %{url}: %{error}"), :url => proxy_url(self.ip), :error => e)
   end
 
   def reboot(old_ip = nil, new_ip = nil)

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/services/foreman_discovery/import_hooks/subnet_and_taxonomy.rb

@@ -35,6 +35,7 @@ module ForemanDiscovery
         Location.find_by_title(facts["discovery_location"]) ||
           Location.find_by_title(Setting[:discovery_location]) ||
           host.subnet.try(:locations).try(:first) ||
+          host.subnet6.try(:locations).try(:first) ||
           Location.first
       end
 
@@ -48,6 +49,7 @@ module ForemanDiscovery
         Organization.find_by_title(facts["discovery_organization"]) ||
           Organization.find_by_title(Setting[:discovery_organization]) ||
           host.subnet.try(:organizations).try(:first) ||
+          host.subnet6.try(:organizations).try(:first) ||
           Organization.first
       end
     end

data/app/views/api/v2/discovery_rules/create.json.rabl

@@ -0,0 +1,3 @@
+object @discovery_rule
+
+extends "api/v2/discovery_rules/show"

data/app/views/discovered_hosts/welcome.html.erb

@@ -1,10 +1,15 @@
+<% content_for(:javascripts) do %>
+  <%= webpacked_plugins_js_for :'foreman_discovery' %>
+<% end %>
+<% content_for(:stylesheets) do %>
+  <%= webpacked_plugins_css_for :'foreman_discovery' %>
+<% end %>
+
 <% content_for(:title, _("Discovered Hosts")) %>
-<div class="blank-slate-pf">
-  <div class="blank-slate-pf-icon">
-    <%= icon_text("gears", "", :kind => "fa") %>
-  </div>
-  <h1><%= _('Discovered Hosts') %></h1>
-  <p><%= _("No discovered hosts found in this context.") %>
-  <%= _("This page shows discovered bare-metal or virtual nodes waiting to be provisioned.") %></p>
-  <p><%= link_to _('Learn more about this in the documentation.'), documentation_url("#{ForemanDiscovery::VERSION.scan(/\d+\.\d+/).first}/index.html", {:root_url => 'https://theforeman.org/plugins/foreman_discovery/'})%></p>
-</div>
+
+<% content_for(:content) do %>
+  <%= notifications %>
+  <div id="organization-id" data-id="<%= Organization.current.id if Organization.current %>" ></div>
+  <div id="user-id" data-id="<%= User.current.id if User.current %>" ></div>
+  <%= react_component('DiscoveredHosts', docUrl: discovery_doc_url ) %>
+<% end %>

data/app/views/discovery_rules/index.html.erb

@@ -18,7 +18,7 @@
       <td><%= trunc_with_tooltip(rule.search) %></td>
       <td><%= label_with_link(rule.hostgroup, 26, authorizer) %></td>
       <td><%= rule.hosts.count %> / <%= rule.max_count %></td>
-      <td><%= rule.enabled %></td>
+      <td><%= checked_icon rule.enabled %></td>
       <td><%= action_buttons(*permitted_discovery_actions(rule)) %></td>
     </tr>
   <% end %>

data/app/views/foreman_discovery/debian_kexec.erb

@@ -12,13 +12,14 @@ 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']
-  bootif = '00-' + mac.gsub(':', '-') if mac
+  bootif = host_param("hardware_type", "01") + '-' + mac.gsub(':', '-') if mac
   ip_cidr = @host.facts['discovery_ip_cidr']
   ip = @host.facts['discovery_ip']
   mask = @host.facts['discovery_netmask']

data/app/views/foreman_discovery/redhat_kexec.erb

@@ -22,13 +22,14 @@ 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']
-  bootif = '00-' + mac.gsub(':', '-') if mac
+  bootif = host_param("hardware_type", "01") + '-' + mac.gsub(':', '-') if mac
   ip_cidr = @host.facts['discovery_ip_cidr']
   ip = @host.facts['discovery_ip']
   mask = @host.facts['discovery_netmask']

data/extra/discover-host

@@ -79,12 +79,12 @@ unless preserve_interfaces
     name, subnet, mac, explicit_ip = iface
     mac ||= (["52"] + 5.times.map { '%02x' % rand(0..255) }).join(':')
     json["macaddress_#{name}"] = mac
-    subnet_woprefix, prefix = subnet.split('/')
+    _, prefix = subnet.split('/')
     if subnet.include?('.')
-      random_ip = IPAddr.new(subnet, Socket::AF_INET) | IPAddr.new(rand(2**prefix.to_i), Socket::AF_INET)
+      random_ip = IPAddr.new(subnet, Socket::AF_INET) | IPAddr.new(rand(2**(32 - prefix.to_i)), Socket::AF_INET)
       fact_name = "ipaddress"
     else
-      random_ip = IPAddr.new(subnet, Socket::AF_INET6) | IPAddr.new(rand(2**prefix.to_i), Socket::AF_INET6)
+      random_ip = IPAddr.new(subnet, Socket::AF_INET6) | IPAddr.new(rand(2**(32 - prefix.to_i)), Socket::AF_INET6)
       fact_name = "ipaddress6"
     end
     json["#{fact_name}_#{name}"] = explicit_ip ? explicit_ip : random_ip

data/lib/foreman_discovery/engine.rb

@@ -43,13 +43,14 @@ 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.3'
 
         # discovered hosts permissions
         security_block :discovery do
           permission :view_discovered_hosts, {
             :discovered_hosts          => [:index, :show, :auto_complete_search, :welcome],
-            :"api/v2/discovered_hosts" => [:index, :show]
+            :"api/v2/discovered_hosts" => [:index, :show],
+            :'discovered_hosts/react' => [:index]
           }, :resource_type => 'Host'
           permission :submit_discovered_hosts, {
             :"api/v2/discovered_hosts" => [:facts, :create]

data/lib/foreman_discovery/version.rb

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

data/locale/ca/foreman_discovery.edit.po

@@ -9,8 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_discovery 16.3.4\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"
+"POT-Creation-Date: 2021-05-03 08:46+0200\n"
+"PO-Revision-Date: 2021-01-25 08:35+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)"
 "\n"
 "MIME-Version: 1.0\n"
@@ -115,51 +116,51 @@ msgstr "Puja els objectes d'interès per a un amfitrió, creant el nou amfitrió
 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:130
 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:136 ../app/controllers/discovered_hosts_controller.rb:157
 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:139
 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:145 ../app/controllers/discovered_hosts_controller.rb:164
 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:152
 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:156 ../app/controllers/discovered_hosts_controller.rb:170
 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:159 ../app/controllers/discovered_hosts_controller.rb:173
 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:181
 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:192
 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:201
 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:210
 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:221 ../app/controllers/discovered_hosts_controller.rb:126
 msgid "Discovered hosts are rebooting now"
 msgstr "Ara s'estan reiniciant els amfitrions descoberts"
 
@@ -239,110 +240,86 @@ msgstr "Errors durant el reinici: %s"
 msgid "No discovered hosts to reboot"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:63
+#: ../app/controllers/discovered_hosts_controller.rb:60
 msgid "Successfully provisioned %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:97
+#: ../app/controllers/discovered_hosts_controller.rb:94
 msgid "Facts refreshed for %s"
 msgstr "Els objectes d'interès que s'han refrescat per a %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:99
+#: ../app/controllers/discovered_hosts_controller.rb:96
 msgid "Failed to refresh facts for %s"
 msgstr "No s'ha pogut refrescar els objectes d'interès per a %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:102
+#: ../app/controllers/discovered_hosts_controller.rb:99
 msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:109
+#: ../app/controllers/discovered_hosts_controller.rb:106
 msgid "Host of type %s can not be rebooted"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:113
+#: ../app/controllers/discovered_hosts_controller.rb:110
 msgid "Rebooting host %s"
 msgstr "S'està reiniciant l'amfitrió %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:115
+#: ../app/controllers/discovered_hosts_controller.rb:112
 msgid "Failed to reboot host %s"
 msgstr "No s'ha pogut reiniciar l'amfitrió %s."
 
-#: ../app/controllers/discovered_hosts_controller.rb:118
+#: ../app/controllers/discovered_hosts_controller.rb:115
 msgid "Failed to reboot host %{hostname} with error %{error_message}"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:132
+#: ../app/controllers/discovered_hosts_controller.rb:129
 msgid "Failed to reboot hosts with error %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:150
+#: ../app/controllers/discovered_hosts_controller.rb:147
 msgid "Destroyed selected hosts"
 msgstr "S'han destruït els amfitrions seleccionats"
 
-#: ../app/controllers/discovered_hosts_controller.rb:152
+#: ../app/controllers/discovered_hosts_controller.rb:149
 msgid "The following hosts were not deleted: %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:164
+#: ../app/controllers/discovered_hosts_controller.rb:161
 msgid "Failed to auto provision host %s: %s"
 msgstr "No s'ha pogut auto aprovisionar l'amfitrió %s: %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:192
+#: ../app/controllers/discovered_hosts_controller.rb:189
 msgid "Discovered hosts are provisioning now"
 msgstr "Els amfitrions descoberts ara tenen aprovisionament"
 
-#: ../app/controllers/discovered_hosts_controller.rb:226
-msgid "Highlights"
+#: ../app/controllers/discovered_hosts_controller.rb:270
+msgid "Discovered host reported from unknown subnet, communication will not be proxied."
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:226
-msgid "Storage"
-msgstr ""
-
-#: ../app/controllers/discovered_hosts_controller.rb:226
-msgid "Hardware"
+#: ../app/controllers/discovered_hosts_controller.rb:275
+msgid "Discovered hosts reported from unknown subnet are %s, communication will not be proxied."
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:226
-msgid "Network"
-msgstr ""
-
-#: ../app/controllers/discovered_hosts_controller.rb:226
-msgid "Software"
-msgstr ""
-
-#: ../app/controllers/discovered_hosts_controller.rb:226
-msgid "IPMI"
-msgstr ""
-
-#: ../app/controllers/discovered_hosts_controller.rb:226
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../app/controllers/discovered_hosts_controller.rb:304
+#: ../app/controllers/discovered_hosts_controller.rb:289
 msgid "No hosts were found with that id or name"
 msgstr "No s'ha trobat cap amfitrió amb aquest ID o nom"
 
-#: ../app/controllers/discovered_hosts_controller.rb:308
+#: ../app/controllers/discovered_hosts_controller.rb:293
 msgid "No hosts selected"
 msgstr "Cap amfitrió seleccionat"
 
-#: ../app/controllers/discovered_hosts_controller.rb:314
+#: ../app/controllers/discovered_hosts_controller.rb:299
 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:79
 msgid "Rule enabled"
 msgstr "Regla habilitada"
 
-#: ../app/controllers/discovery_rules_controller.rb:72
+#: ../app/controllers/discovery_rules_controller.rb:79
 msgid "Rule disabled"
 msgstr "Regla inhabilitada"
 
-#: ../app/helpers/discovered_hosts_helper.rb:10
-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
 msgid "Auto Provision"
 msgstr "Auto aprovisiona"
@@ -428,6 +405,10 @@ msgid "Enable rule '%s'?"
 msgstr ""
 
 #: ../app/helpers/discovery_rules_helper.rb:33
+msgid "Clone"
+msgstr ""
+
+#: ../app/helpers/discovery_rules_helper.rb:34
 msgid "Delete rule '%s'?"
 msgstr ""
 
@@ -451,13 +432,13 @@ msgstr "ha de començar amb una lletra o ERB."
 msgid "must be present."
 msgstr ""
 
-#: ../app/models/discovery_rule.rb:52
+#: ../app/models/discovery_rule.rb:57
 msgid "Host group organization %s must also be associated to the discovery rule"
 msgid_plural "Host group organizations %s must also be associated to the discovery rule"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../app/models/discovery_rule.rb:56
+#: ../app/models/discovery_rule.rb:61
 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"
 msgstr[0] ""
@@ -727,6 +708,34 @@ msgstr ""
 msgid "Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: %{filter}"
 msgstr ""
 
+#: ../app/services/foreman_discovery/fact_to_category_resolver.rb:7
+msgid "Highlights"
+msgstr ""
+
+#: ../app/services/foreman_discovery/fact_to_category_resolver.rb:8
+msgid "Storage"
+msgstr ""
+
+#: ../app/services/foreman_discovery/fact_to_category_resolver.rb:9
+msgid "Hardware"
+msgstr ""
+
+#: ../app/services/foreman_discovery/fact_to_category_resolver.rb:10
+msgid "Network"
+msgstr ""
+
+#: ../app/services/foreman_discovery/fact_to_category_resolver.rb:11
+msgid "Software"
+msgstr ""
+
+#: ../app/services/foreman_discovery/fact_to_category_resolver.rb:12
+msgid "IPMI"
+msgstr ""
+
+#: ../app/services/foreman_discovery/fact_to_category_resolver.rb:13
+msgid "Miscellaneous"
+msgstr ""
+
 #: ../app/services/foreman_discovery/host_converter.rb:47
 msgid "IPAM must be configured for subnet '%s'"
 msgstr ""
@@ -739,6 +748,10 @@ msgstr ""
 msgid "Image API processing error: %{msg} (HTTP/%{code}, body: %{body})"
 msgstr ""
 
+#: ../app/services/foreman_discovery/ui_notifications/new_host.rb:22
+msgid "Host %s has been dicovered"
+msgstr ""
+
 #: ../app/views/dashboard/_discovery_widget.html.erb:5
 msgid "Discovered Host"
 msgid_plural "Discovered Hosts"
@@ -797,11 +810,11 @@ msgstr ""
 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:16 ../app/views/discovered_hosts/_selected_hosts.html.erb:9 ../app/views/discovery_rules/index.html.erb:11
 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:17 ../app/views/discovered_hosts/_selected_hosts.html.erb:10 ../app/views/discovery_rules/index.html.erb:12
 msgid "Organization"
 msgstr "Organització"
 
@@ -813,7 +826,7 @@ msgstr "Subxarxa"
 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:20 ../app/views/discovery_rules/index.html.erb:14
 msgid "Actions"
 msgstr "Accions"
 
@@ -961,6 +974,10 @@ msgstr ""
 msgid "Hostnames must not start with numbers. A good approach is to use unique information provided by facter (MAC address, BIOS or serial ID)."
 msgstr ""
 
+#: ../app/views/discovery_rules/clone.erb:1
+msgid "Clone %s"
+msgstr ""
+
 #: ../app/views/discovery_rules/edit.html.erb:1
 msgid "Edit %s"
 msgstr "Edita %s"
@@ -993,7 +1010,7 @@ msgstr ""
 msgid "Hosts/Limit"
 msgstr ""
 
-#: ../app/views/discovery_rules/index.html.erb:11
+#: ../app/views/discovery_rules/index.html.erb:13
 msgid "DiscoveryRule|Enabled"
 msgstr "Habilitada"
 
@@ -1014,7 +1031,7 @@ msgid "A summary of discovered hosts"
 msgstr ""
 
 #: ../db/seeds.d/80_discovery_ui_notification.rb:4
-msgid "Hosts"
+msgid "New hosts"
 msgstr ""
 
 #: ../db/seeds.d/80_discovery_ui_notification.rb:6
@@ -1025,19 +1042,27 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:180
+#: ../db/seeds.d/80_discovery_ui_notification.rb:18
+msgid "Hosts"
+msgstr ""
+
+#: ../db/seeds.d/80_discovery_ui_notification.rb:20
+msgid "Error message goes here"
+msgstr ""
+
+#: ../lib/foreman_discovery/engine.rb:176
 msgid "Discovery Kexec template"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:189
+#: ../lib/foreman_discovery/engine.rb:185
 msgid "Discovery Proxy"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:190
+#: ../lib/foreman_discovery/engine.rb:186
 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:187
 msgid "ID of Discovery Proxy to use within this subnet for managing connection to discovered hosts"
 msgstr ""
 
@@ -1050,17 +1075,21 @@ 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 ""
+
+#: ../app/helpers/discovered_hosts_helper.rb:10
+#~ msgid "%s ago"
+#~ msgstr "fa %s"