foreman_discovery 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f374078ca62446b7d03fd98a002238e45cc9564
-  data.tar.gz: 843df4136fa29c634e7446349ba2ad358902662f
+  metadata.gz: 502993f89f5431e289e5efb8461e7cc0ebaacd8e
+  data.tar.gz: de1e98597a4aa81d8a79c47eb92e16d839217306
 SHA512:
-  metadata.gz: 1a8eeb66a019a1d99e8c2705698a7fd410e6ed993cb00a1ee1b5c16d39fe22168d4c01cb5bcc72f49dd40bc4d08545d94ab0be95cd682ac843d9eb462a8f79b5
-  data.tar.gz: debdc05bee101a87d3154f03ff600f090e5186e05f941d8d7c7e61377acfa4679396b999d442b98583e5a7355e6ffdcc2bf42eb4c7a0e19b6f3fc2d06262d331
+  metadata.gz: 8cc594acebdc231572f3b2057a04e3317506ac454c5befd1c51aad5d81efb19e343cc37cc6a3ed77eac8e30388486e3e782afe812a7094fccc978c054cebea0c
+  data.tar.gz: 1d1cb83f0c3ada7a3c43c8f150db2e0e143cb4abbca4c783c5f48c7dc06faa7c2301b4615681bec8b56dd88b3c73a7b82b3f768810241f566bc2d9f6ebea95f8

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

@@ -76,12 +76,10 @@ module Api
       end
 
       def update
-        Host.transaction do
-          @host = ::ForemanDiscovery::HostConverter.to_managed(@discovered_host)
-          forward_request_url
-          update_response = @host.update_attributes(params[:discovered_host])
-          process_response update_response
-        end
+        @host = ::ForemanDiscovery::HostConverter.to_managed(@discovered_host)
+        forward_request_url
+        update_response = @host.update_attributes(params[:discovered_host])
+        process_response update_response
       end
 
       api :DELETE, "/discovered_hosts/:id/", N_("Delete a discovered host")
@@ -96,16 +94,12 @@ module Api
 
       def facts
         state = true
-        Host.transaction do
-          @discovered_host, state = Host::Discovered.import_host_and_facts(params[:facts])
-        end
+        @discovered_host, state = Host::Discovered.import_host_and_facts(params[:facts])
         if Setting['discovery_auto']
-          Host.transaction do
-            if state && rule = find_discovery_rule(@discovered_host)
-              state = perform_auto_provision(@discovered_host, rule)
-            else
-              Rails.logger.warn "Discovered facts import unsuccessful, skipping auto provisioning"
-            end
+          if state && rule = find_discovery_rule(@discovered_host)
+            state = perform_auto_provision(@discovered_host, rule)
+          else
+            Rails.logger.warn "Discovered facts import unsuccessful, skipping auto provisioning"
           end
         end
         process_response state
@@ -119,21 +113,19 @@ module Api
       param :id, :identifier, :required => true
 
       def auto_provision
-        Host.transaction do
-          if rule = find_discovery_rule(@discovered_host)
-            if perform_auto_provision(@discovered_host, rule)
-              msg = _("Host %{host} was provisioned with rule %{rule}") % {:host => @discovered_host.name, :rule => rule.name}
-              render :json => {:message => msg}
-            else
-              msg = _("Unable to provision %{host}: %{errors}") % {:host => @discovered_host.name, :errors => @discovered_host.errors.full_messages.join(' ')}
-              render :json => {:message => msg}, :status => :unprocessable_entity
-            end
+        if rule = find_discovery_rule(@discovered_host)
+          if perform_auto_provision(@discovered_host, rule)
+            msg = _("Host %{host} was provisioned with rule %{rule}") % {:host => @discovered_host.name, :rule => rule.name}
+            render :json => {:message => msg}
           else
-            render_error :custom_error, :status => :not_found,
-                         :locals => {
-                             :message => _("No rule found for host %s") % @discovered_host.name
-                         }
+            msg = _("Unable to provision %{host}: %{errors}") % {:host => @discovered_host.name, :errors => @discovered_host.errors.full_messages.join(' ')}
+            render :json => {:message => msg}, :status => :unprocessable_entity
           end
