foreman_discovery 16.3.5 → 18.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3069a28357316df978cd2a85a1ed6e919b0208d5051a1064222ccc52efde30dd
-  data.tar.gz: 8709517978ccc3a1b9d37913145d519a579315004c7ea6d3cd8ac7fd612a7bea
+  metadata.gz: 5e5ed6f9be99d08e38902acdbfff3e02aa7b086415cc6c8208a446ad8195fe18
+  data.tar.gz: cebfddeec98ce1ce01778dbe3c94fa1581132462a01e5ee04c2f78a6812a8c02
 SHA512:
-  metadata.gz: 1f325332129ba0a4c79cff63f4e1b8f1adc1741c8a11fe0c689992896d8fe8fe08b98e60081bd17d575edcb88e6707be12ae635cc38ed1d5085d5b865ba2e097
-  data.tar.gz: 49e1f0a7becea2ffbe9fcdb7b120988e8dc3d20c4ad4a195de4dea8ca878c5261860951d3d9a7875a0b81933649f3730791d186e577c16aeeabf8235c8a711cc
+  metadata.gz: 42a2c9cfe529fbf8e22c11ce4b7260ae6bd61d0005688b5b50199c6c7e2a432cbe8a99b1a4fd1f94757246892fa60426181382dd6de874bfe0d495d1e98b140c
+  data.tar.gz: 5a151a76f41f68258a90154209c81e2fa3a16dc6049191269d8b261dca51d9c5ed536ad7c18180079d9186c58a80ed145640541bbd2534f6c666a78aea407cc8

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

@@ -122,6 +122,7 @@ module Api
         end
         process_response state
       rescue Exception => e
+        ForemanDiscovery::UINotifications::FailedDiscovery.new(e).deliver!
         Foreman::Logging.exception("Host discovery failed, facts: #{facts}", e)
         render :json => {'message'=>e.to_s}, :status => :unprocessable_entity
       end

data/app/controllers/discovered_hosts_controller.rb

@@ -9,10 +9,14 @@ class DiscoveredHostsController < ::ApplicationController
   before_action :find_by_name_incl_subnet, :only => [:show]
   before_action :find_multiple, :only => [:multiple_destroy, :submit_multiple_destroy, :multiple_reboot, :submit_multiple_reboot, :multiple_auto_provision, :submit_multiple_auto_provision]
   before_action :taxonomy_scope, :only => [:edit]
+  before_action :check_for_subnet, :only => [:reboot, :auto_provision, :submit_multiple_reboot, :submit_multiple_auto_provision]
 
   around_action :skip_bullet, :only => [:edit]
 
   helper :hosts
+  if defined?(ForemanPuppet)
+    helper ForemanPuppet::HostsAndHostgroupsHelper
+  end
 
   layout 'layouts/application'
 
@@ -38,14 +42,10 @@ class DiscoveredHostsController < ::ApplicationController
     @range = nil
     # summary report text
     @report_summary = nil
-    init_regex_and_categories
-    @interfaces = []
-    get_interfaces
-    @host.facts_hash.each do |key, value|
-      value = number_to_human_size(value) if /size$/.match(key)
-      assign_fact_to_category(key, value)
-    end
-    add_custom_facts
+    resolver = ForemanDiscovery::FactToCategoryResolver.new(@host)
+    @categories_names = ForemanDiscovery::FactToCategoryResolver::CATEGORIES_NAMES
+    @categories = resolver.categories
+    @interfaces = resolver.interfaces
   end
 
   def destroy
@@ -203,41 +203,16 @@ class DiscoveredHostsController < ::ApplicationController
       subnet6 = @host.hostgroup.subnet6 || @host.subnet6
       @architecture    = @host.hostgroup.architecture
       @operatingsystem = @host.hostgroup.operatingsystem
