foreman-tasks 0.10.6 → 0.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8c05ea538a9cdd681bcd80073a82d7fdd8aa15f
-  data.tar.gz: cdfc54af9ee6edfe6165e744fb5b4b5eea22209a
+  metadata.gz: 0a0751a80db307b33d589a66517a407b71d125aa
+  data.tar.gz: 1df0beb219ea10aa2e3a498f0794f95ed241b9ee
 SHA512:
-  metadata.gz: 31dad9d8f904055a9a17b6a7d06e73d1b0e6ed9eaf3e6702845e3edaf6318ce80d2948b558759ca808b800965dcde2564491c6cae8e8325988cc2ed4acaf29f5
-  data.tar.gz: db3c8119caec600812d8353f30be0ed80d965ece6255f6191725804188e7459d9c5651fa758f16d6b1d3f62caf442872925f0da0e0bf05aff4b548f1757beeb8
+  metadata.gz: 50b67165fdaab0a560a0c5954423808a78eeeeedf6aeb7e16f236f178c59ec76251691f7fa57d37161184399b7b4795afabb2275db54f55ae4eeecc1f581c114
+  data.tar.gz: a061ad464f3954f0114c5d3c5c83a7a66a1295595672605b49f3918a179dfce73e4c210515a5653a180914efcedfcc31c95d02c013d3c9fbe5f3e52d75111856

data/app/controllers/foreman_tasks/tasks_controller.rb

@@ -1,6 +1,7 @@
 module ForemanTasks
   class TasksController < ::ApplicationController
     include Foreman::Controller::AutoCompleteSearch
+    include Foreman::Controller::CsvResponder
 
     before_action :restrict_dangerous_actions, :only => [:unlock, :force_unlock]
 
@@ -11,6 +12,14 @@ module ForemanTasks
     def index
       params[:order] ||= 'started_at DESC'
       @tasks = filter(resource_base)
+      respond_to do |format|
+        format.html do
+          render :index
+        end
+        format.csv do
+          csv_response(@tasks, [:to_label, :state, :result, 'started_at.in_time_zone', 'ended_at.in_time_zone', :username], ['Action', 'State', 'Result', 'Started At', 'Ended At', 'User'])
+        end
+      end
     end
 
     def sub_tasks

data/app/helpers/foreman_tasks/tasks_helper.rb

@@ -1,17 +1,7 @@
 module ForemanTasks
   module TasksHelper
-    def format_task_input(task, include_action = false)
-      return '-' unless task
-      parts = []
-      parts << task.get_humanized(:name) if include_action
-      parts << Array(task.get_humanized(:input)).map do |part|
-        if part.is_a? Array
-          part[1][:text]
-        else
-          part.to_s
-        end
-      end.join('; ')
-      parts.join(' ')
+    def format_task_input(task)
+      task ? task.to_label : '-'
     end
 
     def format_recurring_logic_limit(thing)

data/app/models/foreman_tasks/task.rb

@@ -202,6 +202,19 @@ module ForemanTasks
       result.symbolize_keys
     end
 
+    def to_label
+      parts = []
+      parts << get_humanized(:name)
+      parts << Array(get_humanized(:input)).map do |part|
+        if part.is_a? Array
+          part[1][:text]
+        else
+          part.to_s
+        end
+      end.join('; ')
+      parts.join(' ')
+    end
+
     protected
 
     def generate_id

data/app/views/foreman_tasks/recurring_logics/index.html.erb

@@ -18,7 +18,7 @@
     <tr>
       <td><%= link_to(recurring_logic.cron_line, foreman_tasks_recurring_logic_path(recurring_logic)) %></td>
       <td><%= link_to(recurring_logic.tasks.count, foreman_tasks_tasks_url(:search => "task_group.id = #{recurring_logic.task_group.id}")) %></td>
-      <td><%= format_task_input(recurring_logic.tasks.first, true) %></td>
+      <td><%= format_task_input(recurring_logic.tasks.first) %></td>
       <td><%= recurring_logic.tasks.order(:started_at).where('started_at IS NOT NULL').last.try(:started_at) || "-" %></td>
       <td><%= recurring_logic_next_occurrence recurring_logic %></td>
       <td><%= recurring_logic.iteration %></td>

data/app/views/foreman_tasks/task_groups/recurring_logic_task_groups/_recurring_logic_task_group.html.erb

@@ -10,7 +10,7 @@
   </tr>
   <tr>
     <th><%= N_("Action") %></th>
-    <td><%= format_task_input(recurring_logic.tasks.last, true) %></td>
+    <td><%= format_task_input(recurring_logic.tasks.last) %></td>
   </tr>
   <tr>
     <th><%= N_("Last occurrence") %></th>