+        else
+          render_error :custom_error, :status => :not_found,
+                       :locals => {
+                           :message => _("No rule found for host %s") % @discovered_host.name
+                       }
         end
       rescue ::Foreman::Exception => e
         render :json => {'message' => e.to_s}, :status => :unprocessable_entity
@@ -151,34 +143,32 @@ module Api
         end
 
         total_count = 0
-        Host.transaction do
-          overall_errors = ""
-          Host::Discovered.all.each do |discovered_host|
-            if rule = find_discovery_rule(discovered_host)
-              result &= perform_auto_provision(discovered_host, rule)
-              unless discovered_host.errors.empty?
-                errors = discovered_host.errors.full_messages.join(' ')
-                logger.warn "Failed to auto provision host %s: %s" % [discovered_host.name, errors]
-                overall_errors << "#{discovered_host.name}: #{errors} "
-              else
-                total_count += 1
-              end
+        overall_errors = ""
+        Host::Discovered.all.each do |discovered_host|
+          if rule = find_discovery_rule(discovered_host)
+            result &= perform_auto_provision(discovered_host, rule)
+            unless discovered_host.errors.empty?
+              errors = discovered_host.errors.full_messages.join(' ')
+              logger.warn "Failed to auto provision host %s: %s" % [discovered_host.name, errors]
+              overall_errors << "#{discovered_host.name}: #{errors} "
             else
-              logger.warn "No rule found for host %s" % discovered_host.name
+              total_count += 1
             end
-          end
-
-          if result
-            msg = _("%s discovered hosts were provisioned") % total_count
-            render :json => {:message => msg}
           else
-            render_error :custom_error,
-              :status => :unprocessable_entity,
-              :locals => {
-                :message => error_message % overall_errors
-              }
+            logger.warn "No rule found for host %s" % discovered_host.name
           end
         end
+
+        if result
+          msg = _("%s discovered hosts were provisioned") % total_count
+          render :json => {:message => msg}
+        else
+          render_error :custom_error,
+            :status => :unprocessable_entity,
+            :locals => {
+              :message => error_message % overall_errors
+            }
+        end
       end
 
       api :PUT, "/discovered_hosts/:id/refresh_facts", N_("Refreshing the facts of a discovered host")

data/app/controllers/concerns/foreman/controller/discovered_extensions.rb

@@ -44,19 +44,18 @@ module Foreman::Controller::DiscoveredExtensions
 
   # trigger the provisioning
   def perform_auto_provision original_host, rule
-    Host.transaction do
-      host = ::ForemanDiscovery::HostConverter.to_managed(original_host)
-      host.hostgroup_id = rule.hostgroup_id
-      host.comment = "Auto-discovered and provisioned via rule '#{rule.name}'"
-      host.discovery_rule = rule
-      # render hostname only when all other fields are set
-      original_name = host.name
-      host.name = host.render_template(rule.hostname) unless rule.hostname.empty?
-      # fallback to the original if template did not expand
-      host.name = original_name if host.name.empty?
-      # save! does not work here
-      host.save
-    end
+    raise(::Foreman::Exception.new(N_("No hostgroup associated with rule '%s'"), rule)) if rule.hostgroup.nil?
+    host = ::ForemanDiscovery::HostConverter.to_managed(original_host)
+    host.hostgroup_id = rule.hostgroup_id
+    host.comment = "Auto-discovered and provisioned via rule '#{rule.name}'"
+    host.discovery_rule = rule
+    # render hostname only when all other fields are set
+    original_name = host.name
+    host.name = host.render_template(rule.hostname) unless rule.hostname.empty?
+    # fallback to the original if template did not expand
+    host.name = original_name if host.name.empty?
+    # save! does not work here
+    host.save
   end
 
   def perform_reboot_all hosts = Host::Discovered.all
@@ -65,19 +64,17 @@ module Foreman::Controller::DiscoveredExtensions
     overall_errors = ""
 
     if hosts.count > 0