-      @environment     = @host.hostgroup.environment
+      if defined?(ForemanPuppet)
+        @environment     = @host.hostgroup.environment
+        @host.environment = @environment
+      end
       @domain          = @host.hostgroup.domain
       @subnet          = subnet
       @subnet6         = subnet6
       @compute_profile = @host.hostgroup.compute_profile
       @realm           = @host.hostgroup.realm
       @host.interfaces.first.assign_attributes(subnet: subnet, subnet6: subnet6, domain: @domain)
-      @host.environment = @environment
-    end
-  end
-
-  def init_regex_and_categories
-    hightlights = Setting[:discovery_facts_highlights].empty? ? /^(productname|memorysize|manufacturer|architecture|macaddress$|processorcount|physicalprocessorcount|discovery_subnet|discovery_boot|ipaddress$)/ : Regexp.new(Setting[:discovery_facts_highlights])
-    storage = Setting[:discovery_facts_storage].empty? ? /^blockdevice/ : Regexp.new(Setting[:discovery_facts_storage])
-    hardware = Setting[:discovery_facts_hardware].empty? ? /^(hardw|manufacturer|memo|process)/ : Regexp.new(Setting[:discovery_facts__hardware])
-    network = Setting[:discovery_facts_network].empty? ? /^(interfaces|dhcp|fqdn|hostname)/ : Regexp.new(Setting[:discovery_facts_network])
-    software = Setting[:discovery_facts_software].empty? ? /^(bios|os|discovery)/ : Regexp.new(Setting[:discovery_facts_software])
-    ipmi = Setting[:discovery_facts_ipmi].empty? ? /^ipmi/ : Regexp.new(Setting[:discovery_facts_ipmi])
-    @regex_array = [hightlights, storage, hardware, network, software, ipmi, false]
-    @categories = Array.new(7) { Hash.new }
-    @categories_names = [N_("Highlights"), N_("Storage"), N_("Hardware"), N_("Network"), N_("Software"), N_("IPMI"), N_("Miscellaneous")]
-  end
-
-  def assign_fact_to_category(key, value)
-    if @interfaces.any? {|interface| key.include? interface[:identifier]}
-      @categories[3][key] = value
-      return
-    end
-    @regex_array.each_with_index do |regex, index|
-      if !regex
-        @categories[index][key] = value
-      elsif regex.match key
-        @categories[index][key] = value
-        break
-      end
     end
   end
 
@@ -247,7 +222,9 @@ class DiscoveredHostsController < ::ApplicationController
 
   def load_vars_for_ajax
     return unless @host
-    @environment     = @host.environment
+    if defined?(ForemanPuppet)
+      @environment     = @host.environment
+    end
     @architecture    = @host.architecture
     @domain          = @host.domain
     @operatingsystem = @host.operatingsystem
@@ -292,6 +269,21 @@ class DiscoveredHostsController < ::ApplicationController
     @host
   end
 
+  def check_for_subnet
+    hosts_without_subnet = []
+    case params[:action]
+      when 'reboot', 'auto_provision'
+        if @host.subnet.nil?
+          process_warning :warning_msg => _("Discovered host reported from unknown subnet, communication will not be proxied.")
+        end
+      when 'submit_multiple_reboot', 'submit_multiple_auto_provision'
+        hosts_without_subnet = @hosts.limit(3).select { |host| host.subnet.nil? }.pluck(:name)
+        if hosts_without_subnet.present?
+          process_warning :warning_msg => _("Discovered hosts reported from unknown subnet are %s, communication will not be proxied.") % hosts_without_subnet.join(', ')
+        end
+    end
+  end
+
   def find_by_name_incl_subnet
     find_by_name({:interfaces => :subnet})
   end
@@ -347,4 +339,8 @@ class DiscoveredHostsController < ::ApplicationController
       assign_fact_to_category("discovery_subnet", discovery_subnet)
     end
   end
+
+  def process_warning(hash = {})
+    warning hash[:warning_msg]
+  end
 end

