morpheus-cli 3.5.2 → 3.5.3

data/lib/morpheus/cli/hosts.rb

@@ -3,14 +3,17 @@ require 'io/console'
 require 'rest_client'
 require 'optparse'
 require 'morpheus/cli/cli_command'
+require 'morpheus/cli/mixins/accounts_helper'
 require 'morpheus/cli/mixins/provisioning_helper'
 require 'morpheus/cli/option_types'
 require 'json'
 
 class Morpheus::Cli::Hosts
   include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::AccountsHelper
   include Morpheus::Cli::ProvisioningHelper
-  register_subcommands :list, :count, :get, :stats, :add, :remove, :logs, :start, :stop, :resize, :run_workflow, {:'make-managed' => :install_agent}, :upgrade_agent, :server_types
+  register_subcommands :list, :count, :get, :stats, :add, :update, :remove, :logs, :start, :stop, :resize, :run_workflow, {:'make-managed' => :install_agent}, :upgrade_agent, :server_types
+  register_subcommands :exec => :execution_request
   alias_subcommand :details, :get
   set_default_subcommand :list
 
@@ -26,7 +29,9 @@ class Morpheus::Cli::Hosts
     @task_sets_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).task_sets
     @servers_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).servers
     @logs_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).logs
+    @accounts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).accounts
     @active_group_id = Morpheus::Cli::Groups.active_group
+    @execution_request_interface = @api_client.execution_request
   end
 
   def handle(args)
@@ -38,6 +43,9 @@ class Morpheus::Cli::Hosts
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
+      opts.on( '-a', '--account ACCOUNT', "Account Name or ID" ) do |val|
+        options[:account] = val
+      end
       opts.on( '-g', '--group GROUP', "Group Name or ID" ) do |val|
         options[:group] = val
       end
@@ -87,6 +95,15 @@ class Morpheus::Cli::Hosts
     optparse.parse!(args)
     connect(options)
     begin
+      account = nil
+      if options[:account]
+        account = find_account_by_name_or_id(options[:account])
+        if account.nil?
+          return 1
+        else
+          params['accountId'] = account['id']
+        end
+      end
       group = options[:group] ? find_group_by_name_or_id_for_provisioning(options[:group]) : nil
       if group
         params['siteId'] = group['id']
@@ -127,6 +144,7 @@ class Morpheus::Cli::Hosts
         return 0
       else
         servers = json_response['servers']
+        multi_tenant = json_response['multiTenant'] == true
         title = "Morpheus Hosts"
         subtitles = []
         if group
@@ -164,6 +182,7 @@ class Morpheus::Cli::Hosts
             storage_usage_str = !stats ? "" : generate_usage_bar(stats['usedStorage'], stats['maxStorage'], {max_bars: 10})
             row = {
               id: server['id'],
+              tenant: server['account'] ? server['account']['name'] : server['accountId'],
               name: server['name'],
               platform: server['serverOs'] ? server['serverOs']['name'].upcase : 'N/A',
               cloud: server['zone'] ? server['zone']['name'] : '',
@@ -178,6 +197,9 @@ class Morpheus::Cli::Hosts
             row
           }
           columns = [:id, :name, :type, :cloud, :nodes, :status, :power]
+          if multi_tenant
+            columns.insert(4, :tenant)
+          end
           term_width = current_terminal_width()
           if term_width > 170
             columns += [:cpu, :memory, :storage]
@@ -232,9 +254,9 @@ class Morpheus::Cli::Hosts
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
-      opts.on('--refresh-until [status]', String, "Refresh until status is reached. Default status is provisioned.") do |val|
+      opts.on('--refresh [status]', String, "Refresh until status is reached. Default status is provisioned.") do |val|
         if val.to_s.empty?
-          options[:refresh_until_status] = "provisioned"
+          options[:refresh_until_status] = "provisioned,failed"
         else
           options[:refresh_until_status] = val.to_s.downcase
         end
@@ -312,10 +334,13 @@ class Morpheus::Cli::Hosts
         if options[:refresh_interval].nil? || options[:refresh_interval].to_f < 0
           options[:refresh_interval] = 5
         end
-        while server['status'].to_s.downcase != options[:refresh_until_status].to_s.downcase
+        statuses = options[:refresh_until_status].to_s.downcase.split(",").collect {|s| s.strip }.select {|s| !s.to_s.empty? }
+        if !statuses.include?(server['status'])
           print cyan