-      Host.transaction do
-        hosts.each do |discovered_host|
-          begin
-            unless discovered_host.reboot
-              error =  "#{discovered_host.name}: failed to reboot "
-              overall_errors << error
-              logger.error error
-            end
-          rescue Exception => e
-            error = "#{discovered_host.name}: #{e.to_s} "
+      hosts.each do |discovered_host|
+        begin
+          unless discovered_host.reboot
+            error =  "#{discovered_host.name}: failed to reboot "
             overall_errors << error
             logger.error error
           end
+        rescue Exception => e
+          error = "#{discovered_host.name}: #{e.to_s} "
+          overall_errors << error
+          logger.error error
         end
       end
     else

data/app/controllers/discovered_hosts_controller.rb

@@ -3,7 +3,6 @@ class DiscoveredHostsController < ::ApplicationController
   include Foreman::Controller::TaxonomyMultiple
   include Foreman::Controller::DiscoveredExtensions
   include ActionView::Helpers::NumberHelper
-  unloadable
 
   before_filter :find_by_name, :only => %w[edit update destroy refresh_facts convert reboot auto_provision]
   before_filter :find_by_name_incl_subnet, :only => [:show]
@@ -23,6 +22,10 @@ class DiscoveredHostsController < ::ApplicationController
       :model,
       :discovery_attribute_set
     ], {:interfaces => :subnet}).paginate(:page => params[:page])
+    fact_array = @hosts.collect do |host|
+      [host.id, Hash[host.fact_values.joins(:fact_name).where('fact_names.name' => Setting::Discovered.discovery_fact_column_array).pluck(:name, :value)]]
+    end
+    @host_facts = Hash[fact_array]
   end
 
   def show
@@ -46,25 +49,21 @@ class DiscoveredHostsController < ::ApplicationController
   end
 
   def edit
-    Host.transaction do
-      @host = ::ForemanDiscovery::HostConverter.to_managed(@host, true, false) unless @host.nil?
-      render :template => 'hosts/edit'
-    end
+    @host = ::ForemanDiscovery::HostConverter.to_managed(@host, true, false) unless @host.nil?
+    render :template => 'hosts/edit'
   end
 
   def update
-    Host.transaction do
-      @host = ::ForemanDiscovery::HostConverter.to_managed(@host)
-      forward_url_options
-      Taxonomy.no_taxonomy_scope do
-        if @host.update_attributes(params[:host])
-          process_success :success_redirect => host_path(@host), :redirect_xhr => request.xhr?
-        else
-          taxonomy_scope
-          load_vars_for_ajax
-          offer_to_overwrite_conflicts
-          process_error :object => @host, :render => 'hosts/edit'
-        end
+    @host = ::ForemanDiscovery::HostConverter.to_managed(@host)
+    forward_url_options
+    Taxonomy.no_taxonomy_scope do
+      if @host.update_attributes(params[:host])
+        process_success :success_redirect => host_path(@host), :redirect_xhr => request.xhr?
+      else
+        taxonomy_scope
+        load_vars_for_ajax
+        offer_to_overwrite_conflicts
+        process_error :object => @host, :render => 'hosts/edit'
       end
     end
   end
@@ -75,6 +74,10 @@ class DiscoveredHostsController < ::ApplicationController
     else
       process_error :error_msg => _("Failed to refresh facts for %s") % @host.name, :redirect => :back
     end
+  rescue => e
+    exception = Foreman::WrappedException.new(e, N_("Failed to refresh facts for %{hostname} with error %{error_message}"), :hostname => @host.name, :error_message => e.message)
+    Foreman::Logging.exception exception.message, e
+    process_error :error_msg => exception.message, :redirect => :back
   end
 
   def reboot
@@ -87,9 +90,10 @@ class DiscoveredHostsController < ::ApplicationController
     else
       process_error :error_msg => _("Failed to reboot host %s") % @host.name, :redirect => :back
     end
-    rescue  => e
-      process_error :error_msg => _("Failed to reboot host %{hostname} with error %{error_message}") % {:hostname => @host.name, :error_message => e.message},
-                    :redirect => :back
+  rescue => e
+    exception = Foreman::WrappedException.new(e, N_("Failed to reboot host %{hostname} with error %{error_message}"), :hostname => @host.name, :error_message => e.message)
+    Foreman::Logging.exception exception.message, e
+    process_error :error_msg => exception.message, :redirect => :back
   end
 
   def reboot_all
