foreman_remote_execution 12.0.7 → 13.0.0

data/app/assets/javascripts/foreman_remote_execution/locale/ko/foreman_remote_execution.js

@@ -329,6 +329,9 @@
       "Any Location": [
         "모든 위치 "
       ],
+      "Awaiting start": [
+        ""
+      ],
       "error": [
         ""
       ],
@@ -509,9 +512,6 @@
       "Last execution succeeded": [
         "성공한 마지막 실행"
       ],
-      "No execution finished yet": [
-        "아직 완료된 실행이 없습니다."
-      ],
       "Last execution cancelled": [
         ""
       ],
@@ -1227,6 +1227,18 @@
       "Current location %s is different from job's location %s. This job may run on different hosts than before.": [
         ""
       ],
+      "You are not authorized to perform this action.": [
+        ""
+      ],
+      "Please request the required permissions listed below from a Foreman administrator:": [
+        ""
+      ],
+      "Permission Denied": [
+        ""
+      ],
+      "Proceed Anyway": [
+        ""
+      ],
       "'Starts before' date must in the future": [
         ""
       ],
@@ -1257,8 +1269,14 @@
       "All fields are required.": [
         ""
       ],
-      "Error": [
-        "오류 "
+      "Not available": [
+        ""
+      ],
+      "Access denied": [
+        ""
+      ],
+      "Missing the required permissions: ${missingPermissions.join( ', ' )}": [
+        ""
       ],
       "Errors:": [
         ""
@@ -1571,15 +1589,6 @@
       ],
       "A plugin bringing remote execution to the Foreman, completing the config management functionality with remote management functionality.": [
         "Foreman으로 원격 실행을 가져오는 플러그인입니다. 원격 관리 기능으로 구성 관리 기능을 완료합니다."
-      ],
-      "Action with sub plans": [
-        "하위 계획이 있는 작업"
-      ],
-      "Import Puppet classes": [
-        "Puppet 클래스 가져오기"
-      ],
-      "Import facts": [
-        "팩트 불러오기"
       ]
     }
   }

data/app/assets/javascripts/foreman_remote_execution/locale/pt_BR/foreman_remote_execution.js

@@ -329,6 +329,9 @@
       "Any Location": [
         "Qualquer localização"
       ],
+      "Awaiting start": [
+        ""
+      ],
       "error": [
         "erro"
       ],
@@ -511,9 +514,6 @@
       "Last execution succeeded": [
         "Última execução bem-sucedida "
       ],
-      "No execution finished yet": [
-        "Nenhuma execução concluída ainda "
-      ],
       "Last execution cancelled": [
         "Última execução cancelada"
       ],
@@ -1229,6 +1229,18 @@
       "Current location %s is different from job's location %s. This job may run on different hosts than before.": [
         ""
       ],
+      "You are not authorized to perform this action.": [
+        ""
+      ],
+      "Please request the required permissions listed below from a Foreman administrator:": [
+        ""
+      ],
+      "Permission Denied": [
+        ""
+      ],
+      "Proceed Anyway": [
+        ""
+      ],
       "'Starts before' date must in the future": [
         ""
       ],
@@ -1259,8 +1271,14 @@
       "All fields are required.": [
         "Todos os campos são obrigatórios."
       ],
-      "Error": [
-        "Erro"
+      "Not available": [
+        ""
+      ],
+      "Access denied": [
+        ""
+      ],
+      "Missing the required permissions: ${missingPermissions.join( ', ' )}": [
+        ""
       ],
       "Errors:": [
         "Erros:"
@@ -1573,15 +1591,6 @@
       ],
       "A plugin bringing remote execution to the Foreman, completing the config management functionality with remote management functionality.": [
         "Um plugin trazendo execução remota ao Foreman, completando a funcionalidade de gerenciamento de configuração com a funcionalidade de gerenciamento remoto. "
-      ],
-      "Action with sub plans": [
-        "Ação com subplanos "
-      ],
-      "Import Puppet classes": [
-        "Importar classes de Puppet"
-      ],
-      "Import facts": [
-        "Importar fatos"
       ]
     }
   }

data/app/assets/javascripts/foreman_remote_execution/locale/ru/foreman_remote_execution.js

@@ -329,6 +329,9 @@
       "Any Location": [
         "Любое местонахождение"
       ],
+      "Awaiting start": [
+        ""
+      ],
       "error": [
         ""
       ],