data/app/controllers/discovery_rules_controller.rb

@@ -4,7 +4,11 @@ class DiscoveryRulesController < ApplicationController
 
   include Foreman::Controller::Parameters::DiscoveryRule
 
-  before_action :find_resource, :only => [:edit, :update, :destroy, :enable, :disable, :auto_provision]
+  before_action :find_resource, :only => [:edit, :update, :destroy, :enable, :disable, :auto_provision, :clone]
+
+  def model_of_controller
+    DiscoveryRule
+  end
 
   def index
     base = resource_base.search_for(params[:search], :order => (params[:order]))
@@ -15,6 +19,11 @@ class DiscoveryRulesController < ApplicationController
     @discovery_rule = DiscoveryRule.new(:priority => DiscoveryRule.suggest_priority)
   end
 
+  def clone
+    @discovery_rule = @discovery_rule.deep_clone except: [:name, :priority]
+    @discovery_rule.priority = DiscoveryRule.suggest_priority
+  end
+
   def create
     @discovery_rule = DiscoveryRule.new(discovery_rule_params)
     if @discovery_rule.save
@@ -55,6 +64,8 @@ class DiscoveryRulesController < ApplicationController
 
   def action_permission
     case params[:action]
+    when 'clone'
+      :create
     when 'enable', 'disable'
       :edit
     else

data/app/helpers/discovered_hosts_helper.rb

@@ -7,7 +7,7 @@ module DiscoveredHostsHelper
   end
 
   def disc_report_column(record)
-    record.last_report? ? (_("%s ago") % time_ago_in_words(record.last_report.getlocal)) : ""
+    record.last_report? ? date_time_relative(record.last_report.getlocal) : ""
   end
 
   def discovered_hosts_title_actions(host)

data/app/helpers/discovery_rules_helper.rb

@@ -30,6 +30,7 @@ module DiscoveryRulesHelper
     else
       actions << display_link_if_authorized(_('Enable'), hash_for_enable_discovery_rule_path(:id => rule).merge(:auth_object => rule, :authorizer => authorizer), :data => { :confirm => _("Enable rule '%s'?") % rule })
     end
+    actions << display_link_if_authorized(_("Clone"), hash_for_clone_discovery_rule_path(id: rule).merge(auth_object: rule, authorizer: authorizer))
     actions << display_delete_if_authorized(hash_for_discovery_rule_path(:id => rule).merge(:auth_object => rule, :authorizer => authorizer), :data => { :confirm => _("Delete rule '%s'?") % rule })
   end
 end

data/app/models/discovery_fact_name.rb

@@ -0,0 +1,9 @@
+class DiscoveryFactName < FactName
+  def origin
+    'Discovery'
+  end
+
+  def icon_path
+    "icons16x16/stub/darkred-d"
+  end
+end

data/app/models/discovery_rule.rb

@@ -17,7 +17,6 @@ class DiscoveryRule < ApplicationRecord
   validates :max_count, :numericality => { :only_integer => true, :greater_than_or_equal_to => 0, :less_than => 2**31 }
   validates :priority, :presence => true, :numericality => { :only_integer => true, :greater_than_or_equal_to => 0, :less_than => 2**31 }
   validates_lengths_from_database
-  validates_uniqueness_of :priority
   before_validation :default_int_attributes
   before_validation :enforce_taxonomy
 
@@ -41,19 +40,25 @@ class DiscoveryRule < ApplicationRecord
    self.priority  ||= 0
   end
 
-  def self.suggest_priority
-    self.unscoped.maximum(:priority).to_i + STEP
+  def self.suggest_priority(organization = Organization.current)
+    discovery_rules = DiscoveryRule.unscoped
+    return (discovery_rules.maximum(:priority).to_i + STEP) if organization.nil?
+    discovery_rule_ids = TaxableTaxonomy.where(
+      taxable_type: 'DiscoveryRule',
+      taxonomy_id: organization.id).pluck(:taxable_id)
+    discovery_rules = discovery_rules.where(id: discovery_rule_ids)
+    discovery_rules.maximum(:priority).to_i + STEP
   end
 
   def enforce_taxonomy
     return if hostgroup.nil?
     unless (ms = hostgroup.organizations - organizations).empty?
       names = ms.collect(&:name).to_sentence
