morpheus-cli 5.3.4 → 5.4.3

data/lib/morpheus/cli/{health_command.rb → commands/health_command.rb}

@@ -1,16 +1,10 @@
-require 'io/console'
-require 'rest_client'
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/logs_helper'
-require 'morpheus/cli/option_types'
-require 'json'
 
 class Morpheus::Cli::HealthCommand
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::LogsHelper
   set_command_name :health
-  register_subcommands :get, :alarms, :'get-alarm', :'acknowledge-alarms', :'unacknowledge-alarms', :logs
+  register_subcommands :get, :alarms, :'get-alarm', :'acknowledge-alarms', :'unacknowledge-alarms', :logs, :'export-logs'
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
@@ -510,17 +504,16 @@ class Morpheus::Cli::HealthCommand
   def logs(args)
     options = {}
     params = {}
-    start_date, end_date = nil, nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       opts.on('--level VALUE', String, "Log Level. DEBUG,INFO,WARN,ERROR") do |val|
         params['level'] = params['level'] ? [params['level'], val].flatten : [val]
       end
-      opts.on('--start TIMESTAMP','--start TIMESTAMP', "Start timestamp. Default is 30 days ago.") do |val|
-        start_date = parse_time(val) #.utc.iso8601
+      opts.on('--start TIMESTAMP','--start TIMESTAMP', "Start date timestamp in standard iso8601 format. Default is 24 hours ago.") do |val|
+        params['startDate'] = val # parse_time(val).utc.iso8601
       end
-      opts.on('--end TIMESTAMP','--end TIMESTAMP', "End timestamp. Default is now.") do |val|
-        end_date = parse_time(val) #.utc.iso8601
+      opts.on('--end TIMESTAMP','--end TIMESTAMP', "End date timestamp in standard iso8601 format. Default is now.") do |val|
+        params['endDate'] = val # parse_time(val).utc.iso8601
       end
       opts.on('-t', '--table', "Format output as a table.") do
         options[:table] = true
@@ -539,8 +532,8 @@ class Morpheus::Cli::HealthCommand
     begin
       # params['startDate'] = start_date.utc.iso8601 if start_date
       # params['endDate'] = end_date.utc.iso8601 if end_date
-      params['startMs'] = (start_date.to_i * 1000) if start_date
-      params['endMs'] = (end_date.to_i * 1000) if end_date
+      # params['startMs'] = (start_date.to_i * 1000) if start_date
+      # params['endMs'] = (end_date.to_i * 1000) if end_date
       params['level'] = params['level'].collect {|it| it.to_s.upcase }.join('|') if params['level'] # api works with INFO|WARN
       params.merge!(parse_list_options(options))
       @health_interface.setopts(options)
@@ -557,11 +550,11 @@ class Morpheus::Cli::HealthCommand
       if params['level']
         subtitles << "Level: #{[params['level']].flatten.join(',')}"
       end
-      if start_date
-        subtitles << "Start: #{start_date}"
+      if params['startDate']
+        subtitles << "Start: #{params['startDate']}"
       end
-      if end_date
-        subtitles << "End: #{end_date}"
+      if params['endDate']
+        subtitles << "End: #{params['endDate']}"
       end
       subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
@@ -580,6 +573,98 @@ class Morpheus::Cli::HealthCommand
     end
   end
 