-          print "Refreshing until status #{options[:refresh_until_status]} ..."
-          sleep(options[:refresh_interval])
+          print "Status is #{server['status'] || 'unknown'}. Refreshing in #{options[:refresh_interval]} seconds"
+          #sleep(options[:refresh_interval])
+          sleep_with_dots(options[:refresh_interval])
+          print "\n"
           _get(arg, options)
         end
       end
@@ -438,7 +463,7 @@ class Morpheus::Cli::Hosts
             when 'FATAL'
               log_level = "#{red}#{bold}FATAL#{reset}"
             end
-            output << "[#{log_entry['ts']}] #{log_level} - #{log_entry['message']}\n"
+            output << "[#{log_entry['ts']}] #{log_level} - #{log_entry['message'].to_s.strip}\n"
           end
         end
       end
@@ -655,6 +680,80 @@ class Morpheus::Cli::Hosts
     end
   end
 
+  def update(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name]")
+      opts.on('--name VALUE', String, "Name") do |val|
+        params['name'] = val == "null" ? nil : val
+      end
+      opts.on('--description VALUE', String, "Description") do |val|
+        params['description'] = val == "null" ? nil : val
+      end
+      opts.on('--ssh-username VALUE', String, "SSH Username") do |val|
+        params['sshUsername'] = val == "null" ? nil : val
+      end
+      opts.on('--ssh-password VALUE', String, "SSH Password") do |val|
+        params['sshPassword'] = val == "null" ? nil : val
+      end
+      opts.on('--power-schedule-type ID', String, "Power Schedule Type ID") do |val|
+        params['powerScheduleType'] = val == "null" ? nil : val
+      end
+      # opts.on('--created-by ID', String, "Created By User ID") do |val|
+      #   params['createdById'] = val
+      # end
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
+    end
+    optparse.parse!(args)
+    if args.count != 1
+      puts optparse
+      return 1
+    end
+    connect(options)
+
+    begin
+      server = find_host_by_name_or_id(args[0])
+      return 1 if server.nil?
+      new_group = nil
+      params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+        # support args and option parameters on top of payload
+        if !params.empty?
+          payload['server'] ||= {}
+          payload['server'].deep_merge!(params)
+        end
+      else
+        if params.empty?
+          print_red_alert "Specify atleast one option to update"
+          puts optparse
+          return 1
+        end
+        payload = {}
+        payload['server'] = params
+      end
+
+      if options[:dry_run]
+        print_dry_run @servers_interface.dry.update(server["id"], payload)
+        return
+      end
+      json_response = @servers_interface.update(server["id"], payload)
+
+      if options[:json]
+        puts as_json(json_response, options)
+      else
+        print_green_success "Updated host #{server['name']}"
+        get([server['id']])
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
   def remove(args)
     options = {}
     query_params = {}
@@ -1033,6 +1132,88 @@ class Morpheus::Cli::Hosts
     end
   end
 
+  def execution_request(args)
+    options = {}
+    params = {}
+    script_content = nil
+    do_refresh = true
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[id] [options]")
+      opts.on('--script SCRIPT', "Script to be executed" ) do |val|
+        script_content = val
+      end
+      opts.on('--file FILE', "File containing the script. This can be used instead of --script" ) do |filename|
+        full_filename = File.expand_path(filename)
+        if File.exists?(full_filename)
+          script_content = File.read(full_filename)
+        else
+          print_red_alert "File not found: #{full_filename}"
+          exit 1
+        end
+      end
+      opts.on(nil, '--no-refresh', "Do not refresh until finished" ) do
+        do_refresh = false
+      end
+      #build_option_type_options(opts, options, add_user_source_option_types())
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
+      opts.footer = "Execute an arbitrary command or script on a host." + "\n" +
+                    "[id] is required. This is the id a host." + "\n" +
+                    "[script] is required. This is the script that is to be executed."
+    end
+    optparse.parse!(args)
+    connect(options)
+    if args.count != 1
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error  "wrong number of arguments, expected 1 and got (#{args.count}) #{args.inspect}\n#{optparse}"
+      return 1
+    end
+    
+    
+    begin
+      host = find_host_by_name_or_id(args[0])
+      return 1 if host.nil?
+      params['serverId'] = host['id']
+      # construct payload
+      payload = {}
+      if options[:payload]
+        payload = options[:payload]
+      else
+        payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+        # prompt for Script
+        if script_content.nil?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'script', 'type' => 'code-editor', 'fieldLabel' => 'Script', 'required' => true, 'description' => 'The script content'}], options[:options])
+          script_content = v_prompt['script']
+        end
+        payload['script'] = script_content
+      end
+      # dry run?
+      if options[:dry_run]
+        print_dry_run @execution_request_interface.dry.create(params, payload)
+        return 0
+      end
+      # do it
+      json_response = @execution_request_interface.create(params, payload)
+      # print and return result
+      if options[:quiet]
+        return 0
+      elsif options[:json]
+        puts as_json(json_response, options)
+        return 0
+      end
+      execution_request = json_response['executionRequest']
+      print_green_success "Executing request #{execution_request['uniqueId']}"
+      if do_refresh
+        Morpheus::Cli::ExecutionRequestCommand.new.handle(["get", execution_request['uniqueId'], "--refresh"])
+      else
+        Morpheus::Cli::ExecutionRequestCommand.new.handle(["get", execution_request['uniqueId']])
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
   private
 
   def find_host_by_id(id)