@@ -100,6 +104,10 @@ class DiscoveredHostsController < ::ApplicationController
     else
       process_success :success_msg => _("Discovered hosts are rebooting now"), :success_redirect => :back
     end
+  rescue => e
+    exception = Foreman::WrappedException.new(e, N_("Failed to reboot hosts with error %s"), e.message)
+    Foreman::Logging.exception exception.message, e
+    process_error :error_msg => exception.message, :redirect => :back
   end
 
   def multiple_destroy
@@ -107,7 +115,7 @@ class DiscoveredHostsController < ::ApplicationController
 
   def submit_multiple_destroy
     # keep all the ones that were not deleted for notification.
-    @hosts.delete_if {|host| host.destroy}
+    @hosts.to_a.delete_if {|host| host.destroy}
 
     missed_hosts = @hosts.map(&:name).join('<br/>')
     if @hosts.empty?
@@ -134,18 +142,16 @@ class DiscoveredHostsController < ::ApplicationController
   end
 
   def auto_provision
-    Host.transaction do
-      if rule = find_discovery_rule(@host)
-        if perform_auto_provision(@host, rule)
-          process_success :success_msg => _("Host %{host} was provisioned with rule %{rule}") % {:host => @host.name, :rule => rule.name}, :success_redirect => discovered_hosts_path
-        else
-          errors = @host.errors.full_messages.join(' ')
-          logger.warn "Failed to auto provision host %s: %s" % [@host.name, errors]
-          process_error :error_msg => _("Failed to auto provision host %s: %s") % [@host.name, errors], :redirect => :back
-        end
+    if rule = find_discovery_rule(@host)
+      if perform_auto_provision(@host, rule)
+        process_success :success_msg => _("Host %{host} was provisioned with rule %{rule}") % {:host => @host.name, :rule => rule.name}, :success_redirect => discovered_hosts_path
       else
-        process_success :success_msg => _("No rule found for host %s") % @host.name, :success_redirect => :back
+        errors = @host.errors.full_messages.join(' ')
+        logger.warn "Failed to auto provision host %s: %s" % [@host.name, errors]
+        process_error :error_msg => _("Failed to auto provision host %s: %s") % [@host.name, errors], :redirect => :back
       end
+    else
+      process_success :success_msg => _("No rule found for host %s") % @host.name, :success_redirect => :back
     end
   end
 
@@ -158,23 +164,21 @@ class DiscoveredHostsController < ::ApplicationController
       result = false
     end
 
-    Host.transaction do
-      overall_errors = ""
-      Host::Discovered.all.each do |discovered_host|
-        if rule = find_discovery_rule(discovered_host)
-          result &= perform_auto_provision(discovered_host, rule)
-          unless discovered_host.errors.empty?
-            errors = discovered_host.errors.full_messages.join(' ')
-            logger.warn "Failed to auto provision host %s: %s" % [discovered_host.name, errors]
-            overall_errors << "#{discovered_host.name}: #{errors} "
-          end
+    overall_errors = ""
+    Host::Discovered.all.each do |discovered_host|
+      if rule = find_discovery_rule(discovered_host)
+        result &= perform_auto_provision(discovered_host, rule)
+        unless discovered_host.errors.empty?
+          errors = discovered_host.errors.full_messages.join(' ')
+          logger.warn "Failed to auto provision host %s: %s" % [discovered_host.name, errors]
+          overall_errors << "#{discovered_host.name}: #{errors} "
         end
       end
-      if result
-        process_success :success_msg => _("Discovered hosts are provisioning now"), :success_redirect => :back
-      else
-        process_error :error_msg => error_message % overall_errors, :redirect => :back
-      end
+    end
+    if result
+      process_success :success_msg => _("Discovered hosts are provisioning now"), :success_redirect => :back
+    else
+      process_error :error_msg => error_message % overall_errors, :redirect => :back
     end
   end
 

data/app/helpers/concerns/foreman_discovery/settings_helper_extensions.rb