-      errors.add(:organizations, n_("Host group organization %s must also be associated to the discovery rule", "Host group organizations %s must also be associated to the discovery rule", ms.size) % names)
+      errors.add(:base, n_("Host group organization %s must also be associated to the discovery rule", "Host group organizations %s must also be associated to the discovery rule", ms.size) % names)
     end
     unless (ms = hostgroup.locations - locations).empty?
       names = ms.collect(&:name).to_sentence
-      errors.add(:locations, n_("Host group location %s must also be associated to the discovery rule", "Host group locations %s must also be associated to the discovery rule", ms.size) % names)
+      errors.add(:base, n_("Host group location %s must also be associated to the discovery rule", "Host group locations %s must also be associated to the discovery rule", ms.size) % names)
     end
   end
 end

data/app/models/host/discovered.rb

@@ -133,26 +133,39 @@ class Host::Discovered < ::Host::Base
     subnet.present? && subnet.discovery.present?
   end
 
+  def ip4or6
+    if Setting[:discovery_prefer_ipv6]
+      IPAddr.new(self.ip6 || self.ip)
+    else
+      IPAddr.new(self.ip || self.ip6)
+    end
+  end
+
   def proxy_url(node_ip)
-    proxied? ? subnet.discovery.url + "/discovery/#{node_ip}" : "https://#{node_ip}:8443"
+    wrapped_ip = node_ip.ipv6? ? "[#{node_ip}]" : node_ip
+    proxied? ? subnet.discovery.url + "/discovery/#{node_ip}" : "https://#{wrapped_ip}:8443"
   end
 
   def refresh_facts
-    facts = ::ForemanDiscovery::NodeAPI::Inventory.new(:url => proxy_url(self.ip)).facter
+    facts = ::ForemanDiscovery::NodeAPI::Inventory.new(:url => proxy_url(ip4or6)).facter
     self.class.import_host 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(self.ip), :error => e)
+    raise ::Foreman::WrappedException.new(e, N_("Could not get facts from proxy %{url}: %{error}"), :url => proxy_url(ip4or6), :error => e)
   end
 
-  def reboot(old_ip = nil, new_ip = nil)
+  def reboot(old_ip = nil, new_ip = nil, old_ip6 = nil, new_ip6 = nil)
     # perform the action against the original lease as well as the new reservation
-    ips = [old_ip, new_ip, self.ip].compact.uniq
+    if Setting[:discovery_prefer_ipv6]
+      ips = [old_ip6, new_ip6, self.ip6, old_ip, new_ip, self.ip].compact.uniq
+    else
+      ips = [old_ip, new_ip, self.ip, old_ip6, new_ip6, self.ip6].compact.uniq
+    end
     logger.debug "Performing reboot calls against #{ips.to_sentence}, facts left #{facts.count}"
     ips.each do |next_ip|
       begin
-        node_url = proxy_url(next_ip)
+        node_url = proxy_url(IPAddr.new(next_ip))
         logger.debug "Performing reboot call against #{node_url}"
         resource = ::ForemanDiscovery::NodeAPI::Power.service(:url => node_url)
         return true if resource.reboot
@@ -165,13 +178,17 @@ class Host::Discovered < ::Host::Base
     raise ::Foreman::Exception.new(msg, action: "reboot", ips: ips.to_sentence)
   end
 
-  def kexec(json, old_ip = nil, new_ip = nil)
+  def kexec(json, old_ip = nil, new_ip = nil, old_ip6 = nil, new_ip6 = nil)
     # perform the action against the original lease as well as the new reservation
