foreman_remote_execution 4.5.6 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f14506c337ce696f794a63b0c30b59f6d301edc4d55b9d654e2b5360215beb9
-  data.tar.gz: 0b9d86b4a422b84d507dfd977dea5dd9f2dc8b30e464b3e4383c8ea421e0615b
+  metadata.gz: 66efbd042b1d607eeaa4e72b07452ac00a4e68d28bf09e1fc496f26cae25f1e4
+  data.tar.gz: 124621a113adab399e259ece92caad11fdf35da117da77dc512fc9e31e6ec66a
 SHA512:
-  metadata.gz: 250ec14568078576a42664e40e2d96b974282765e6cfcffca8ec58bdff9e72c8948f2e28e7ba5fdafe36fb45457e2f38c03bd3c39842ba0bebaa303970ea5f09
-  data.tar.gz: 4f6469e5ad8535b7996d1a8c78d266edbba4c03e1e3eb9b52e0588c653351e153b87b4d6daaf082e039d7af47207fdf5e3e6267920cde4d2a233c4e11ac5ca57
+  metadata.gz: 04ed33fb87e3b0830501f97b95ab62c129897e8510909b47163559854bb0b2b792ccab4035c5fc606a6a8d8e5ff8c084fcfd2109331dff8b4e7a6eac23c86825
+  data.tar.gz: bca23be551bd1d8169c28a5a4e2d71079ea42cae3a11d6d289f40c9c862a2e7307b6c6e569ba79be7e743f729ef58a3ef72b027ee8735e9c448e4672a105db4b

data/.github/workflows/ruby_ci.yml

@@ -71,3 +71,10 @@ jobs:
         run: |
           bundle exec rake test:foreman_remote_execution
           bundle exec rake test TEST="test/unit/foreman/access_permissions_test.rb"