data/app/views/foreman_tasks/tasks/_details.html.erb

@@ -89,8 +89,7 @@
   <div class="col-md-6">
     <div>
       <span class="param-name list-group-item-heading"><%= _("Name") %>:</span>
-      <% task_label = format_task_input(@task, true) %>
-      <span class="param-value" data-original-title="<%= task_label %>" rel="twipsy"> <%= truncate(task_label, :length => 50) %></span>
+      <span class="param-value" data-original-title="<%= @task.to_label %>" rel="twipsy"> <%= truncate(@task.to_label, :length => 50) %></span>
     </div>
     <div>
       <span class="param-name list-group-item-heading"><%= _("Result") %>:</span>

data/app/views/foreman_tasks/tasks/index.html.erb

@@ -1,5 +1,5 @@
 <% title _("Tasks") %>
-<% title_actions SETTINGS[:version].short <= '1.13' ? help_path : help_button %>
+<% title_actions csv_link, help_button %>
 <% stylesheet 'foreman_tasks/tasks' %>
 
 <script>
@@ -27,7 +27,7 @@ $(document).on('click', ".table-two-pane td.two-pane-link", function(e) {
   <% for task in @tasks %>
     <tr>
       <td class="task-id two-pane-link ellipsis">
-        <%= link_to_if_authorized(format_task_input(task, true),
+        <%= link_to_if_authorized(task.to_label,
         hash_for_foreman_tasks_task_path(:id => task)) %>
       </td>
       <td class="ellipsis"><%= task.state %></td>

data/bin/dynflow-executor

@@ -0,0 +1,72 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+
+class ArgvParser
+  attr_reader :options, :command
+
+  def initialize(argv, file)
+    @options = { foreman_root: Dir.pwd }
+
+    opts = OptionParser.new do |opts|
+      opts.banner = banner(file)
+
+      opts.on('-h', '--help', 'Show this message') do
+        puts opts
+        exit 1
+      end
+      opts.on('-f', '--foreman-root=PATH', "Path to Foreman Rails root path. By default '#{@options[:foreman_root]}'") do |path|
+        @options[:foreman_root] = path
+      end
+      opts.on('-c', '--executors-count=COUNT', 'Number of parallel executors to spawn. Overrides EXECUTORS_COUNT environment varaible.') do |count|
+        @options[:executors_count] = count.to_i
+      end
+      opts.on('-m', '--memory-limit=SIZE', 'Limits the amount of memory an executor can consume. Overrides EXECUTOR_MEMORY_LIMIT environment varaible. You can use kb, mb, gb') do |size|
+        @options[:memory_limit] = size
+      end
+      opts.on('--executor-memory-init-delay=SECONDS', 'Start memory polling after SECONDS. Overrides EXECUTOR_MEMORY_MONITOR_DELAY environment varaible.') do |seconds|
+        @options[:memory_init_delay] = seconds.to_i
+      end
+      opts.on('--executor-memory-polling-interval=SECONDS', 'Check for memory useage every SECONDS sec. Overrides EXECUTOR_MEMORY_MONITOR_INTERVAL environment varaible.') do |seconds|
+        @options[:memory_polling_interval] = seconds.to_i
+      end
+    end
+
+    args = opts.parse!(argv)
+    @command = args.first || 'run'
+  end
+
+  def banner(file)
+    banner = <<BANNER
+Run Dynflow executor for Foreman tasks.
+
+Usage: #{File.basename(file)} [options] ACTION"
+
+ACTION can be one of:
+
+* start   - start the executor on background. It creates these files
+          in tmp/pid directory:
+
+            * dynflow_executor_monitor.pid - pid of monitor ensuring
+                                             the executor keeps running
+            * dynflow_executor.pid         - pid of the executor itself
+            * dynflow_executor.output      - stdout of the executor
+* stop    - stops the running executor
+* restart - restarts the running executor
+* run     - run the executor in foreground
+
+BANNER
+    banner
+  end
+end
+
+# run the script if it's executed explicitly
+if $PROGRAM_NAME == __FILE__
+  parser = ArgvParser.new(ARGV, $PROGRAM_NAME)
+
+  Dir.chdir(parser.options[:foreman_root])
+  app_file = File.expand_path('./config/application', parser.options[:foreman_root])
+  require app_file
+
+  Dynflow::Rails::Daemon.new.run_background(parser.command, parser.options)
+end

data/bin/foreman-tasks

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+foreman_root = '/usr/share/foreman'
+Dir.chdir(foreman_root)
+require File.expand_path('./config/application', foreman_root)
+Dynflow::Rails::Daemon.new.run_background(ARGV.last, :foreman_root => foreman_root)

data/deploy/foreman-tasks.service

@@ -0,0 +1,16 @@
+[Unit]
+Description=Foreman jobs daemon
+Documentation=https://github.com/theforeman/foreman-tasks
+After=network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=forking
+User=foreman
+TimeoutSec=600
+WorkingDirectory=/usr/share/foreman
+ExecStart=/usr/bin/foreman-tasks start 
+ExecStop=/usr/bin/foreman-tasks stop
+EnvironmentFile=-/etc/sysconfig/foreman-tasks
+
+[Install]
+WantedBy=multi-user.target

data/deploy/foreman-tasks.sysconfig

@@ -0,0 +1,26 @@
+FOREMAN_USER=foreman
+BUNDLER_EXT_HOME=/usr/share/foreman
+RAILS_RELATIVE_URL_ROOT=$FOREMAN_PREFIX
+RAILS_ENV=production
+FOREMAN_LOGGING=warn
+FOREMAN_LOGGING_SQL=warn
+FOREMAN_TASK_PARAMS="-p foreman"
+FOREMAN_LOG_DIR=/var/log/foreman
+
+RUBY_GC_MALLOC_LIMIT=4000100
+RUBY_GC_MALLOC_LIMIT_MAX=16000100
+RUBY_GC_MALLOC_LIMIT_GROWTH_FACTOR=1.1
+RUBY_GC_OLDMALLOC_LIMIT=16000100
+RUBY_GC_OLDMALLOC_LIMIT_MAX=16000100
+
+#Set the number of executors you want to run
+#EXECUTORS_COUNT=1
+
+#Set memory limit for executor process, before it's restarted automatically
+#EXECUTOR_MEMORY_LIMIT=2gb
+
+#Set delay before first memory polling to let executor initialize (in sec)
+#EXECUTOR_MEMORY_MONITOR_DELAY=7200 #default: 2 hours
+
+#Set memory polling interval, process memory will be checked every N seconds.
+#EXECUTOR_MEMORY_MONITOR_INTERVAL=60

data/lib/foreman_tasks/tasks/export_tasks.rake

@@ -206,7 +206,6 @@ namespace :foreman_tasks do
 
       def self.copy_assets(tmp_dir)
         ['vendor/bootstrap/js/bootstrap.js',
-         'vendor/google-code-prettify/run_prettify.js',
          'vendor/jquery/jquery.js',
          'vendor/jquery/jquery.js',
          'javascripts/application.js',

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '0.10.6'.freeze
+  VERSION = '0.10.7'.freeze
 end

data/test/helpers/foreman_tasks/tasks_helper_test.rb

@@ -11,12 +11,11 @@ module ForemanTasks
       end
 
       it 'formats the task input properly' do
-        format_task_input(@task).must_equal("user 'Anonymous Admin'")
-        format_task_input(@task, true).must_equal("Create user 'Anonymous Admin'")
+        format_task_input(@task).must_equal("Create user 'Anonymous Admin'")
       end
 
       it 'displays the dash if task is nil' do
-        format_task_input(nil, true).must_equal('-')
+        format_task_input(nil).must_equal('-')
       end
     end
 
@@ -36,8 +35,7 @@ module ForemanTasks
 
       it 'formats the task input properly' do
         response = "product 'product-2'; organization 'test-0'"
-        format_task_input(@task).must_equal(response)
-        format_task_input(@task, true).must_equal("Create #{response}")
+        format_task_input(@task).must_equal("Create #{response}")
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.10.6
+  version: 0.10.7
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-01 00:00:00.000000000 Z
+date: 2017-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core
@@ -182,6 +182,8 @@ files:
 - app/views/foreman_tasks/tasks/dashboard/_tasks_status.html.erb
 - app/views/foreman_tasks/tasks/index.html.erb
 - app/views/foreman_tasks/tasks/show.html.erb
+- bin/dynflow-executor
+- bin/foreman-tasks
 - config/foreman-tasks.yaml.example
 - config/routes.rb
 - db/migrate/20131205204140_create_foreman_tasks.rb
@@ -200,6 +202,8 @@ files:
 - db/seeds.d/20-foreman_tasks_permissions.rb
 - db/seeds.d/60-dynflow_proxy_feature.rb
 - db/seeds.d/61-foreman_tasks_bookmarks.rb
+- deploy/foreman-tasks.service
+- deploy/foreman-tasks.sysconfig
 - extra/dynflow-debug.sh
 - extra/dynflow-executor.example
 - foreman-tasks.gemspec