@@ -512,9 +515,6 @@
       "Last execution succeeded": [
         "Выполнено успешно"
       ],
-      "No execution finished yet": [
-        "Ни один цикл выполнения не завершился"
-      ],
       "Last execution cancelled": [
         ""
       ],
@@ -1230,6 +1230,18 @@
       "Current location %s is different from job's location %s. This job may run on different hosts than before.": [
         ""
       ],
+      "You are not authorized to perform this action.": [
+        ""
+      ],
+      "Please request the required permissions listed below from a Foreman administrator:": [
+        ""
+      ],
+      "Permission Denied": [
+        ""
+      ],
+      "Proceed Anyway": [
+        ""
+      ],
       "'Starts before' date must in the future": [
         ""
       ],
@@ -1260,8 +1272,14 @@
       "All fields are required.": [
         ""
       ],
-      "Error": [
-        "Ошибка"
+      "Not available": [
+        ""
+      ],
+      "Access denied": [
+        ""
+      ],
+      "Missing the required permissions: ${missingPermissions.join( ', ' )}": [
+        ""
       ],
       "Errors:": [
         ""
@@ -1574,15 +1592,6 @@
       ],
       "A plugin bringing remote execution to the Foreman, completing the config management functionality with remote management functionality.": [
         "Дополнительный модуль Foreman для удаленного выполнения заданий, объединяющий функции управления конфигурацией и удаленного контроля."
-      ],
-      "Action with sub plans": [
-        "Действия с подпланами"
-      ],
-      "Import Puppet classes": [
-        "Импорт классов Puppet"
-      ],
-      "Import facts": [
-        "Импорт фактов"
       ]
     }
   }

data/app/assets/javascripts/foreman_remote_execution/locale/zh_CN/foreman_remote_execution.js

@@ -329,6 +329,9 @@
       "Any Location": [
         "任意位置"
       ],
+      "Awaiting start": [
+        ""
+      ],
       "error": [
         "错误"
       ],
@@ -509,9 +512,6 @@
       "Last execution succeeded": [
         "最后成功的执行"
       ],
-      "No execution finished yet": [
-        "尚未执行完毕"
-      ],
       "Last execution cancelled": [
         "最后的执行已取消"
       ],
@@ -1226,6 +1226,18 @@
       "Current location %s is different from job's location %s. This job may run on different hosts than before.": [
         ""
       ],
+      "You are not authorized to perform this action.": [
+        ""
+      ],
+      "Please request the required permissions listed below from a Foreman administrator:": [
+        ""
+      ],
+      "Permission Denied": [
+        ""
+      ],
+      "Proceed Anyway": [
+        ""
+      ],
       "'Starts before' date must in the future": [
         ""
       ],
@@ -1256,8 +1268,14 @@
       "All fields are required.": [
         "各个项都需要。"
       ],
-      "Error": [
-        "错误"
+      "Not available": [
+        ""
+      ],
+      "Access denied": [
+        ""
+      ],
+      "Missing the required permissions: ${missingPermissions.join( ', ' )}": [
+        ""
       ],
       "Errors:": [
         "错误："
@@ -1570,15 +1588,6 @@
       ],
       "A plugin bringing remote execution to the Foreman, completing the config management functionality with remote management functionality.": [
         "一个将远程执行带到 Foreman 的插件，通过远程管理功能来完成配置管理功能。"
-      ],
-      "Action with sub plans": [
-        "有子计划的操作"
-      ],
-      "Import Puppet classes": [
-        "导入 Puppet 类"
-      ],
-      "Import facts": [
-        "导入事实"
       ]
     }
   }

data/app/assets/javascripts/foreman_remote_execution/locale/zh_TW/foreman_remote_execution.js

@@ -329,6 +329,9 @@
       "Any Location": [
         "任何位置"
       ],
+      "Awaiting start": [
+        ""
+      ],
       "error": [
         ""
       ],
@@ -510,9 +513,6 @@
       "Last execution succeeded": [
         "最後的執行成功"
       ],
-      "No execution finished yet": [
-        "尚無執行完成"
-      ],
       "Last execution cancelled": [
         ""
       ],
@@ -1228,6 +1228,18 @@
       "Current location %s is different from job's location %s. This job may run on different hosts than before.": [
         ""
       ],