+  def export_logs(args)
+    params = {}
+    options = {}
+    outfile = nil
+    do_overwrite = false
+    do_mkdir = false
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[file]")
+      opts.on('--level VALUE', String, "Log Level. DEBUG,INFO,WARN,ERROR") do |val|
+        params['level'] = params['level'] ? [params['level'], val].flatten : [val]
+      end
+      opts.on('--start TIMESTAMP','--start TIMESTAMP', "Start date timestamp in standard iso8601 format. Default is 24 hours ago.") do |val|
+        params['startDate'] = val # parse_time(val).utc.iso8601
+      end
+      opts.on('--end TIMESTAMP','--end TIMESTAMP', "End date timestamp in standard iso8601 format. Default is now.") do |val|
+        params['endDate'] = val # parse_time(val).utc.iso8601
+      end
+      opts.on( '-f', '--force', "Overwrite existing [file] if it exists." ) do
+        do_overwrite = true
+        # do_mkdir = true
+      end
+      opts.on( '-p', '--mkdir', "Create missing directories for [file] if they do not exist." ) do
+        do_mkdir = true
+      end
+      build_common_options(opts, options, [:list, :query, :dry_run, :remote])
+      opts.footer = "Export morpheus appliance log." + "\n" +
+                    "[file] is required. This is local destination for the downloaded file. Example: morpheus.log"
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count: 1)
+    connect(options)
+    params['level'] = params['level'].collect {|it| it.to_s.upcase }.join('|') if params['level'] # api works with INFO|WARN
+    params.merge!(parse_list_options(options))
+
+    outfile = args[0]
+    outfile = File.expand_path(outfile)
+    
+    if Dir.exists?(outfile)
+      raise_command_error("[file] is invalid. It is the name of an existing directory: #{outfile}", args, optparse)
+    end
+    destination_dir = File.dirname(outfile)
+    if !Dir.exists?(destination_dir)
+      if do_mkdir
+        print cyan,"Creating local directory #{destination_dir}",reset,"\n"
+        FileUtils.mkdir_p(destination_dir)
+      else
+        raise_command_error("[file] is invalid. Directory not found: #{destination_dir}", args, optparse)
+      end
+    end
+    if File.exists?(outfile)
+      if do_overwrite
+        # uhh need to be careful wih the passed filepath here..
+        # don't delete, just overwrite.
+        # File.delete(outfile)
+      else
+        raise_command_error("[file] is invalid. File already exists: #{outfile}\nUse -f to overwrite the existing file.", args, optparse)
+      end
+    end
+
+    @health_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @health_interface.dry.export_logs(outfile, params)
+      return 0
+    end
+    if !options[:quiet]
+      print cyan + "Downloading file #{outfile} ... "
+    end
+    http_response, bad_body = @health_interface.export_logs(outfile, params)
+    # FileUtils.chmod(0600, outfile)
+    success = http_response.code.to_i == 200
+    if success
+      if !options[:quiet]
+        print green + "SUCCESS" + reset + " (" + format_bytes(http_response["Content-Length"].to_i).to_s + ")" + "\n"
+      end
+      # todo: parse default outfile from http_response["Content-Type"]
+      return 0
+    else
+      if !options[:quiet]
+        print red + "ERROR" + reset + " HTTP #{http_response.code}" + "\n"
+      end
+      # F it, just remove a bad result
+      if File.exists?(outfile) && File.file?(outfile)
+        Morpheus::Logging::DarkPrinter.puts "Deleting bad file download: #{outfile}" if Morpheus::Logging.debug?
+        File.delete(outfile)
+      end
+      if options[:debug]
+        puts_error http_response.inspect
+      end
+      return 1, "download failed"
+    end
+  end
+
   def alarms(args)
     options = {}
     params = {}
@@ -595,7 +680,7 @@ class Morpheus::Cli::HealthCommand
       opts.on('--acknowledged', '--acknowledged', "Filter by acknowledged. By default only open alarms are returned.") do
         params['alarmStatus'] = 'acknowledged'
       end
-      opts.on('--start TIMESTAMP','--start TIMESTAMP', "Start timestamp. Default is 30 days ago.") do |val|
+      opts.on('--start TIMESTAMP','--start TIMESTAMP', "Start timestamp. Default is 24 hours ago.") do |val|
         start_date = parse_time(val) #.utc.iso8601
       end
       opts.on('--end TIMESTAMP','--end TIMESTAMP', "End timestamp. Default is now.") do |val|

data/lib/morpheus/cli/commands/{standard/history_command.rb → history_command.rb}

@@ -1,6 +1,3 @@
-require 'optparse'
-require 'json'
-require 'morpheus/logging'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::HistoryCommand

data/lib/morpheus/cli/{hosts.rb → commands/hosts.rb}

@@ -1,13 +1,4 @@
-# require 'yaml'
-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/mixins/logs_helper'
-require 'morpheus/cli/option_types'
-require 'json'
 
 class Morpheus::Cli::Hosts
   include Morpheus::Cli::CliCommand
@@ -31,7 +22,7 @@ class Morpheus::Cli::Hosts
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
     @accounts_interface = @api_client.accounts
-    @users_interface = @api_client.users
+    @account_users_interface = @api_client.account_users
     @clouds_interface = @api_client.clouds
     @options_interface = @api_client.options
     @tasks_interface = @api_client.tasks
@@ -90,25 +81,25 @@ class Morpheus::Cli::Hosts
       opts.on( '--plan-code CODE', String, "Filter by Plan code(s)" ) do |val|
         params['planCode'] = parse_id_list(val)
       end
-      opts.on( '', '--vm', "Show only virtual machines" ) do |val|
+      opts.on('--vm', "Show only virtual machines" ) do
         params[:vm] = true
       end
-      opts.on( '', '--hypervisor', "Show only VM Hypervisors" ) do |val|
+      opts.on('--hypervisor', "Show only VM Hypervisors" ) do
         params[:vmHypervisor] = true
       end
-      opts.on( '', '--container', "Show only Container Hypervisors" ) do |val|
+      opts.on('--container', "Show only Container Hypervisors" ) do
         params[:containerHypervisor] = true
       end
-      opts.on( '', '--baremetal', "Show only Baremetal Servers" ) do |val|
+      opts.on('--baremetal', "Show only Baremetal Servers" ) do
         params[:bareMetalHost] = true
       end
-      opts.on( '', '--status STATUS', "Filter by Status" ) do |val|
+      opts.on('--status STATUS', String, "Filter by Status" ) do |val|
         params[:status] = val
       end
-      opts.on( '', '--agent', "Show only Servers with the agent installed" ) do |val|
+      opts.on('--agent', "Show only Servers with the agent installed" ) do
         params[:agentInstalled] = true
       end