-    ips = [old_ip, new_ip, self.ip].compact.uniq
+    if Setting[:discovery_prefer_ipv6]
+      ips = [old_ip6, new_ip6, self.ip6, old_ip, new_ip, self.ip].compact.uniq
+    else
+      ips = [old_ip, new_ip, self.ip, old_ip6, new_ip6, self.ip6].compact.uniq
+    end
     logger.debug "Performing kexec calls against #{ips.to_sentence}, #{facts.count} facts left"
     ips.each do |next_ip|
       begin
-        node_url = proxy_url(next_ip)
+        node_url = proxy_url(IPAddr.new(next_ip))
         logger.debug "Performing kexec call against #{node_url}"
         resource = ::ForemanDiscovery::NodeAPI::Power.service(:url => node_url)
         return true if resource.kexec(json)

data/app/models/host/managed_extensions.rb

@@ -27,7 +27,7 @@ module Host::ManagedExtensions
   end
 
   def setReboot
-    old.becomes(Host::Discovered).reboot(old.ip, ip)
+    old.becomes(Host::Discovered).reboot(old.ip, ip, old.ip6, ip6)
     # It is too late to report error in the post_queue, we catch them and
     # continue. If flash is implemented for new hosts (http://projects.theforeman.org/issues/10559)
     # we can report the error to the user perhaps.
@@ -55,7 +55,7 @@ module Host::ManagedExtensions
   end
 
   def setKexec
-    old.becomes(Host::Discovered).kexec(render_kexec_template.to_json, old.ip, ip)
+    old.becomes(Host::Discovered).kexec(render_kexec_template.to_json, old.ip, ip, old.ip6, ip6)
     true
   rescue ::Foreman::Exception => e
     Foreman::Logging.exception("Unable to kexec", e)

data/app/models/setting/discovered.rb

@@ -37,6 +37,7 @@ class Setting::Discovered < ::Setting
       self.set('discovery_always_rebuild_dns', N_("Force DNS entries creation when provisioning discovered host"), true, N_("Force DNS")),
       self.set('discovery_error_on_existing', N_("Do not allow to discover existing managed host matching MAC of a provisioning NIC (errors out early)"), false, N_("Error on existing NIC")),
       self.set('discovery_naming', N_("Discovery hostname naming pattern"), 'Fact', N_("Type of name generator"), nil, {:collection => Proc.new {::Host::Discovered::NAMING_PATTERNS} }),
+      self.set('discovery_prefer_ipv6', N_("Prefer IPv6 to IPv4 when calling discovered nodes"), false, N_("Prefer IPv6")),
     ]
   end
 

data/app/services/discovery_fact_importer.rb

@@ -0,0 +1,5 @@
+class DiscoveryFactImporter < StructuredFactImporter
+  def fact_name_class
+    DiscoveryFactName
+  end
+end

data/app/services/foreman_discovery/fact_to_category_resolver.rb