+      "You are not authorized to perform this action.": [
+        ""
+      ],
+      "Please request the required permissions listed below from a Foreman administrator:": [
+        ""
+      ],
+      "Permission Denied": [
+        ""
+      ],
+      "Proceed Anyway": [
+        ""
+      ],
       "'Starts before' date must in the future": [
         ""
       ],
@@ -1258,8 +1270,14 @@
       "All fields are required.": [
         ""
       ],
-      "Error": [
-        "錯誤"
+      "Not available": [
+        ""
+      ],
+      "Access denied": [
+        ""
+      ],
+      "Missing the required permissions: ${missingPermissions.join( ', ' )}": [
+        ""
       ],
       "Errors:": [
         ""
@@ -1572,15 +1590,6 @@
       ],
       "A plugin bringing remote execution to the Foreman, completing the config management functionality with remote management functionality.": [
         "將遠端執行帶入 Foreman 的外掛程式，搭配遠端管理功能來完成配置管理。"
-      ],
-      "Action with sub plans": [
-        "有子計畫的動作"
-      ],
-      "Import Puppet classes": [
-        "匯入 Puppet 類別"
-      ],
-      "Import facts": [
-        "匯入詳情"
       ]
     }
   }

data/app/controllers/ui_job_wizard_controller.rb

@@ -1,4 +1,4 @@
-class UiJobWizardController < ApplicationController
+class UiJobWizardController < Api::V2::BaseController
   include FiltersHelper
   def categories
     job_categories = resource_scope(permission: action_permission)

data/app/helpers/job_invocations_helper.rb

@@ -33,7 +33,7 @@ module JobInvocationsHelper
   end
 
   def collapsed_preview(target)