data/lib/morpheus/cli/instances.rb

@@ -5,13 +5,16 @@ require 'filesize'
 require 'table_print'
 require 'morpheus/cli/cli_command'
 require 'morpheus/cli/mixins/provisioning_helper'
+require 'morpheus/cli/mixins/processes_helper'
 require 'morpheus/cli/option_types'
 
 class Morpheus::Cli::Instances
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::ProvisioningHelper
+  include Morpheus::Cli::ProcessesHelper
 
-  register_subcommands :list, :count, :get, :add, :update, :update_notes, :remove, :logs, :stats, :stop, :start, :restart, :actions, :action, :suspend, :eject, :backup, :backups, :stop_service, :start_service, :restart_service, :resize, :clone, :envs, :setenv, :delenv, :security_groups, :apply_security_groups, :firewall_enable, :firewall_disable, :run_workflow, :import_snapshot, :console, :status_check, {:containers => :list_containers}, :scaling, {:'scaling-update' => :scaling_update}
+  register_subcommands :list, :count, :get, :add, :update, :update_notes, :remove, :logs, :history, {:'history-details' => :history_details}, {:'history-event' => :history_event_details}, :stats, :stop, :start, :restart, :actions, :action, :suspend, :eject, :backup, :backups, :stop_service, :start_service, :restart_service, :resize, :clone, :envs, :setenv, :delenv, :security_groups, :apply_security_groups, :firewall_enable, :firewall_disable, :run_workflow, :import_snapshot, :console, :status_check, {:containers => :list_containers}, :scaling, {:'scaling-update' => :scaling_update}
+  register_subcommands :exec => :execution_request
   # register_subcommands {:'lb-update' => :load_balancer_update}
   alias_subcommand :details, :get
   set_default_subcommand :list
@@ -32,6 +35,7 @@ class Morpheus::Cli::Instances
     @provision_types_interface = @api_client.provision_types
     @options_interface = @api_client.options
     @active_group_id = Morpheus::Cli::Groups.active_group
+    @execution_request_interface = @api_client.execution_request
   end
   
   def handle(args)
@@ -229,7 +233,7 @@ class Morpheus::Cli::Instances
         options[:layout_size] = val.to_i
       end
       opts.on("--workflow ID", String, "Automation: Workflow ID") do |val|
-        options[:workflow_id] = val.to_i
+        options[:workflow_id] = val
       end
       # opts.on('-L', "--lb", "Enable Load Balancer") do
       #   options[:enable_load_balancer] = true
@@ -314,7 +318,11 @@ class Morpheus::Cli::Instances
         payload['instance']['userGroup'] = {'id' => options[:user_group_id] }
       end
       if options[:workflow_id]
-        payload['taskSetId'] = options[:workflow_id]
+        if options[:workflow_id].to_s =~ /\A\d{1,}\Z/
+          payload['taskSetId'] = options[:workflow_id].to_i
+        else
+          payload['taskSetName'] = options[:workflow_id]
+        end
       end
       if options[:enable_load_balancer]
         lb_payload = prompt_instance_load_balancer(payload['instance'], nil, options)