@@ -0,0 +1,106 @@
+module ForemanDiscovery
+  class FactToCategoryResolver
+    include ActionView::Helpers::NumberHelper
+
+    attr_reader :categories, :interfaces
+
+    CATEGORIES_NAMES = [N_("Highlights"),
+                        N_("Storage"),
+                        N_("Hardware"),
+                        N_("Network"),
+                        N_("Software"),
+                        N_("IPMI"),
+                        N_("Miscellaneous")].freeze
+
+    def initialize(host)
+      categories = %i[highlights storage hardware network software ipmi]
+
+      @regex_array = categories.map do |category|
+        settings_category = settings_discovery_fact_prefix(category)
+        if settings_category.empty?
+          send(category)
+        else
+          Regexp.new(settings_category)
+        end
+      end
+
+      @regex_array << false
+
+      @categories = []
+
+      @interfaces = host.interfaces.map do |interface|
+        {
+          identifier: interface["identifier"],
+          type: interface["type"],
+          mac: interface["mac"],
+          ip: interface["ip"] || "N/A",
+          primary: interface["primary"],
+          provision: interface["provision"],
+        }
+      end
+
+      assign_facts(host)
+    end
+
+    private
+
+    def assign_facts(host)
+      host.facts_hash.each do |key, value|
+        value = number_to_human_size(value) if /size$/.match(key)
+        assign_fact_to_category(key, value)
+      end
+
+      return if host.primary_interface.subnet.nil?
+
+      discovery_subnet = "#{host.primary_interface.subnet.name} (#{host.primary_interface.subnet.network})"
+      assign_fact_to_category("discovery_subnet", discovery_subnet)
+    end
+
+    def assign_fact_to_category(key, value)
+      if @interfaces.any? { |interface| key.include? interface[:identifier] }
+        @categories[3] = {} if @categories[3].nil?
+        @categories[3][key] = value
+        return
+      end
+
+      @regex_array.each_with_index do |regex, index|
+        @categories[index] = {} if @categories[index].nil?
+        if !regex
+          @categories[index][key] = value
+        elsif regex.match key
+          @categories[index][key] = value
+          break
+        end
+      end
+    end
+
+    def highlights
+      /^(productname|memorysize|manufacturer|architecture|macaddress$|processorcount|physicalprocessorcount|discovery_subnet|discovery_boot|ipaddress$)/
+    end
+
+    def storage
+      /^blockdevice/
+    end
+
+    def hardware
+      /^(hardw|manufacturer|memo|process)/
+    end
+
+    def network
+      /^(interfaces|dhcp|fqdn|hostname)/
+    end
+
+    def software
+      /^(bios|os|discovery)/
+    end
+
+    def ipmi
+      /^ipmi/
+    end
+
+    def settings_discovery_fact_prefix(name)
+      Setting["discovery_facts_#{name}".to_sym]
+    end
+  end
+end
+

data/app/services/foreman_discovery/host_converter.rb

@@ -21,10 +21,10 @@ class ForemanDiscovery::HostConverter
   def self.set_build_clean_facts(host)
     # fact cleaning
     if Setting['discovery_clean_facts']
-      # clean all facts except those starting with "discovery_"
+      # clean all facts except those from Discovery
       host.define_singleton_method(:clear_facts) do
-          keep_ids = FactValue.where("host_id = #{host.id}").joins(:fact_name).where("fact_names.name like 'discovery_%'").pluck("fact_values.id")
-          FactValue.where("host_id = #{host.id} and id not in (?)", keep_ids).delete_all
+        keep_ids = FactValue.where(host_id: host.id, fact_names: { type: 'DiscoveryFactName' }).where("fact_names.name like 'discovery_%'").joins(:fact_name).pluck("fact_values.id")
+        FactValue.where.not(id: keep_ids).delete_all
       end
     else
       # clean no facts (default behavior)

data/app/services/foreman_discovery/ui_notifications/failed_discovery.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+module ForemanDiscovery
+  module UINotifications
+    # Adds notification upon failed discovery
+    class FailedDiscovery < ::UINotifications::Base
+      def initialize(message)
+        @message = message
+      end
+
+      private
+
+      def create
+        add_notification if update_notifications.zero?
+      end
+
+      def update_notifications
+        blueprint.mass_update_expiry
+      end
+
+      def add_notification
+        Notification.create!(
+          initiator: initiator,
+          audience: ::Notification::AUDIENCE_ADMIN,
+          message: _("One or more hosts with failed discovery due to error: #{@message}"),
+          notification_blueprint: blueprint,
+        )
+      end
+
+      def blueprint
+        @blueprint ||= NotificationBlueprint.find_by(name: 'failed_discovery')
+      end
+    end
+  end
+end

data/app/services/foreman_discovery/ui_notifications/new_host.rb

@@ -8,7 +8,7 @@ module ForemanDiscovery
       private
 
       def create