-      opts.on( '', '--noagent', "Show only Servers with No agent" ) do |val|
+      opts.on('--noagent', "Show only Servers with No agent" ) do
         params[:agentInstalled] = false
       end
       opts.on( '--created-by USER', "Created By User Username or ID" ) do |val|
@@ -383,25 +374,25 @@ class Morpheus::Cli::Hosts
       opts.on( '-i', '--ip IPADDRESS', "Filter by IP Address" ) do |val|
         params[:ip] = val
       end
-      opts.on( '', '--vm', "Show only virtual machines" ) do |val|
+      opts.on('--vm', "Show only virtual machines" ) do
         params[:vm] = true
       end
-      opts.on( '', '--hypervisor', "Show only VM Hypervisors" ) do |val|
+      opts.on('--hypervisor', "Show only VM Hypervisors" ) do
         params[:vmHypervisor] = true
       end
-      opts.on( '', '--container', "Show only Container Hypervisors" ) do |val|
+      opts.on('--container', "Show only Container Hypervisors" ) do
         params[:containerHypervisor] = true
       end
-      opts.on( '', '--baremetal', "Show only Baremetal Servers" ) do |val|
+      opts.on('--baremetal', "Show only Baremetal Servers" ) do
         params[:bareMetalHost] = true
       end
-      opts.on( '', '--status STATUS', "Filter by Status" ) do |val|
+      opts.on('--status STATUS', "Filter by Status" ) do |val|
         params[:status] = val
       end
-      opts.on( '', '--agent', "Show only Servers with the agent installed" ) do |val|
+      opts.on('--agent', "Show only Servers with the agent installed" ) do
         params[:agentInstalled] = true
       end
-      opts.on( '', '--noagent', "Show only Servers with No agent" ) do |val|
+      opts.on('--noagent', "Show only Servers with No agent" ) do
         params[:agentInstalled] = false
       end
       opts.on( '--created-by USER', "Created By User Username or ID" ) do |val|
@@ -887,6 +878,12 @@ class Morpheus::Cli::Hosts
           payload['volumes'] = volumes
         end
 
+        # plan customizations
+        plan_opts = prompt_service_plan_options(service_plan, options, @api_client, {})
+        if plan_opts && !plan_opts.empty?
+          payload['servicePlanOptions'] = plan_opts
+        end
+
         # prompt for network interfaces (if supported)
         if server_type["provisionType"] && server_type["provisionType"]["id"] && server_type["provisionType"]["hasNetworks"]
           begin
@@ -1261,6 +1258,12 @@ class Morpheus::Cli::Hosts
         payload[:volumes] = volumes
       end
 
+      # plan customizations
+      plan_opts = prompt_service_plan_options(service_plan, options, @api_client, {}, server)
+      if plan_opts && !plan_opts.empty?
+        payload['servicePlanOptions'] = plan_opts
+      end
+
       # todo: reconfigure networks
       #       need to get provision_type_id for network info
       # prompt for network interfaces (if supported)

data/lib/morpheus/cli/{image_builder_command.rb → commands/image_builder_command.rb}

@@ -1,12 +1,6 @@
-require 'json'
-require 'yaml'
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/provisioning_helper'
-require 'morpheus/cli/boot_scripts_command'
-require 'morpheus/cli/preseed_scripts_command'
+# require 'morpheus/cli/commands/boot_scripts_command'
+# require 'morpheus/cli/commands/preseed_scripts_command'
 
 class Morpheus::Cli::ImageBuilderCommand
   include Morpheus::Cli::CliCommand
@@ -1071,20 +1065,16 @@ class Morpheus::Cli::ImageBuilderCommand
     preseed_script_id = nil
     if options['preseedScript']
       preseed_script = find_preseed_script(options['preseedScript'])
-      if !preseed_script
-        print_red_alert "Preseed Script not found: #{options['preseedScript']}"
-        return false
+      if preseed_script
+        preseed_script_id = preseed_script['id']
       end
-      preseed_script_id = preseed_script['id']
     else
       preseed_script_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'preseedScript', 'type' => 'select', 'fieldLabel' => 'Preseed Script', 'selectOptions' => get_available_preseed_scripts(), 'required' => false, 'description' => 'Select Preseed Script.', 'defaultValue' => default_values['preseedScript'], :fmt=>:natural}],options,api_client,{})
       # preseed_script_id = preseed_script_prompt['preseedScript']
       preseed_script = find_preseed_script(preseed_script_prompt['preseedScript'])
-      if !preseed_script
-        print_red_alert "Preseed Script not found: '#{preseed_script_prompt['preseedScript']}'"
-        return false
+      if preseed_script
+        preseed_script_id = preseed_script['id']
       end
-      preseed_script_id = preseed_script['id']
     end
     if preseed_script_id
       # payload['preseedScript'] = preseed_script_id

data/lib/morpheus/cli/{instance_types.rb → commands/instance_types.rb}

@@ -1,7 +1,4 @@
-require 'io/console'
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/provisioning_helper'
 
 class Morpheus::Cli::InstanceTypes
   include Morpheus::Cli::CliCommand