@@ -722,7 +730,7 @@ class Morpheus::Cli::Instances
   def get(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
+      opts.banner = subcommand_usage("[instance]")
       opts.on( nil, '--containers', "Display Instance Containers" ) do
         options[:include_containers] = true
       end
@@ -735,9 +743,9 @@ class Morpheus::Cli::Instances
       opts.on( nil, '--scaling', "Display Instance Scaling Settings" ) do
         options[:include_scaling] = true
       end
-      opts.on('--refresh-until [status]', String, "Refresh until status is reached. Default status is running.") do |val|
+      opts.on('--refresh [status]', String, "Refresh until status is reached. Default status is running.") do |val|
         if val.to_s.empty?
-          options[:refresh_until_status] = "running"
+          options[:refresh_until_status] = "running,failed"
         else
           options[:refresh_until_status] = val.to_s.downcase
         end
@@ -752,6 +760,8 @@ class Morpheus::Cli::Instances
       #   options[:include_lb] = true
       # end
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "Get details about an instance.\n" + 
+                    "[instance] is required. This is the name or id of an instance. Supports 1-N [instance] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
@@ -945,10 +955,13 @@ class Morpheus::Cli::Instances
         if options[:refresh_interval].nil? || options[:refresh_interval].to_f < 0
           options[:refresh_interval] = 5
         end
-        while instance['status'].to_s.downcase != options[:refresh_until_status].to_s.downcase
+        statuses = options[:refresh_until_status].to_s.downcase.split(",").collect {|s| s.strip }.select {|s| !s.to_s.empty? }
+        if !statuses.include?(instance['status'])
           print cyan
-          print "Refreshing until status #{options[:refresh_until_status]} ..."
-          sleep(options[:refresh_interval])
+          print "Status is #{instance['status'] || 'unknown'}. Refreshing in #{options[:refresh_interval]} seconds"
+          #sleep(options[:refresh_interval])
+          sleep_with_dots(options[:refresh_interval])
+          print "\n"
           _get(arg, options)
         end
       end
@@ -2434,6 +2447,396 @@ class Morpheus::Cli::Instances
     end
   end
 
+  def history(args)
+    raw_args = args.dup
+    options = {}
+    #options[:show_output] = true
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[instance]")
+      # opts.on( '-n', '--node NODE_ID', "Scope history to specific Container or VM" ) do |node_id|
+      #   options[:node_id] = node_id.to_i
+      # end
+      opts.on( nil, '--events', "Display sub processes (events)." ) do
+        options[:show_events] = true
+      end
+      opts.on( nil, '--output', "Display process output." ) do
+        options[:show_output] = true
+      end
+      opts.on('--process-id ID', String, "Display details about a specfic process only." ) do |val|
+        options[:process_id] = val
+      end
+      opts.on('--event-id ID', String, "Display details about a specfic process event only." ) do |val|
+        options[:event_id] = val
+      end
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "List historical processes for a specific instance.\n" + 
+                    "[instance] is required. This is the name or id of an instance."
+    end
+    optparse.parse!(args)
+
+    # shortcut to other actions
+    if options[:process_id]
+      return history_details(raw_args)
+    elsif options[:event_id]
+      return history_event_details(raw_args)
+    end
+
+    if args.count != 1
+      puts optparse
+      return 1
+    end
+    connect(options)
+    begin
+      instance = find_instance_by_name_or_id(args[0])
+      # container_ids = instance['containers']
+      # if options[:node_id] && container_ids.include?(options[:node_id])
+      #   container_ids = [options[:node_id]]
+      # end
+      params = {}
+      params.merge!(parse_list_options(options))
+      # params[:query] = params.delete(:phrase) unless params[:phrase].nil?
+      if options[:dry_run]
+        print_dry_run @instances_interface.dry.history(instance['id'], params)
+        return
+      end
+      json_response = @instances_interface.history(instance['id'], params)
+      if options[:json]
+        puts as_json(json_response, options, "processes")
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "processes")
+        return 0
+      elsif options[:csv]
+        puts records_as_csv(json_response['processes'], options)
+        return 0
+      else
+
+        title = "Instance History: #{instance['name']}"
+        subtitles = []
+        if params[:query]
+          subtitles << "Search: #{params[:query]}".strip
+        end
+        subtitles += parse_list_subtitles(options)
+        print_h1 title, subtitles
+        if json_response['processes'].empty?
+          print "#{cyan}No process history found.#{reset}\n\n"
+        else
+          history_records = []
+          json_response["processes"].each do |process|
+            row = {
+              id: process['id'],
+              eventId: nil,
+              uniqueId: process['uniqueId'],
+              name: process['displayName'],
+              description: process['description'],
+              processType: process['processType'] ? (process['processType']['name'] || process['processType']['code']) : process['processTypeName'],
+              createdBy: process['createdBy'] ? (process['createdBy']['displayName'] || process['createdBy']['username']) : '',
+              startDate: format_local_dt(process['startDate']),
+              duration: format_process_duration(process),
+              status: format_process_status(process),
+              error: format_process_error(process),
+              output: format_process_output(process)
+            }
+            history_records << row
+            process_events = process['events'] || process['processEvents']
+            if options[:show_events]
+              if process_events
+                process_events.each do |process_event|
+                  event_row = {
+                    id: process['id'],
+                    eventId: process_event['id'],
+                    uniqueId: process_event['uniqueId'],
+                    name: process_event['displayName'], # blank like the UI
+                    description: process_event['description'],
+                    processType: process_event['processType'] ? (process_event['processType']['name'] || process_event['processType']['code']) : process['processTypeName'],
+                    createdBy: process_event['createdBy'] ? (process_event['createdBy']['displayName'] || process_event['createdBy']['username']) : '',
+                    startDate: format_local_dt(process_event['startDate']),
+                    duration: format_process_duration(process_event),
+                    status: format_process_status(process_event),
+                    error: format_process_error(process_event),
+                    output: format_process_output(process_event)
+                  }
+                  history_records << event_row
+                end
+              else
+                
+              end
+            end
+          end
+          columns = [
+            {:id => {:display_name => "PROCESS ID"} },
+            :name, 
+            :description, 
+            {:processType => {:display_name => "PROCESS TYPE"} },
+            {:createdBy => {:display_name => "CREATED BY"} },
+            {:startDate => {:display_name => "START DATE"} },
+            {:duration => {:display_name => "ETA/DURATION"} },
+            :status, 
+            :error
+          ]
+          if options[:show_events]
+            columns.insert(1, {:eventId => {:display_name => "EVENT ID"} })
+          end
+          if options[:show_output]
+            columns << :output
+          end
+          # custom pretty table columns ...
+          if options[:include_fields]
+            columns = options[:include_fields]
+          end
+          print cyan
+          print as_pretty_table(history_records, columns, options)
+          #print_results_pagination(json_response)
+          print_results_pagination(json_response, {:label => "process", :n_label => "processes"})
+          print reset, "\n"
+          return 0
+        end
+      end
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def history_details(args)
+    options = {}
+    process_id = nil
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[instance] [process-id]")
+      opts.on('--process-id ID', String, "Display details about a specfic event." ) do |val|
+        options[:process_id] = val
+      end
+      opts.add_hidden_option('process-id')
+      build_common_options(opts, options, [:query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "Display history details for a specific process.\n" + 
+                    "[instance] is required. This is the name or id of an instance.\n" +
+                    "[process-id] is required. This is the id of the process."
+    end
+    optparse.parse!(args)
+    if args.count == 2
+      process_id = args[1]
+    elsif args.count == 1 && options[:process_id]
+      process_id = options[:process_id]
+    else
+      puts_error optparse
+      return 1
+    end
+    connect(options)
+    begin
+      instance = find_instance_by_name_or_id(args[0])
+      params = {}
+      params.merge!(parse_list_options(options))
+      params[:query] = params.delete(:phrase) unless params[:phrase].nil?
+      if options[:dry_run]
+        print_dry_run @instances_interface.dry.history_details(instance['id'], process_id, params)
+        return
+      end
+      json_response = @instances_interface.history_details(instance['id'], process_id, params)
+      if options[:json]
+        puts as_json(json_response, options, "process")
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "process")
+        return 0
+      elsif options[:csv]
+        puts records_as_csv(json_response['process'], options)
+        return 0
+      else
+        process = json_response["process"]
+        title = "Instance History Details"
+        subtitles = []
+        subtitles << " Process ID: #{process_id}"
+        subtitles += parse_list_subtitles(options)
+        print_h1 title, subtitles
+        print_process_details(process)
+  
+        print_h2 "Process Events"
+        process_events = process['events'] || process['processEvents'] || []
+        history_records = []
+        if process_events.empty?
+          puts "#{cyan}No events found.#{reset}"
+        else      
+          process_events.each do |process_event|
+            event_row = {
+                    id: process_event['id'],
+                    eventId: process_event['id'],
+                    uniqueId: process_event['uniqueId'],
+                    name: process_event['displayName'], # blank like the UI
+                    description: process_event['description'],
+                    processType: process_event['processType'] ? (process_event['processType']['name'] || process_event['processType']['code']) : process['processTypeName'],
+                    createdBy: process_event['createdBy'] ? (process_event['createdBy']['displayName'] || process_event['createdBy']['username']) : '',
+                    startDate: format_local_dt(process_event['startDate']),
+                    duration: format_process_duration(process_event),
+                    status: format_process_status(process_event),
+                    error: format_process_error(process_event),
+                    output: format_process_output(process_event)
+                  }
+            history_records << event_row
+          end
+          columns = [
+            {:id => {:display_name => "EVENT ID"} },
+            :name, 
+            :description, 
+            {:processType => {:display_name => "PROCESS TYPE"} },
+            {:createdBy => {:display_name => "CREATED BY"} },
+            {:startDate => {:display_name => "START DATE"} },
+            {:duration => {:display_name => "ETA/DURATION"} },
+            :status, 
+            :error,
+            :output
+          ]
+          print cyan
+          print as_pretty_table(history_records, columns, options)
+          print_results_pagination({size: process_events.size, total: process_events.size})
+          print reset, "\n"
+          return 0
+        end
+      end
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def history_event_details(args)
+    options = {}
+    process_event_id = nil
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[instance] [event-id]")
+      opts.on('--event-id ID', String, "Display details about a specfic event." ) do |val|
+        options[:event_id] = val
+      end
+      opts.add_hidden_option('event-id')
+      build_common_options(opts, options, [:query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "Display history details for a specific process event.\n" + 
+                    "[instance] is required. This is the name or id of an instance.\n" +
+                    "[event-id] is required. This is the id of the process event."
+    end
+    optparse.parse!(args)
+    if args.count == 2
+      process_event_id = args[1]
+    elsif args.count == 1 && options[:event_id]
+      process_event_id = options[:event_id]
+    else
+      puts_error optparse
+      return 1
+    end
+    connect(options)
+    begin
+      instance = find_instance_by_name_or_id(args[0])
+      params = {}
+      params.merge!(parse_list_options(options))
+      if options[:dry_run]
+        print_dry_run @instances_interface.dry.history_event_details(instance['id'], process_event_id, params)
+        return
+      end
+      json_response = @instances_interface.history_event_details(instance['id'], process_event_id, params)
+      if options[:json]
+        puts as_json(json_response, options, "processEvent")
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "processEvent")
+        return 0
+      elsif options[:csv]
+        puts records_as_csv(json_response['processEvent'], options)
+        return 0
+      else
+        process_event = json_response['processEvent'] || json_response['event']
+        title = "Instance History Event"
+        subtitles = []
+        subtitles += parse_list_subtitles(options)
+        print_h1 title, subtitles
+        print_process_event_details(process_event)
+        print reset, "\n"
+        return 0
+      end
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def execution_request(args)
+    options = {}
+    params = {}
+    script_content = nil
+    do_refresh = true
+    optparse = Morpheus::Cli::OptionParser.new do|opts|
+      opts.banner = subcommand_usage("[id] [options]")
+      opts.on('--script SCRIPT', "Script to be executed" ) do |val|
+        script_content = val
+      end
+      opts.on('--file FILE', "File containing the script. This can be used instead of --script" ) do |filename|
+        full_filename = File.expand_path(filename)
+        if File.exists?(full_filename)
+          script_content = File.read(full_filename)
+        else
+          print_red_alert "File not found: #{full_filename}"
+          exit 1
+        end
+      end
+      opts.on(nil, '--no-refresh', "Do not refresh until finished" ) do
+        do_refresh = false
+      end
+      #build_option_type_options(opts, options, add_user_source_option_types())
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
+      opts.footer = "Execute an arbitrary script or command on an instance." + "\n" +
+                    "[id] is required. This is the id or name of an instance." + "\n" +
+                    "[script] is required. This is the script that is to be executed."
+    end
+    optparse.parse!(args)
+    connect(options)
+    if args.count != 1
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error  "wrong number of arguments, expected 1 and got (#{args.count}) #{args.inspect}\n#{optparse}"
+      return 1
+    end
+    
+    begin
+      instance = find_instance_by_name_or_id(args[0])
+      return 1 if instance.nil?
+      params['instanceId'] = instance['id']
+      # construct payload
+      payload = {}
+      if options[:payload]
+        payload = options[:payload]
+      else
+        payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+        # prompt for Script
+        if script_content.nil?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'script', 'type' => 'code-editor', 'fieldLabel' => 'Script', 'required' => true, 'description' => 'The script content'}], options[:options])
+          script_content = v_prompt['script']
+        end
+        payload['script'] = script_content
+      end
+      # dry run?
+      if options[:dry_run]
+        print_dry_run @execution_request_interface.dry.create(params, payload)
+        return 0
+      end
+      # do it
+      json_response = @execution_request_interface.create(params, payload)
+      # print and return result
+      if options[:quiet]
+        return 0
+      elsif options[:json]
+        puts as_json(json_response, options)
+        return 0
+      end
+      execution_request = json_response['executionRequest']
+      print_green_success "Executing request #{execution_request['uniqueId']}"
+      if do_refresh
+        Morpheus::Cli::ExecutionRequestCommand.new.handle(["get", execution_request['uniqueId'], "--refresh"])
+      else
+        Morpheus::Cli::ExecutionRequestCommand.new.handle(["get", execution_request['uniqueId']])
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
 private
 
   def find_zone_by_name_or_id(group_id, val)