@@ -0,0 +1,34 @@
+module ForemanDiscovery
+  module SettingsHelperExtensions
+    extend ActiveSupport::Concern
+
+    included do
+      alias_method_chain :value, :discovery
+    end
+
+    def value_with_discovery(setting)
+      return value_without_discovery(setting) unless [
+        'discovery_location',
+        'discovery_organization'].include?(setting.name)
+
+      case setting.name
+      when "discovery_location"
+        edit_select(
+          setting,
+          :value,
+          :select_values => discovery_taxonomy_values(Location))
+      when "discovery_organization"
+        edit_select(
+          setting,
+          :value,
+          :select_values => discovery_taxonomy_values(Organization))
+      end
+    end
+
+    private
+
+    def discovery_taxonomy_values(taxonomy_class)
+      Hash[taxonomy_class.all.map{ |org| [org[:title], org[:title]] }].to_json
+    end
+  end
+end

data/app/helpers/discovery_rules_helper.rb

@@ -23,14 +23,13 @@ module DiscoveryRulesHelper
   end
 
   def permitted_discovery_actions(rule)
-    actions = [display_delete_if_authorized(hash_for_discovery_rule_path(:id => rule).
-       merge(:auth_object => rule, :authorizer => authorizer), :confirm => _("Delete %s?") % rule)]
+    actions = [display_link_if_authorized(_('Discovered Hosts'), hash_for_discovered_hosts_path.merge(:search => rule.search))]
+    actions << display_link_if_authorized(_('Associated Hosts'), hash_for_hosts_path.merge(:search => "discovery_rule = \"#{rule.name}\""))
     if rule.enabled?
-      actions << display_link_if_authorized(_('Disable'), hash_for_disable_discovery_rule_path(:id => rule),
-                                            {:confirm => _('Disable rule?')})
+      actions << display_link_if_authorized(_('Disable'), hash_for_disable_discovery_rule_path(:id => rule).merge(:auth_object => rule, :authorizer => authorizer), :confirm => _("Disable rule '%s'?") % rule)
     else
-      actions << display_link_if_authorized(_('Enable'), hash_for_enable_discovery_rule_path(:id => rule),
-                                            {:confirm => _('Enable rule?')})
+      actions << display_link_if_authorized(_('Enable'), hash_for_enable_discovery_rule_path(:id => rule).merge(:auth_object => rule, :authorizer => authorizer), :confirm => _("Enable rule '%s'?") % rule)
     end
+    actions << display_delete_if_authorized(hash_for_discovery_rule_path(:id => rule).merge(:auth_object => rule, :authorizer => authorizer), :confirm => _("Delete rule '%s'?") % rule)
   end
 end

data/app/mailers/discovered_mailer.rb

@@ -0,0 +1,19 @@
+class DiscoveredMailer < ::ApplicationMailer
+  helper :discovered_hosts
+  def discovered_summary(options = {})
+    raise ::Foreman::Exception.new(N_("Must specify a user with email enabled")) unless (user = User.find(options[:user])) && user.mail_enabled?
+    begin
+      Time.zone = user.timezone
+    rescue ArgumentError
+      Time.zone = 'UTC'
+    end
+
+    set_url
+    @time = options[:time] || 1.day.ago
+    @discovered_hosts = Host::Discovered.authorized_as(user, :view_discovered_hosts, Host::Discovered).where("created_at >= ?", @time)
+    set_locale_for(user) do
+      subject = _("Discovered hosts summary")
+      mail(:to => user.mail, :subject => subject)
+    end
+  end
+end

data/app/models/discovery_rule.rb

@@ -13,14 +13,14 @@ class DiscoveryRule < ActiveRecord::Base
   validates :hostname, :format => { :with => /\A[a-zA-Z<]/, :message => N_("must start with a letter or ERB.") },
     :allow_blank => true
   validates :hostgroup_id, :presence => true
-  validates :max_count, :numericality => { :only_integer => true, :greater_than_or_equal_to => 0 }
-  validates :priority, :presence => true, :numericality => { :only_integer => true, :greater_than_or_equal_to => 0 }
+  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
   before_validation :default_int_attributes
   before_validation :enforce_taxonomy
 
   belongs_to :hostgroup
-  has_many :hosts
+  has_many :hosts, :dependent => :nullify
 
   scoped_search :on => :name, :complete_value => :true
   scoped_search :on => :priority