+      - name: 'Upload logs'
+        uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: logs
+          path: log/*.log
+          retention-days: 5

data/.rubocop_todo.yml

@@ -220,6 +220,7 @@ Naming/FileName:
     - 'db/seeds.d/60-ssh_proxy_feature.rb'
     - 'db/seeds.d/70-job_templates.rb'
     - 'db/seeds.d/90-bookmarks.rb'
+    - 'db/seeds.d/95-mail_notifications.rb'
 
 # Offense count: 1
 # Configuration parameters: ForbiddenDelimiters.

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

@@ -41,12 +41,18 @@ module Api
             param :effective_user, String,
               :required => false,
               :desc => N_('What user should be used to run the script (using sudo-like mechanisms). Defaults to a template parameter or global setting.')
+            param :effective_user_password, String,
+              :required => false,
+              :desc => N_('Set password for effective user (using sudo-like mechanisms)')
           end
+          param :password, String, :required => false, :desc => N_('Set SSH password')
+          param :key_passphrase, String, :required => false, :desc => N_('Set SSH key passphrase')
 
           param :recurrence, Hash, :desc => N_('Create a recurring job') do
             param :cron_line, String, :required => false, :desc => N_('How often the job should occur, in the cron format')
             param :max_iteration, :number, :required => false, :desc => N_('Repeat a maximum of N times')
             param :end_time, DateTime, :required => false, :desc => N_('Perform no more executions after this time')
+            param :purpose, String, :required => false, :desc => N_('Designation of a special purpose')
           end
 
           param :scheduling, Hash, :desc => N_('Schedule the job to start at a later time') do
@@ -162,6 +168,15 @@ module Api
         render :json => { :outputs => outputs }
       end
 
+      def resource_name(resource = controller_name)
+        case resource
+        when 'organization', 'location'
+          nil
+        else
+          'job_invocation'
+        end
+      end
+
       private
 
       def allowed_nested_id
@@ -197,7 +212,7 @@ module Api
         end
 
         if job_invocation_params.key?(:ssh)
-          job_invocation_params.merge!(job_invocation_params.delete(:ssh).permit(:effective_user))
+          job_invocation_params.merge!(job_invocation_params.delete(:ssh).permit(:effective_user, :effective_user_password))
         end
 
         job_invocation_params[:inputs] ||= {}

data/app/controllers/ui_job_wizard_controller.rb

@@ -1,11 +1,12 @@
-class UiJobWizardController < ::Api::V2::BaseController
+class UiJobWizardController < ApplicationController
+  include FiltersHelper
   def categories
     job_categories = resource_scope
                      .search_for("job_category ~ \"#{params[:search]}\"")
                      .select(:job_category).distinct
                      .reorder(:job_category)
                      .pluck(:job_category)
-    render :json => {:job_categories =>job_categories}
+    render :json => {:job_categories =>job_categories, :with_katello => with_katello}
   end
 
   def template
@@ -19,12 +20,16 @@ class UiJobWizardController < ::Api::V2::BaseController
     }
   end
 
+  def map_template_inputs(template_inputs_with_foreign)
+    template_inputs_with_foreign.map { |input| input.attributes.merge({:resource_type_tableize => input.resource_type&.tableize }) }
+  end
+
   def resource_name(nested_resource = nil)
     nested_resource || 'job_template'
   end
 
-  def map_template_inputs(template_inputs_with_foreign)
-    template_inputs_with_foreign.map { |input| input.attributes.merge({:resource_type => input.resource_type&.tableize }) }
+  def with_katello
+    !!defined?(::Katello)
   end
 
   def resource_class
@@ -34,4 +39,11 @@ class UiJobWizardController < ::Api::V2::BaseController
   def action_permission
     :view_job_templates
   end
+
+  def resources
+    resource_type = params[:resource]
+    resource_list = resource_type.constantize.authorized("view_#{resource_type.underscore.pluralize}").all.map { |r| {:name => r.to_s, :id => r.id } }.select { |v| v[:name] =~ /#{params[:name]}/ }
+    render :json => { :results =>
+      resource_list.sort_by { |r| r[:name] }.take(100), :subtotal => resource_list.count}
+  end
 end

data/app/graphql/mutations/job_invocations/create.rb

@@ -0,0 +1,43 @@
+module Mutations
+  module JobInvocations
+    class Create < ::Mutations::CreateMutation
+      description 'Create a new job invocation'
+      graphql_name 'CreateJobInvocationMutation'
+
+      argument :job_invocation, ::Types::JobInvocationInput, required: true
+      field :job_invocation, ::Types::JobInvocation, 'The new job invocation', null: true
+
+      def resolve(params)
+        begin
+          composer = JobInvocationComposer.from_api_params(params[:job_invocation].to_h)
+          job_invocation = composer.job_invocation
+          authorize!(job_invocation, :create)
+          errors = []
+          composer.trigger!
+        rescue ActiveRecord::RecordNotSaved
+          errors = map_all_errors(job_invocation)
+        rescue JobInvocationComposer::JobTemplateNotFound, JobInvocationComposer::FeatureNotFound => e
+          errors = [{ path => ['job_template'], :message => e.message }]
+        end
+
+        {
+          result_key => job_invocation,
+          :errors => errors,
+        }
+      end
+
+      def map_all_errors(job_invocation)
+        map_errors_to_path(job_invocation) + map_errors('triggering', job_invocation.triggering) + map_errors('targeting', job_invocation.targeting)
+      end
+
+      def map_errors(attr_name, resource)
+        resource.errors.map do |attribute, message|
+          {
+            path: [attr_name, attribute.to_s.camelize(:lower)],
+            message: message,
+          }
+        end
+      end
+    end
+  end
+end

data/app/graphql/types/job_invocation.rb

@@ -0,0 +1,16 @@
+module Types
+  class JobInvocation < BaseObject
+    description 'A Job Invocation'
+
+    global_id_field :id
+    field :job_category, String
+    field :description, String
+    field :time_span, Integer
+    field :start_at, GraphQL::Types::ISO8601DateTime
+    field :status_label, String
+
+    belongs_to :triggering, Types::Triggering
+    belongs_to :task, Types::Task
+    field :recurring_logic, Types::RecurringLogic
+  end
+end

data/app/graphql/types/job_invocation_input.rb

@@ -0,0 +1,13 @@
+module Types
+  class JobInvocationInput < BaseInputObject
+    argument :job_category, String, required: false
+    argument :job_template_id, Integer, required: false
+    argument :feature, String, required: false
+    argument :targeting_type, ::Types::TargetingEnum, required: false
+    argument :recurrence, ::Types::RecurrenceInput, required: false
+    argument :scheduling, ::Types::SchedulingInput, required: false
+    argument :search_query, String, required: false
+    argument :host_ids, [Integer], required: false
+    argument :inputs, ::Types::RawJson, required: false
+  end
+end

data/app/graphql/types/recurrence_input.rb

@@ -0,0 +1,8 @@
+module Types
+  class RecurrenceInput < BaseInputObject
+    argument :cron_line, String, required: false
+    argument :max_iteration, Integer, required: false
+    argument :end_time, String, required: false
+    argument :purpose, String, required: false
+  end
+end

data/app/graphql/types/scheduling_input.rb

@@ -0,0 +1,6 @@
+module Types
+  class SchedulingInput < BaseInputObject
+    argument :start_at, String, required: false
+    argument :start_before, String, required: false
+  end
+end

data/app/graphql/types/targeting_enum.rb

@@ -0,0 +1,7 @@
+module Types
+  class TargetingEnum < Types::BaseEnum
+    Targeting::TYPES.each_key do |key|
+      value key
+    end
+  end
+end

data/app/lib/actions/remote_execution/run_host_job.rb

@@ -56,7 +56,8 @@ module Actions
                                :secrets => secrets(host, job_invocation, provider),
                                :use_batch_triggering => true,
                                :use_concurrency_control => options[:use_concurrency_control],
-                               :first_execution => first_execution }
+                               :first_execution => first_execution,
+                               :alternative_names => provider.alternative_names(host) }
         action_options = provider.proxy_command_options(template_invocation, host)
                                  .merge(additional_options)
 
@@ -195,6 +196,10 @@ module Actions
       def verify_permissions(host, template_invocation)
         raise _('User can not execute job on host %s') % host.name unless User.current.can?(:view_hosts, host)
         raise _('User can not execute this job template') unless User.current.can?(:view_job_templates, template_invocation.template)
+        infra_facet = host.infrastructure_facet
+        if (infra_facet&.foreman_instance || infra_facet&.smart_proxy_id) && !User.current.can?(:execute_jobs_on_infrastructure_hosts)
+          raise _('User can not execute job on infrastructure host %s') % host.name
+        end
 
         # we don't want to load all template_invocations to verify so we construct Authorizer object manually and set
         # the base collection to current template

data/app/lib/actions/remote_execution/run_hosts_job.rb

@@ -9,7 +9,9 @@ module Actions
       middleware.use Actions::Middleware::BindJobInvocation
       middleware.use Actions::Middleware::RecurringLogic
       middleware.use Actions::Middleware::WatchDelegatedProxySubTasks
-      middleware.use Actions::Middleware::ProxyBatchTriggering
+
+      execution_plan_hooks.use :notify_on_success, :on => :success
+      execution_plan_hooks.use :notify_on_failure, :on => :failure
 
       class CheckOnProxyActions; end
 
@@ -32,6 +34,10 @@ module Actions
         set_up_concurrency_control job_invocation
         input.update(:job_category => job_invocation.job_category)
         plan_self(:job_invocation_id => job_invocation.id)
+        provider = job_invocation.pattern_template_invocations.first&.template&.provider
+        input[:proxy_batch_size] ||= provider&.proxy_batch_size || Setting['foreman_tasks_proxy_batch_size']
+        trigger_action = plan_action(Actions::TriggerProxyBatch, batch_size: proxy_batch_size, total_count: hosts.count)
+        input[:trigger_run_step_id] = trigger_action.run_step_id
       end
 
       def create_sub_plans
@@ -46,14 +52,47 @@ module Actions
         end
       end
 
+      def spawn_plans
+        super
+      ensure
+        trigger_remote_batch
+      end
+
+      def trigger_remote_batch
+        batches_ready = (output[:planned_count] - output[:remote_triggered_count]) / proxy_batch_size
+        return unless batches_ready > 0
+
+        plan_event(Actions::TriggerProxyBatch::TriggerNextBatch[batches_ready], nil, step_id: input[:trigger_run_step_id])
+        output[:remote_triggered_count] += proxy_batch_size * batches_ready
+      end
+
+      def on_planning_finished
+        plan_event(Actions::TriggerProxyBatch::TriggerLastBatch, nil, step_id: input[:trigger_run_step_id])
+        super
+      end
+
       def finalize
         job_invocation.password = job_invocation.key_passphrase = job_invocation.effective_user_password = nil
         job_invocation.save!
 
         Rails.logger.debug "cleaning cache for keys that begin with 'job_invocation_#{job_invocation.id}'"
         Rails.cache.delete_matched(/\A#{JobInvocation::CACHE_PREFIX}_#{job_invocation.id}/)
-        # creating the success notification should be the very last thing this tasks do
+      end
+
+      def notify_on_success(_plan)
         job_invocation.build_notification.deliver!
+
+        if [RexMailNotification::SUCCEEDED_JOBS, RexMailNotification::ALL_JOBS].include?(mail_notification_preference&.interval)
+          RexJobMailer.job_finished(job_invocation, subject: _("REX job has succeeded - %s") % job_invocation.to_s).deliver_now
+        end
+      end
+
+      def notify_on_failure(_plan)
+        job_invocation.build_notification.deliver!
+
+        if [RexMailNotification::FAILED_JOBS, RexMailNotification::ALL_JOBS].include?(mail_notification_preference&.interval)
+          RexJobMailer.job_finished(job_invocation, subject: _("REX job has failed - %s") % job_invocation.to_s).deliver_now
+        end
       end
 
       def job_invocation
@@ -67,6 +106,7 @@ module Actions
 
       def initiate
         output[:host_count] = total_count
+        output[:remote_triggered_count] = 0
         super
       end
 
@@ -94,7 +134,11 @@ module Actions
       end
 
       def run(event = nil)
-        super unless event == Dynflow::Action::Skip
+        if event == Dynflow::Action::Skip
+          plan_event(Dynflow::Action::Skip, nil, step_id: input[:trigger_run_step_id])
+        else
+          super
+        end
       end
 
       def humanized_input
@@ -104,6 +148,16 @@ module Actions
       def humanized_name
         '%s:' % _(super)
       end
+
+      def proxy_batch_size
+        input[:proxy_batch_size]
+      end
+
+      private
+
+      def mail_notification_preference
+        UserMailNotification.where(mail_notification_id: RexMailNotification.first, user_id: User.current.id).first
+      end
     end
   end
 end

data/app/mailers/rex_job_mailer.rb

@@ -0,0 +1,15 @@
+class RexJobMailer < ApplicationMailer
+  add_template_helper(ApplicationHelper)
+
+  def job_finished(job, opts = {})
+    @job = job
+    @subject = opts[:subject] || _('REX job has finished - %s') % @job.to_s
+
+    if @job.user.nil?
+      Rails.logger.warn 'Job user no longer exist, skipping email notification'
+      return
+    end
+
+    mail(to: @job.user.mail, subject: @subject)
+  end
+end

data/app/models/concerns/foreman_remote_execution/host_extensions.rb

@@ -20,6 +20,14 @@ module ForemanRemoteExecution
         scoped_search :relation => :execution_status_object, :on => :status, :rename => :execution_status,
           :complete_value => { :ok => HostStatus::ExecutionStatus::OK, :error => HostStatus::ExecutionStatus::ERROR }
 
+        scope :execution_scope, lambda {
+          if User.current&.can?('execute_jobs_on_infrastructure_hosts')
+            self
+          else
+            search_for('not (infrastructure_facet.foreman = true or set? infrastructure_facet.smart_proxy_id)')
+          end
+        }
+
         def search_by_job_invocation(key, operator, value)
           if key == 'job_invocation.result'
             operator = operator == '=' ? 'IN' : 'NOT IN'

data/app/models/job_invocation.rb

@@ -65,6 +65,8 @@ class JobInvocation < ApplicationRecord
   scoped_search :on => 'pattern_template_name', :rename => 'pattern_template_name', :operators => ['= '],
     :complete_value => false, :only_explicit => true, :ext_method => :search_by_pattern_template
 
+  scoped_search :relation => :recurring_logic, :on => 'purpose', :rename => 'recurring_logic.purpose'
+
   scoped_search :relation => :recurring_logic, :on => 'id', :rename => 'recurring_logic.id'
 
   scoped_search :relation => :recurring_logic, :on => 'id', :rename => 'recurring',
@@ -73,6 +75,8 @@ class JobInvocation < ApplicationRecord
 
   default_scope -> { order('job_invocations.id DESC') }
 
+  scope :latest_jobs, -> { unscoped.joins(:task).order('foreman_tasks_tasks.start_at DESC').authorized(:view_job_invocations).limit(5) }
+
   validates_lengths_from_database :only => [:description]
 
   attr_accessor :start_before, :description_format

data/app/models/job_invocation_composer.rb

@@ -121,7 +121,10 @@ class JobInvocationComposer
         :targeting => targeting_params,
         :triggering => triggering_params,
         :description_format => api_params[:description_format],
+        :password => api_params[:password],
         :remote_execution_feature_id => remote_execution_feature_id,
+        :effective_user_password => api_params[:effective_user_password],
+        :key_passphrase => api_params[:key_passphrase],
         :concurrency_control => concurrency_control_params,
         :execution_timeout_interval => api_params[:execution_timeout_interval] || template.execution_timeout_interval,
         :template_invocations => template_invocations_params }.with_indifferent_access
@@ -138,17 +141,11 @@ class JobInvocationComposer
     end
 
     def triggering_params
-      raise ::Foreman::Exception, _('Cannot specify both recurrence and scheduling') if api_params[:recurrence].present? && api_params[:scheduling].present?
-
-      if api_params[:recurrence].present?
-        {
-          :mode => :recurring,
-          :cronline => api_params[:recurrence][:cron_line],
-          :end_time => format_datetime(api_params[:recurrence][:end_time]),
-          :input_type => :cronline,
-          :max_iteration => api_params[:recurrence][:max_iteration],
-        }
-      elsif api_params[:scheduling].present?
+      if api_params[:recurrence].present? && api_params[:scheduling].present?
+        recurring_mode_params.merge :start_at_raw => format_datetime(api_params[:scheduling][:start_at])
+      elsif api_params[:recurrence].present? && api_params[:scheduling].empty?
+        recurring_mode_params
+      elsif api_params[:recurrence].empty? && api_params[:scheduling].present?
         {
           :mode => :future,
           :start_at_raw => format_datetime(api_params[:scheduling][:start_at]),
@@ -160,6 +157,17 @@ class JobInvocationComposer
       end
     end
 
+    def recurring_mode_params
+      {
+        :mode => :recurring,
+        :cronline => api_params[:recurrence][:cron_line],
+        :end_time => format_datetime(api_params[:recurrence][:end_time]),
+        :input_type => :cronline,
+        :max_iteration => api_params[:recurrence][:max_iteration],
+        :purpose => api_params[:recurrence][:purpose],
+      }
+    end
+
     def concurrency_control_params
       {
         :level => api_params.fetch(:concurrency_control, {})[:concurrency_level],
@@ -513,14 +521,14 @@ class JobInvocationComposer
   end
 
   def available_bookmarks
-    Bookmark.authorized(:view_bookmarks).my_bookmarks.where(:controller => ['hosts', 'dashboard'])
+    Bookmark.my_bookmarks.where(:controller => ['hosts', 'dashboard'])
   end
 
   def targeted_hosts
     if displayed_search_query.blank?
       Host.where('1 = 0')
     else
-      Host.authorized(Targeting::RESOLVE_PERMISSION, Host).search_for(displayed_search_query)
+      Host.execution_scope.authorized(Targeting::RESOLVE_PERMISSION, Host).search_for(displayed_search_query)
     end
   end
 

data/app/models/job_template.rb

@@ -83,7 +83,7 @@ class JobTemplate < ::Template
     end
 
     def acceptable_template_input_types
-      [ :user, :fact, :variable, :puppet_parameter ]
+      [ :user, :fact, :variable ]
     end
 
     def default_render_scope_class

data/app/models/remote_execution_provider.rb

@@ -80,7 +80,14 @@ class RemoteExecutionProvider
 
     def find_ip(host, interfaces)
       if host_setting(host, :remote_execution_connect_by_ip)
-        interfaces.find { |i| i.ip.present? }.try(:ip)
+        ip4_address = interfaces.find { |i| i.ip.present? }.try(:ip)
+        ip6_address = interfaces.find { |i| i.ip6.present? }.try(:ip6)
+
+        if host_setting(host, :remote_execution_connect_by_ip_prefer_ipv6)
+          ip6_address || ip4_address
+        else
+          ip4_address || ip6_address
+        end
       end
     end
 
@@ -112,7 +119,11 @@ class RemoteExecutionProvider
     end
 
     def proxy_action_class
-      'ForemanRemoteExecutionCore::Actions::RunScript'
+      'Proxy::RemoteExecution::Ssh::Actions::RunScript'
+    end
+
+    def proxy_batch_size
+      Setting['foreman_tasks_proxy_batch_size']
     end
 
     # Return a specific proxy selector to use for running a given template
@@ -124,5 +135,9 @@ class RemoteExecutionProvider
         ::DefaultProxyProxySelector.new
       end
     end
+
+    def alternative_names(host)
+      { :fqdn => find_fqdn(effective_interfaces(host)) }
+    end
   end
 end

data/app/models/rex_mail_notification.rb

@@ -0,0 +1,13 @@
+class RexMailNotification < MailNotification
+  FAILED_JOBS = N_("Subscribe to my failed jobs")
+  SUCCEEDED_JOBS = N_("Subscribe to my succeeded jobs")
+  ALL_JOBS = N_("Subscribe to all my jobs")
+
+  def subscription_options
+    [
+      FAILED_JOBS,
+      SUCCEEDED_JOBS,
+      ALL_JOBS,
+    ]
+  end
+end

data/app/models/targeting.rb

@@ -44,7 +44,7 @@ class Targeting < ApplicationRecord
     self.validate!
     # avoid validation of hosts objects - they will be loaded for no reason.
     #   pluck(:id) returns duplicate results for HostCollections
-    host_ids = User.as(user.login) { Host.authorized(RESOLVE_PERMISSION, Host).search_for(search_query).order(:name, :id).pluck(:id).uniq }
+    host_ids = User.as(user.login) { Host.execution_scope.authorized(RESOLVE_PERMISSION, Host).search_for(search_query).order(:name, :id).pluck(:id).uniq }
     host_ids.shuffle!(random: Random.new) if randomized_ordering
     self.assign_host_ids(host_ids)
     self.save(:validate => false)
@@ -66,7 +66,7 @@ class Targeting < ApplicationRecord
   def self.build_query_from_hosts(ids)
     return '' if ids.empty?
 
-    hosts = Host.where(:id => ids).distinct.pluck(:name)
+    hosts = Host.execution_scope.where(:id => ids).distinct.pluck(:name)
     "name ^ (#{hosts.join(', ')})"
   end
 

data/app/services/ui_notifications/remote_execution_jobs/base_job_finish.rb

@@ -20,7 +20,8 @@ module UINotifications
       end
 
       def blueprint
-        @blueprint ||= NotificationBlueprint.unscoped.find_by(:name => 'rex_job_succeeded')
+        blueprint = @subject.status == HostStatus::ExecutionStatus::ERROR ? 'rex_job_failed' : 'rex_job_succeeded'
+        @blueprint ||= NotificationBlueprint.unscoped.find_by(:name => blueprint)
       end
 
       def message

data/app/views/dashboard/_latest-jobs.html.erb

@@ -0,0 +1,21 @@
+<h4 class="header">
+  <%= link_to _("Latest Jobs"), job_invocations_path(:order=>'start_at DESC') %>
+</h4>
+<% if JobInvocation.latest_jobs.any? %>
+  <table class="<%= table_css_classes('table-fixed') %>">
+    <tr>
+      <th class="col-md-5"><%= _("Name") %></th>
+      <th class="col-md-2"><%= _("State") %></th>
+      <th class="col-md-3"><%= _("Started") %></th>
+    </tr>
+    <% JobInvocation.latest_jobs.each do |invocation| %>
+      <tr>
+        <td class="ellipsis"><%= link_to_if_authorized invocation_description(invocation), hash_for_job_invocation_path(invocation).merge(:auth_object => invocation, :permission => :view_job_invocations, :authorizer => authorizer) %></td>
+        <td><%= link_to_invocation_task_if_authorized(invocation) %></td>
+        <td><%= time_in_words_span(invocation.start_at) %></td>
+      </tr>
+    <% end %>
+  </table>
+<% else %>
+  <p class="ca"><%= _("No jobs available") %></p>
+<% end %>

data/app/views/job_invocations/refresh.js.erb

@@ -1,3 +1,4 @@
 $('form#job_invocation_form').replaceWith("<%=j render :partial => 'form' %>");
 $('#job_invocation_form').find('a[rel="popover"]').popover();
 $('#job_invocation_form select:not(.without_select2)').select2({ allowClear: true });
+$('div.tooltip').remove();

data/app/views/rex_job_mailer/job_finished.html.erb

@@ -0,0 +1,24 @@
+<p>
+  <%= _("A job '%{job_name}' has %{status} at %{time}") % {
+      :job_name => @job.to_s, :status => @job.status_label, :time => date_time_absolute_value(@job.task.ended_at)
+  } %>
+</p>
+
+<div class="dashboard">
+  <table>
+    <tr>
+      <td width="18%" class="hosts-rows"><b><%= _("Job result") %></b></td>
+      <td width="82%" class="hosts-rows"><%= @job.status_label %></td>
+    </tr>
+    <tr>
+      <td width="18%" class="hosts-rows"><b><%= _("Total hosts") %></b></td>
+      <td width="82%" class="hosts-rows"><%= @job.total_hosts_count %></td>
+    </tr>
+    <tr>
+      <td width="18%" class="hosts-rows"><b><%= _("Failed hosts") %></b></td>
+      <td width="82%" class="hosts-rows"><%= @job.failed_hosts.count %></td>
+    </tr>
+  </table>
+</div>
+
+<%= link_to 'More details', job_invocation_url(@job) %>

data/app/views/rex_job_mailer/job_finished.text.erb

@@ -0,0 +1,9 @@
+<%= _("A job '%{job_name}' has %{status} at %{time}") % {
+    :job_name => @job.to_s, :status => @job.status_label, :time => date_time_absolute_value(@job.task.ended_at)
+} %>
+
+<%= _('Job result') %>: <%= @job.status_label %>
+<%= _('Total hosts') %>: <%= @job.total_hosts_count %>
+<%= _('Failed hosts') %>: <%= @job.failed_hosts.count %>
+
+<%= _('See more details at %s') % job_invocation_url(@job) %>

data/app/views/template_invocations/show.html.erb

@@ -18,7 +18,8 @@ end
 
 <div id="title_action">
   <div class="btn-toolbar pull-right">
-    <%= link_to(_('Back to Job'), job_invocation_path(@template_invocation.job_invocation), :class => 'btn btn-default') %>
+    <%= button_group(link_to(_('Back to Job'), job_invocation_path(@template_invocation.job_invocation), :class => 'btn btn-default'),
+                    (link_to(_('Rerun'), rerun_job_invocation_path(@template_invocation.job_invocation, :host_ids => [ @host.id ]), :class => 'btn btn-default') if authorized_for(:permission => :create_job_invocations))) %>
     <%= button_group(link_to_function(_('Toggle command'), '$("div.preview").toggle()', :class => 'btn btn-default'),
                      link_to_function(_('Toggle STDERR'), '$("div.line.stderr").toggle()', :class => 'btn btn-default'),
                      link_to_function(_('Toggle STDOUT'), '$("div.line.stdout").toggle()', :class => 'btn btn-default'),

data/config/routes.rb

@@ -45,6 +45,7 @@ Rails.application.routes.draw do
   get 'cockpit/redirect', to: 'cockpit#redirect'
   get 'ui_job_wizard/categories', to: 'ui_job_wizard#categories'
   get 'ui_job_wizard/template/:id', to: 'ui_job_wizard#template'
+  get 'ui_job_wizard/resources', to: 'ui_job_wizard#resources'
 
   match '/experimental/job_wizard', to: 'react#index', :via => [:get]