@@ -2661,6 +3064,66 @@ private
     print_description_list(description_cols, instance_threshold)
   end
 
+  def print_process_details(process)
+    description_cols = {
+      "Process ID" => lambda {|it| it['id'] },
+      "Name" => lambda {|it| it['displayName'] },
+      "Description" => lambda {|it| it['description'] },
+      "Process Type" => lambda {|it| it['processType'] ? (it['processType']['name'] || it['processType']['code']) : it['processTypeName'] },
+      "Created By" => lambda {|it| it['createdBy'] ? (it['createdBy']['displayName'] || it['createdBy']['username']) : '' },
+      "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
+      "End Date" => lambda {|it| format_local_dt(it['endDate']) },
+      "Duration" => lambda {|it| format_process_duration(it) },
+      "Status" => lambda {|it| format_process_status(it) },
+      # "# Events" => lambda {|it| (it['events'] || []).size() },
+    }
+    print_description_list(description_cols, process)
+
+    if process['error']
+      print_h2 "Error"
+      print reset
+      #puts format_process_error(process_event)
+      puts process['error'].to_s.strip
+    end
+
+    if process['output']
+      print_h2 "Output"
+      print reset
+      #puts format_process_error(process_event)
+      puts process['output'].to_s.strip
+    end
+  end
+
+  def print_process_event_details(process_event)
+    # process_event =~ process
+    description_cols = {
+      "Process ID" => lambda {|it| it['processId'] },
+      "Event ID" => lambda {|it| it['id'] },
+      "Name" => lambda {|it| it['displayName'] },
+      "Description" => lambda {|it| it['description'] },
+      "Process Type" => lambda {|it| it['processType'] ? (it['processType']['name'] || it['processType']['code']) : it['processTypeName'] },
+      "Created By" => lambda {|it| it['createdBy'] ? (it['createdBy']['displayName'] || it['createdBy']['username']) : '' },
+      "Start Date" => lambda {|it| format_local_dt(it['startDate']) },
+      "End Date" => lambda {|it| format_local_dt(it['endDate']) },
+      "Duration" => lambda {|it| format_process_duration(it) },
+      "Status" => lambda {|it| format_process_status(it) },
+    }
+    print_description_list(description_cols, process_event)
+
+    if process_event['error']
+      print_h2 "Error"
+      print reset
+      #puts format_process_error(process_event)
+      puts process_event['error'].to_s.strip
+    end
+
+    if process_event['output']
+      print_h2 "Output"
+      print reset
+      #puts format_process_error(process_event)
+      puts process_event['output'].to_s.strip
+    end
+  end
   
 
 end