foreman_discovery 16.3.1 → 17.0.1

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

@@ -11,6 +11,5 @@
   <%= 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: "https://theforeman.org/plugins/foreman_discovery/#{ForemanDiscovery::VERSION.scan(/\d+\.\d+/).first}/index.html" ) %>
+  <%= react_component('DiscoveredHosts', docUrl: discovery_doc_url ) %>
 <% end %>

data/app/views/discovery_rules/clone.erb

@@ -0,0 +1,3 @@
+<% title _("Clone %s") % @discovered_rules.to_s %>
+
+<%= render :partial => 'form' %>

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

@@ -8,6 +8,8 @@
     <th><%= sort :search, :as => s_("DiscoveryRule|Query") %></th>
     <th><%= _("Host Group") %></th>
     <th><%= _("Hosts/Limit") %></th>
+    <th><%= sort :location, :as => _('Location') %></th>
+    <th><%= sort :organization, :as => _('Organization') %></th>
     <th><%= sort :enabled, :as => s_("DiscoveryRule|Enabled") %></th>
     <th><%= _("Actions") %></th>
   </tr>
@@ -18,6 +20,8 @@
       <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.locations.find_by(title: Location.current.try(:title)).try(:title) || rule.locations.pluck(:title).join(",") %></td>
+      <td><%= rule.organizations.find_by(title: Organization.current.try(:title)).try(:title) || rule.organizations.pluck(:title).join(",") %></td>
       <td><%= checked_icon rule.enabled %></td>
       <td><%= action_buttons(*permitted_discovery_actions(rule)) %></td>
     </tr>

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

@@ -0,0 +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 Rules")) %>
+
+<% 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('DiscoveryRules', docUrl: discovery_doc_url + '/#4.3Automaticprovisioning' ) %>
+<% end %>

data/app/views/foreman_discovery/debian_kexec.erb

@@ -19,7 +19,7 @@ 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

@@ -29,7 +29,7 @@ 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/config/routes.rb

@@ -7,6 +7,7 @@ Rails.application.routes.draw do
   post 'medium_selected_discovered_hosts'       => 'hosts#medium_selected'
 
   get 'discovered_hosts/help', :action => :welcome, :controller => 'discovered_hosts'
+  get 'discovery_rules/help', :action => :welcome, :controller => 'discovery_rules'
 
   constraints(:id => /[^\/]+/) do
     resources :discovered_hosts, :except => [:new, :create] do
@@ -33,6 +34,7 @@ Rails.application.routes.draw do
 
   resources :discovery_rules, :except => [:show] do
     member do
+      get :clone
       get :enable
       get :disable
     end

data/db/seeds.d/80_discovery_ui_notification.rb

@@ -1,7 +1,7 @@
 # seeds UI notification blueprints that are supported by Disocvery.
 [
   {
-    group: _('Hosts'),
+    group: _('New hosts'),
     name: 'new_discovered_host',
     message: _('One or more hosts have been discovered'),
     level: 'info',
@@ -10,8 +10,14 @@
       links:
       [
         path_method: :discovered_hosts_path,
-        title: _('Details')
-      ]
-    }
-  }
+        title: _('Details'),
+      ],
+    },
+  },
+  {
+    group: _('Hosts'),
+    name: 'failed_discovery',
+    message: _('Error message goes here'),
+    level: 'error',
+  },
 ].each { |blueprint| UINotifications::Seed.new(blueprint).configure }

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 '>= 2.2'
+        requires_foreman '>= 2.4'
 
         # discovered hosts permissions
         security_block :discovery do