-        add_notification if update_notifications.zero?
+        add_notification
       end
 
       def update_notifications
@@ -19,6 +19,7 @@ module ForemanDiscovery
         Notification.create!(
           initiator: initiator,
           audience: ::Notification::AUDIENCE_SUBJECT,
+          message: _("Host %s has been dicovered") % subject.name,
           subject: subject,
           notification_blueprint: blueprint
         )

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

@@ -1,47 +1,51 @@
 <% title _('Discovered Hosts') %>
 <table class="<%= table_css_classes('table-condensed') %>" >
-  <tr>
-    <th class="ca"><%= check_box_tag "check_all", "", false, { :onclick => "tfm.hosts.table.toggleCheck()", :'check-title' => _("Select all items in this page"), :'uncheck-title'=> _("items selected. Uncheck to Clear") } %></th>
-    <th class=''><%= sort :name, :as => _('Name') %></th>
-    <th class="hidden-tablet hidden-xs"><%= sort :model, :as => _('Model') %></th>
-    <th class="hidden-tablet hidden-xs"><%= sort :ip, :as => _('IP Address') %></th>
-    <th class="hidden-tablet hidden-xs"><%= sort :cpu_count, :as => _('CPUs') %></th>
-    <th class="hidden-tablet hidden-xs"><%= sort :memory, :as => _('Memory') %></th>
-    <th class="hidden-tablet hidden-xs"><%= sort :disk_count, :as => _('Disk Count') %></th>
-    <th class="hidden-tablet hidden-xs"><%= sort :disks_size, :as => _('Disks Size') %></th>
-    <% Setting::Discovered.discovery_fact_column_array.each do |fact_column| %>
-      <th class="hidden-tablet hidden-xs"><%= fact_column.capitalize %></th>
-    <% end %>
-    <th class="hidden-tablet hidden-xs"><%= sort :location, :as => _('Location') %></th>
-    <th class="hidden-tablet hidden-xs"><%= sort :organization, :as => _('Organization') %></th>
-    <th class="hidden-tablet hidden-xs"><%= sort :subnet, :as => _("Subnet") %></th>
-    <th class="hidden-tablet hidden-xs"><%= sort :last_report, :as => _("Last Facts Upload") %></th>
-    <th class="hidden-tablet hidden-xs"><%= _("Actions") %></th>
-  </tr>
-  <% @hosts.each do |host| -%>
+  <thead>
     <tr>