-    title = target.try(:name) || 'N/A'
+    title = target || 'N/A'
     content_tag(:h5,
       :class => "expander collapsed out",
       :data => { :toggle => 'collapse',

data/app/helpers/remote_execution_helper.rb

@@ -34,7 +34,7 @@ module RemoteExecutionHelper
         action: { href: current_host_details_path(host), 'data-method': 'get', id: "#{host.name}-actions-detail" } }
     end
     if authorized_for(controller: :job_invocations, action: :create) && (!host.infrastructure_host? || User.current.can?(:execute_jobs_on_infrastructure_hosts))
-      links << { title: (_('Rerun on %s') % host.name),
+      links << { title: (_('Rerun on %s') % host),
         action: { href: rerun_job_invocation_path(job_invocation, host_ids: [ host.id ]),
                   'data-method': 'get', id: "#{host.name}-actions-rerun" } }
     end
@@ -274,7 +274,7 @@ module RemoteExecutionHelper
       task = template_invocation.try(:run_host_job_task)
       link_authorized = !task.nil? && authorized_for(hash_for_template_invocation_path(:id => template_invocation).merge(:auth_object => host, :permission => :view_hosts, :authorizer => job_hosts_authorizer))
 
-      { name: host.name,
+      { name: host.to_label,
         link: link_authorized ? template_invocation_path(:id => template_invocation) : '',
         status: template_invocation_status(task, job_invocation.task),
         actions: template_invocation_actions(task, host, job_invocation, template_invocation) }

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

@@ -43,7 +43,7 @@ module Actions
           }
         end
         events.each_slice(1000) do |batch|
-          TemplateInvocationEvent.upsert_all(batch, unique_by: [:template_invocation_id, :sequence_id]) # rubocop:disable Rails/SkipsModelValidations
+          TemplateInvocationEvent.insert_all(batch, unique_by: [:template_invocation_id, :sequence_id]) # rubocop:disable Rails/SkipsModelValidations
         end
       end
     end

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

@@ -28,6 +28,7 @@ module Actions
         raise _('Could not use any template used in the job invocation') if template_invocation.blank?
         features = template_invocation.template.remote_execution_features.pluck(:label).uniq
         action_subject(host,
+          :host_display_name => host.to_label,
           :job_category => job_invocation.job_category,
           :description => job_invocation.description,
           :job_invocation_id => job_invocation.id,
@@ -97,12 +98,15 @@ module Actions
 
       def live_output
         continuous_output.sort!
-        continuous_output.raw_outputs
       end
 
       def humanized_input
-        N_('%{description} on %{host}') % { :host => input[:host].try(:[], :name),
-          :description => input[:description].try(:capitalize) || input[:job_category] }
+        return unless input.present?
+
+        N_('%{description} on %{host}') % {
+          host: input[:host_display_name],
+          description: input[:description].try(:capitalize) || input[:job_category],
+        }
       end
 
       def humanized_name
@@ -195,7 +199,9 @@ module Actions
         host = Host.find(input[:host][:id])
         status = host.execution_status_object || host.build_execution_status_object
         status.status = exit_status.to_s == "0" ? HostStatus::ExecutionStatus::OK : HostStatus::ExecutionStatus::ERROR
+        status.refresh unless status.new_record?
         status.save!
+        host.refresh_global_status!
       end
 
       def delegated_output

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

@@ -75,7 +75,6 @@ module Actions
       end
 
       def on_planning_finished
-        trigger_remote_batch
         plan_event(Actions::TriggerProxyBatch::TriggerLastBatch, nil, step_id: input[:trigger_run_step_id])
         super
       end

data/app/models/host_status/execution_status.rb

@@ -13,7 +13,7 @@ class HostStatus::ExecutionStatus < HostStatus::Status
   STATUS_NAMES = { OK => 'succeeded', ERROR => 'failed', QUEUED => 'queued', RUNNING => 'running', CANCELLED => 'cancelled' }.freeze
 
   def relevant?(*args)
-    execution_tasks.present?
+    host.get_status(HostStatus::ExecutionStatus).present?
   end
 
   def to_status(options = {})
@@ -39,7 +39,7 @@ class HostStatus::ExecutionStatus < HostStatus::Status
   def to_label(options = {})
     case to_status(options)
       when OK
-        execution_tasks.present? ? N_('Last execution succeeded') : N_('No execution finished yet')
+        N_('Last execution succeeded')
       when CANCELLED
         N_('Last execution cancelled')
       when ERROR

data/app/views/job_invocations/_preview_hosts_list.html.erb

@@ -7,7 +7,7 @@
 <% if @hosts.any? -%>
   <ul>
     <% @hosts.each do |host| -%>
-        <li><%= link_to h(host.name), current_host_details_path(host), :target => '_blank' %></li>
+        <li><%= link_to h(host), current_host_details_path(host), :target => '_blank' %></li>
     <% end -%>
 
     <% if @additional > 0 -%>

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

@@ -1,9 +1,9 @@
 <% title @job_invocation.description %>
-<% stylesheet 'foreman_remote_execution/foreman_remote_execution' %>
-<% javascript 'foreman_remote_execution/template_invocation' %>
-<% javascript *webpack_asset_paths('foreman_remote_execution', :extension => 'js') %>
+<%= webpacked_plugins_js_for :foreman_remote_execution %>
+<% content_for(:javascripts) do -%>
+  <% javascript 'foreman_remote_execution/template_invocation' %><% end %>
 <% content_for(:stylesheets) do %>
-  <%= webpacked_plugins_css_for :foreman_remote_execution %>
+  <% stylesheet 'foreman_remote_execution/foreman_remote_execution' %>
 <% end %>
 
 <%= breadcrumbs name_field: 'description' %>
@@ -47,6 +47,13 @@
 
 <script id="job_invocation_refresh" data-refresh-url="<%= job_invocation_path(@job_invocation) %>">
   <% if @auto_refresh %>
-    delayed_refresh($('script#job_invocation_refresh').data('refresh-url'), {});
+    if(window.allJsLoaded){
+      delayed_refresh($('script#job_invocation_refresh').data('refresh-url'), {})
+    }
+    else {
+      $(document).on('loadJS', function() {
+        delayed_refresh($('script#job_invocation_refresh').data('refresh-url'), {})
+      });
+    }
   <% end %>
 </script>

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

@@ -1,5 +1,12 @@
 $('div#title_action div.btn-group').html('<%= button_group(job_invocation_task_buttons(@job_invocation.task)).html_safe %>');
 
 <% if @auto_refresh %>
-  delayed_refresh($('script#job_invocation_refresh').data('refresh-url'), job_invocation_refresh_data());
+  if(window.allJsLoaded){
+    delayed_refresh($('script#job_invocation_refresh').data('refresh-url'), job_invocation_refresh_data())
+  }
+  else {
+    $(document).on('loadJS', function() {
+      delayed_refresh($('script#job_invocation_refresh').data('refresh-url'), job_invocation_refresh_data())
+    });
+  }
 <% end %>

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

@@ -7,7 +7,7 @@
         <%= _("Foreman can run arbitrary commands on remote hosts using different providers, such as SSH or Ansible. Communication goes through the Smart Proxy so Foreman does not have to have direct access to the target hosts and can scale to control many hosts.") %></br>
     </p>
     <p><%= link_to _('Learn more about this in the documentation.'),
-           documentation_url('1.ForemanRemoteExecution1.3Manual', :root_url => 'https://www.theforeman.org/plugins/foreman_remote_execution/1.3/index.html#'), :rel => 'external' %></p>
+           external_link_path(type: 'docs', section: 'Managing_Hosts', chapter: 'Configuring_and_Setting_Up_Remote_Jobs_managing-hosts'), :rel => 'external' %></p>
     <div class="blank-slate-pf-main-action">
         <%= authorized_for(controller: :job_invocations, action: :create) ? link_to(_("Run Job"), { :action => :create }, { :class => "btn btn-primary btn-lg" }) : nil %>
     </div>

data/app/views/template_invocations/_refresh.js.erb

@@ -1,7 +1,13 @@
 <% if @auto_refresh %>
-$(function() {
-  delayed_refresh($("div.terminal").data('refresh-url'),
-          {"since": "<%= @line_sets.last.try(:[], 'timestamp') || @since %>", "line_counter": $("div.terminal div.line").size()});
-});
+   if(window.allJsLoaded){
+    delayed_refresh($("div.terminal").data('refresh-url'),
+          {"since": "<%= @line_sets.last.try(:[], 'timestamp') || @since %>", "line_counter": $("div.terminal div.line").size()})
+  }
+  else {
+    $(document).on('loadJS', function() {
+      delayed_refresh($("div.terminal").data('refresh-url'),
+          {"since": "<%= @line_sets.last.try(:[], 'timestamp') || @since %>", "line_counter": $("div.terminal div.line").size()})
+    });
+  }
 <% end %>
 

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

@@ -3,7 +3,7 @@
               :url => job_invocation_path(@template_invocation.job_invocation_id) }]
 
 if @host
-  items << { :caption => _('Template Invocation for %s') % @host.name }
+  items << { :caption => _('Template Invocation for %s') % @host }
   breadcrumbs(:resource_url => template_invocations_api_job_invocation_path(@template_invocation.job_invocation_id),
                :name_field => 'host_name',
                :switcher_item_url => template_invocation_path(':id'),
@@ -30,7 +30,7 @@ end
 <% if @host %>
   <% proxy_id = @template_invocation_task.input[:proxy_id] %>
   <h3>
-    <%= _('Target: ') %><%= link_to(@host.name, current_host_details_path(@host)) %>
+    <%= _('Target: ') %><%= link_to(@host, current_host_details_path(@host)) %>
     <% if proxy_id && proxy = SmartProxy.find_by(id: proxy_id) %>
       <%= _('using Smart Proxy') %> <%= link_to(proxy.name, smart_proxy_path(proxy)) %>
     <% end %>

data/app/views/templates/script/convert2rhel_analyze.erb

@@ -1,6 +1,15 @@
 <%#
 name: Convert2RHEL analyze
 snippet: false
+template_inputs:
+  - name: Data telemetry
+    required: false
+    input_type: user
+    options: "yes\r\nno"
+    advanced: false
+    value_type: plain
+    default: 'yes'
+    hidden_value: false
 model: JobTemplate
 job_category: Convert 2 RHEL
 provider_type: script
@@ -16,7 +25,9 @@ if ! rpm -q convert2rhel &> /dev/null; then
   yum install -y convert2rhel
 fi
 
-export CONVERT2RHEL_THROUGH_FOREMAN=1
+<% if input('Data telemetry') != "yes" -%>
+export CONVERT2RHEL_DISABLE_TELEMETRY=1
+<% end -%>
 
 /usr/bin/convert2rhel analyze -y
 

data/lib/foreman_remote_execution/engine.rb

@@ -47,7 +47,7 @@ module ForemanRemoteExecution
 
     initializer 'foreman_remote_execution.register_plugin', before: :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_remote_execution do
-        requires_foreman '>= 3.9'
+        requires_foreman '>= 3.10'
         register_global_js_file 'global'
         register_gettext
 

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '12.0.7'.freeze
+  VERSION = '13.0.0'.freeze
 end