@@ -86,11 +86,11 @@ module ForemanDiscovery
         # discovery rules permissions
         security_block :discovery_rules do
           permission :view_discovery_rules, {
-            :discovery_rules => [:index, :show, :auto_complete_search],
+            :discovery_rules => [:index, :show, :auto_complete_search, :welcome],
             :"api/v2/discovery_rules" => [:index, :show]
           }, :resource_type => 'DiscoveryRule'
           permission :create_discovery_rules, {
-            :discovery_rules => [:new, :create],
+            :discovery_rules => [:new, :create, :clone],
             :"api/v2/discovery_rules" => [:create]
           }, :resource_type => 'DiscoveryRule'
           permission :edit_discovery_rules, {
@@ -173,10 +173,6 @@ module ForemanDiscovery
         # add dashboard widget
         widget 'discovery_widget', :name=>N_('Discovered Hosts'), :sizex => 6, :sizey =>1
 
-        # allowed helpers and variables
-        allowed_template_helpers :rand
-        allowed_template_variables :kexec_kernel, :kexec_initrd
-
         template_labels 'kexec' => N_('Discovery Kexec template')
 
         # apipie API documentation

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "16.3.1"
+  VERSION = "17.0.1"
 end

data/locale/ca/foreman_discovery.edit.po

@@ -7,9 +7,10 @@
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015-2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 16.2.0\n"
+"Project-Id-Version: foreman_discovery 16.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2020-05-26 17:21+0000\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"
@@ -73,11 +74,11 @@ msgstr ""
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:63
 msgid "required if host is managed and custom partition has not been defined"
-msgstr ""
+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 ""
+msgstr "Tipus de propietari de l'amfitrió"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:72
 msgid "Host's parameters (array or indexed hash)"
@@ -85,11 +86,11 @@ msgstr ""
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:73
 msgid "Name of the parameter"
-msgstr ""
+msgstr "Nom del paràmetre"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:74
 msgid "Parameter value"
-msgstr ""
+msgstr "Valor del paràmetre"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:75
 msgid "Type of value"
@@ -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,119 +240,95 @@ 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"
-msgstr ""
-
-#: ../app/controllers/discovered_hosts_controller.rb:226
-msgid "Storage"
-msgstr ""
-
-#: ../app/controllers/discovered_hosts_controller.rb:226
-msgid "Hardware"
-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"
+#: ../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 "Miscellaneous"
+#: ../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: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:68
+#: ../app/controllers/discovery_rules_controller.rb:79
 msgid "Rule enabled"
 msgstr "Regla habilitada"
 
-#: ../app/controllers/discovery_rules_controller.rb:68
+#: ../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:37
+#: ../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"
 
-#: ../app/helpers/discovered_hosts_helper.rb:15 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:38
+#: ../app/helpers/discovered_hosts_helper.rb:15 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:41
 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:39
+#: ../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
 msgid "Reboot"
 msgstr "Reinicia"
 
@@ -363,7 +340,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:40
+#: ../app/helpers/discovered_hosts_helper.rb:23 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:43
 msgid "Delete %s?"
 msgstr "Voleu suprimir %s?"
 
@@ -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"
@@ -753,15 +766,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: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
+#: ../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
 msgid "Model"
 msgstr "Model"
 
-#: ../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
+#: ../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
 msgid "CPUs"
 msgstr "Les CPU"
 
-#: ../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
+#: ../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
 msgid "Memory"
 msgstr "Memòria"
 
@@ -773,59 +786,59 @@ msgstr ""
 msgid "Create Host"
 msgstr "Crea un amfitrió"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:4
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:5
 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:4
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:5
 msgid "items selected. Uncheck to Clear"
 msgstr "ítems seleccionats. Desmarca per netejar"
 
-#: ../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
+#: ../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
 msgid "Name"
 msgstr "Nom"
 
-#: ../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
+#: ../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
 msgid "IP Address"
 msgstr "Adreça IP"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:10
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:11
 msgid "Disk Count"
 msgstr ""
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:11
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:12
 msgid "Disks Size"
 msgstr ""
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:15 ../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:16 ../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ó"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:17
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:18
 msgid "Subnet"
 msgstr "Subxarxa"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:18
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:19
 msgid "Last Facts Upload"
 msgstr ""
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:19 ../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"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:51
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:55
 msgid "Please Confirm"
 msgstr "Si us plau, confirmeu"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:57
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:61
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:58
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:62
 msgid "Submit"
 msgstr "Envia"
 
@@ -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"
@@ -969,7 +986,7 @@ msgstr "Edita %s"
 msgid "Discovery Rules"
 msgstr "Regles de descobriment"
 
-#: ../app/views/discovery_rules/index.html.erb:2
+#: ../app/views/discovery_rules/index.html.erb:2 ../webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/EmptyState.js:9
 msgid "Create Rule"
 msgstr ""
 
@@ -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"
 
@@ -1001,6 +1018,10 @@ 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 ""
@@ -1010,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
@@ -1021,22 +1042,38 @@ 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 ""
 
+#: ../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 "Remote action:"
 msgstr ""
@@ -1046,12 +1083,13 @@ msgid "Import Puppet classes"
 msgstr ""
 
 #: action_names.rb:4
-msgid "Action with sub plans"
+msgid "Import facts"
 msgstr ""
 
 #: action_names.rb:5
-msgid "Import facts"
+msgid "Action with sub plans"
 msgstr ""
 
-#~ msgid "Learn more about this in the documentation."
-#~ msgstr "Obteniu més informació sobre això a la documentació."
+#: ../app/helpers/discovered_hosts_helper.rb:10
+#~ msgid "%s ago"
+#~ msgstr "fa %s"