-      <td class="ca">
-        <%= check_box_tag "host_ids[]", nil, false, :id => "host_ids_#{host.id}", :disabled => !authorized_for_edit_destroy?, :class => 'host_select_boxes', :onclick => 'tfm.hosts.table.hostChecked(this)' -%>
-      </td>
-      <%= render :partial => "discovered_host", :locals => {:host => host} %>
-      <td class="hidden-tablet hidden-xs"><%= host.location.try(:title) %></td>
-      <td class="hidden-tablet hidden-xs"><%= host.organization.try(:title) %></td>
-      <td class="hidden-tablet hidden-xs"><%= host.primary_interface.try(:subnet).try(:to_label) %></td>
-      <td class="hidden-tablet hidden-xs"><%= disc_report_column(host) %></td>
-      <td>
-        <!-- Modal -->
-        <%= render :partial => "discovered_host_modal", :locals => {:host => host} %>
-        </div>
-        <%= action_buttons(
-          provision_button(host, hash_for_edit_discovered_host_path(:id => host)),
-          display_link_if_authorized(_("Auto Provision"), hash_for_auto_provision_discovered_host_path(:id => host), :method => :post),
-          display_link_if_authorized(_("Refresh facts"), hash_for_refresh_facts_discovered_host_path(:id => host)),
-          display_link_if_authorized(_("Reboot"), hash_for_reboot_discovered_host_path(:id => host), :method => :put),
-          display_delete_if_authorized(hash_for_discovered_host_path(:id => host), :data => { :confirm => _("Delete %s?") % host.name }, :action => :destroy)) %>
+      <th class="ca"><%= check_box_tag "check_all", "", false, { :onclick => "tfm.hosts.table.toggleCheck()", :'check-title' => _("Select all items in this page"), :'uncheck-title'=> _("items selected. Uncheck to Clear") } %></th>
+      <th class=''><%= sort :name, :as => _('Name') %></th>
+      <th class="hidden-tablet hidden-xs"><%= sort :model, :as => _('Model') %></th>
+      <th class="hidden-tablet hidden-xs"><%= sort :ip, :as => _('IP Address') %></th>
+      <th class="hidden-tablet hidden-xs"><%= sort :cpu_count, :as => _('CPUs') %></th>
+      <th class="hidden-tablet hidden-xs"><%= sort :memory, :as => _('Memory') %></th>
+      <th class="hidden-tablet hidden-xs"><%= sort :disk_count, :as => _('Disk Count') %></th>
+      <th class="hidden-tablet hidden-xs"><%= sort :disks_size, :as => _('Disks Size') %></th>
+      <% Setting::Discovered.discovery_fact_column_array.each do |fact_column| %>
+        <th class="hidden-tablet hidden-xs"><%= fact_column.capitalize %></th>
+      <% end %>
+      <th class="hidden-tablet hidden-xs"><%= sort :location, :as => _('Location') %></th>
+      <th class="hidden-tablet hidden-xs"><%= sort :organization, :as => _('Organization') %></th>
+      <th class="hidden-tablet hidden-xs"><%= sort :subnet, :as => _("Subnet") %></th>
+      <th class="hidden-tablet hidden-xs"><%= sort :last_report, :as => _("Last Facts Upload") %></th>
+      <th class="hidden-tablet hidden-xs"><%= _("Actions") %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @hosts.each do |host| -%>
+      <tr>
+        <td class="ca">
+          <%= check_box_tag "host_ids[]", nil, false, :id => "host_ids_#{host.id}", :disabled => !authorized_for_edit_destroy?, :class => 'host_select_boxes', :onclick => 'tfm.hosts.table.hostChecked(this)' -%>
         </td>
-      </tr>
-    <% end -%>
-  </table>
+        <%= render :partial => "discovered_host", :locals => {:host => host} %>
+        <td class="hidden-tablet hidden-xs"><%= host.location.try(:title) %></td>
+        <td class="hidden-tablet hidden-xs"><%= host.organization.try(:title) %></td>
+        <td class="hidden-tablet hidden-xs"><%= host.primary_interface.try(:subnet).try(:to_label) %></td>
+        <td class="hidden-tablet hidden-xs"><%= disc_report_column(host) %></td>
+        <td>
+          <!-- Modal -->
+          <%= render :partial => "discovered_host_modal", :locals => {:host => host} %>
+          </div>
+          <%= action_buttons(
+            provision_button(host, hash_for_edit_discovered_host_path(:id => host)),
+            display_link_if_authorized(_("Auto Provision"), hash_for_auto_provision_discovered_host_path(:id => host), :method => :post),
+            display_link_if_authorized(_("Refresh facts"), hash_for_refresh_facts_discovered_host_path(:id => host)),
+            display_link_if_authorized(_("Reboot"), hash_for_reboot_discovered_host_path(:id => host), :method => :put),
+            display_delete_if_authorized(hash_for_discovered_host_path(:id => host), :data => { :confirm => _("Delete %s?") % host.name }, :action => :destroy)) %>
+          </td>
+        </tr>
+      <% end -%>
+  </tbody>
+</table>
 
 <div id="confirmation-modal" class="modal fade">
   <div class="modal-dialog">

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

@@ -8,7 +8,6 @@
 <% content_for(:title, _("Discovered Hosts")) %>
 
 <% 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 ) %>

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>