morpheus-cli 5.3.2.2 → 5.4.0

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

@@ -1,10 +1,4 @@
-# require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-#require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::Clusters
   include Morpheus::Cli::CliCommand
@@ -564,13 +558,10 @@ class Morpheus::Cli::Clusters
 
         cluster_payload['layout'] = {id: layout['id']}
 
-        # Plan
+        # Provision Type
         provision_type = (layout && layout['provisionType'] ? layout['provisionType'] : nil) || get_provision_type_for_zone_type(cloud['zoneType']['id'])
-        service_plan = prompt_service_plan(cloud['id'], provision_type, options)
 
-        if service_plan
-          server_payload['plan'] = {'id' => service_plan['id'], 'code' => service_plan['code'], 'options' => prompt_service_plan_options(service_plan, options)}
-        end
+        api_params = {zoneId: cloud['id'], siteId: group['id'], layoutId: layout['id'], groupTypeId: cluster_type['id'], provisionTypeId: provision_type['id']}
 
         # Controller type
         server_types = @server_types_interface.list({max:1, computeTypeId: cluster_type['controllerTypes'].first['id'], zoneTypeId: cloud['zoneType']['id'], useZoneProvisionTypes: true})['serverTypes']
@@ -581,22 +572,47 @@ class Morpheus::Cli::Clusters
           controller_type = server_types.first
           controller_provision_type = controller_type['provisionType'] ? (@provision_types_interface.get(controller_type['provisionType']['id'])['provisionType'] rescue nil) : nil
 
-          if controller_provision_type && resource_pool = prompt_resource_pool(group, cloud, service_plan, controller_provision_type, options)
-              server_payload['config']['resourcePool'] = resource_pool['externalId']
+          if controller_provision_type && resource_pool = prompt_resource_pool(group, cloud, nil, controller_provision_type, options)
+            server_payload['config']['resourcePoolId'] = resource_pool['id']
+            api_params['config'] ||= {}
+            api_params['config']['resourcePool'] = resource_pool['id']
+            api_params['resourcePoolId'] = resource_pool['id']
+            api_params['zonePoolId'] = resource_pool['id']
           end
         end
 
+        # Service Plan
+        service_plan = prompt_service_plan(api_params, options)
+
+        if service_plan
+          server_payload['plan'] = {'id' => service_plan['id'], 'code' => service_plan['code'], 'options' => prompt_service_plan_options(service_plan, options)}
+          api_params['planId'] = service_plan['id']
+        end
+
         # Multi-disk / prompt for volumes
-        volumes = options[:volumes] || prompt_volumes(service_plan, options.merge({'defaultAddFirstDataVolume': true}), @api_client, {zoneId: cloud['id'], siteId: group['id']})
+        volumes = options[:volumes] || prompt_volumes(service_plan, options.merge({'defaultAddFirstDataVolume': true}), @api_client, api_params)
 
         if !volumes.empty?
           server_payload['volumes'] = volumes
         end
 
+        # Options / Custom Config
+        option_type_list =
+          ((controller_type['optionTypes'].reject { |type| !type['enabled'] || type['fieldComponent'] } rescue []) + layout['optionTypes'] +
+          (cluster_type['optionTypes'].reject { |type| !type['enabled'] || !type['creatable'] || type['fieldComponent'] } rescue [])).sort { |type| type['displayOrder'] }
+
+        # KLUDGE: google zone required for network selection
+        if option_type = option_type_list.find {|type| type['code'] == 'computeServerType.googleLinux.googleZoneId'}
+          server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt([option_type], options[:options], @api_client, api_params))
+          api_params.deep_merge!(server_payload)
+          api_params.deep_merge!(server_payload['config'])
+          option_type_list = option_type_list.reject {|type| type['code'] == 'computeServerType.googleLinux.googleZoneId'}
+        end
+
         # Networks
         # NOTE: You must choose subnets in the same availability zone
         if controller_provision_type && controller_provision_type['hasNetworks'] && cloud['zoneType']['code'] != 'esxi'
-          server_payload['networkInterfaces'] = options[:networkInterfaces] || prompt_network_interfaces(cloud['id'], provision_type['id'], (resource_pool['id'] rescue nil), options)
+          server_payload['networkInterfaces'] = options[:networkInterfaces] || prompt_network_interfaces(cloud['id'], provision_type['id'], (resource_pool['id'] rescue nil), options.merge({:api_params => api_params}))
         end
 
         # Security Groups
@@ -605,15 +621,11 @@ class Morpheus::Cli::Clusters
         # Visibility
         server_payload['visibility'] = options[:visibility] || (Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'defaultValue' => 'private', 'required' => true, 'selectOptions' => [{'name' => 'Private', 'value' => 'private'},{'name' => 'Public', 'value' => 'public'}]}], options[:options], @api_client, {})['visibility'])
 
-        # Options / Custom Config
-        option_type_list = ((controller_type['optionTypes'].reject { |type| !type['enabled'] || type['fieldComponent'] } rescue []) + layout['optionTypes'] +
-          (cluster_type['optionTypes'].reject { |type| !type['enabled'] || !type['creatable'] || type['fieldComponent'] } rescue [])).sort { |type| type['displayOrder'] }
-
-        server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(option_type_list, options[:options], @api_client, {zoneId: cloud['id'], siteId: group['id'], layoutId: layout['id']}))
+        server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(option_type_list, options[:options], @api_client, api_params, options[:no_prompt], true))
 
         # Worker count
         default_node_count = layout['computeServers'] ? (layout['computeServers'].find {|it| it['nodeType'] == 'worker'} || {'nodeCount' => 3})['nodeCount'] : 3
-        server_payload['nodeCount'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => "nodeCount", 'type' => 'number', 'fieldLabel' => "#{cluster_type['code'].include?('docker') ? 'Host' : 'Worker'} Count", 'required' => true, 'defaultValue' => default_node_count}], options[:options], @api_client, {}, options[:no_prompt])["nodeCount"]
+        server_payload['config']['nodeCount'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => "config.nodeCount", 'type' => 'number', 'fieldLabel' => "#{cluster_type['code'].include?('docker') ? 'Host' : 'Worker'} Count", 'required' => true, 'defaultValue' => default_node_count > 0 ? default_node_count : 3}], options[:options], @api_client, api_params, options[:no_prompt])['config']['nodeCount']
 
         # Create User
         if !options[:createUser].nil?
@@ -629,7 +641,7 @@ class Morpheus::Cli::Clusters
         if userGroup
           server_payload['userGroup'] = userGroup
         elsif !options[:no_prompt]
-          userGroupId = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'userGroupId', 'fieldLabel' => 'User Group', 'type' => 'select', 'required' => false, 'optionSource' => 'userGroups'}], options[:options], @api_client, {})['userGroupId']
+          userGroupId = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'userGroupId', 'fieldLabel' => 'User Group', 'type' => 'select', 'required' => false, 'optionSource' => 'userGroups'}], options[:options], @api_client, api_params)['userGroupId']
 
           if userGroupId
             server_payload['userGroup'] = {'id' => userGroupId}
@@ -637,11 +649,11 @@ class Morpheus::Cli::Clusters
         end
 
         # Host / Domain
-        server_payload['networkDomain'] = options[:domain] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'networkDomain', 'fieldLabel' => 'Network Domain', 'type' => 'select', 'required' => false, 'optionSource' => 'networkDomains'}], options[:options], @api_client, {})['networkDomain']
-        server_payload['hostname'] = options[:hostname] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'hostname', 'fieldLabel' => 'Hostname', 'type' => 'text', 'required' => true, 'description' => 'Hostname', 'defaultValue' => resourceName}], options[:options], @api_client)['hostname']
+        server_payload['networkDomain'] = options[:domain] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'networkDomain', 'fieldLabel' => 'Network Domain', 'type' => 'select', 'required' => false, 'optionSource' => 'networkDomains'}], options[:options], @api_client, api_params)['networkDomain']
+        server_payload['hostname'] = options[:hostname] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'hostname', 'fieldLabel' => 'Hostname', 'type' => 'text', 'required' => true, 'description' => 'Hostname', 'defaultValue' => resourceName}], options[:options], @api_client, api_params)['hostname']
 
         # Workflow / Automation
-        task_set_id = options[:taskSetId] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'taskSet', 'fieldLabel' => 'Workflow', 'type' => 'select', 'required' => false, 'optionSource' => 'taskSets'}], options[:options], @api_client, {'phase' => 'postProvision'})['taskSet']
+        task_set_id = options[:taskSetId] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'taskSet', 'fieldLabel' => 'Workflow', 'type' => 'select', 'required' => false, 'optionSource' => 'taskSets'}], options[:options], @api_client, api_params.merge({'phase' => 'postProvision'}))['taskSet']
 
         if !task_set_id.nil?
           server_payload['taskSet'] = {'id' => task_set_id}
@@ -1147,20 +1159,20 @@ class Morpheus::Cli::Clusters
           cloud_id = (default_cloud && cloud_id == default_cloud['name']) ? default_cloud['value'] : cloud_id
         end
 
+        # resources (zone pools)
+        cloud = @clouds_interface.get(cloud_id)['zone']
+        cloud['zoneType'] = get_cloud_type(cloud['zoneType']['id'])
+        group = @groups_interface.get(cluster['site']['id'])['group']
+
         server_payload['cloud'] = {'id' => cloud_id}
-        service_plan = prompt_service_plan(cloud_id, server_type['provisionType'], options)
+        service_plan = prompt_service_plan({zoneId: cloud_id, siteId: cluster['site']['id'], provisionTypeId: server_type['provisionType']['id'], groupTypeId: cluster_type['id'], }, options)
 
         if service_plan
           server_payload['plan'] = {'code' => service_plan['code'], 'options' => prompt_service_plan_options(service_plan, options)}
         end
 
-        # resources (zone pools)
-        cloud = @clouds_interface.get(cloud_id)['zone']
-        cloud['zoneType'] = get_cloud_type(cloud['zoneType']['id'])
-        group = @groups_interface.get(cluster['site']['id'])['group']
-
         if resource_pool = prompt_resource_pool(cluster, cloud, service_plan, server_type['provisionType'], options)
-          server_payload['config']['resourcePool'] = resource_pool['externalId']
+          server_payload['config']['resourcePoolId'] = resource_pool['id']
         end
 
         # Multi-disk / prompt for volumes
@@ -1181,7 +1193,7 @@ class Morpheus::Cli::Clusters
         server_payload['securityGroups'] = prompt_security_groups_by_cloud(cloud, provision_type, resource_pool, options)
 
         # Worker count
-        default_node_count = layout['computeServers'] ? (layout['computeServers'].find {|it| it['nodeType'] == 'worker'} || {'nodeCount' => 3})['nodeCount'] : 3
+        default_node_count = layout['computeServers'] ? (layout['computeServers'].find {|it| it['nodeType'] == 'worker'} || {'nodeCount' => 1})['nodeCount'] : 1
         server_payload['nodeCount'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => "nodeCount", 'type' => 'number', 'fieldLabel' => "#{cluster_type['code'].include?('docker') ? 'Host' : 'Worker'} Count", 'required' => true, 'defaultValue' => default_node_count}], options[:options], @api_client, {}, options[:no_prompt])["nodeCount"]
 
         # Options / Custom Config
@@ -3635,8 +3647,8 @@ class Morpheus::Cli::Clusters
     @server_types_interface.get(val)['serverType']
   end
 
-  def service_plans_for_dropdown(zone_id, provision_type_id)
-    @servers_interface.service_plans({zoneId: zone_id, provisionTypeId: provision_type_id})['plans'] rescue []
+  def service_plans_for_dropdown(api_params)
+    @servers_interface.service_plans(api_params)['plans'] rescue []
   end
 
   def namespace_service_plans
@@ -3679,10 +3691,10 @@ class Morpheus::Cli::Clusters
     @groups_interface.get(group_id)['group']
   end
 
-  def prompt_service_plan(zone_id, provision_type, options)
-    available_service_plans = service_plans_for_dropdown(zone_id, provision_type['id'])
+  def prompt_service_plan(api_params, options)
+    available_service_plans = service_plans_for_dropdown(api_params)
     if available_service_plans.empty?
-      print_red_alert "Cloud #{zone_id} has no available plans"
+      print_red_alert "Cloud #{api_params['zoneId']} has no available plans"
       exit 1
     end
     if options[:servicePlan]
@@ -3853,7 +3865,7 @@ class Morpheus::Cli::Clusters
         resource_pool = options[:resourcePool] ? find_cloud_resource_pool_by_name_or_id(cloud['id'], options[:resourcePool]) : nil
 
         if !resource_pool
-          resource_pool_options = @options_interface.options_for_source('zonePools', {groupId: group['id'], zoneId: cloud['id'], planId: (service_plan['id'] rescue nil)})['data'].reject { |it| it['id'].nil? && it['name'].nil? }
+          resource_pool_options = @options_interface.options_for_source('zonePools', {groupId: group['id'], zoneId: cloud['id']}.merge(service_plan ? {planId: service_plan['id']} : {}))['data'].reject { |it| it['id'].nil? && it['name'].nil? }
 
           if resource_pool_options.empty?
             print_red_alert "Cloud #{cloud['name']} has no available resource pools"

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

@@ -1,6 +1,4 @@
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'json'
 
 # This is for use in dotfile scripts
 # It allows you to turn colors on or off globally

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

@@ -1,11 +1,4 @@
-require 'io/console'
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/provisioning_helper'
-require 'morpheus/cli/mixins/logs_helper'
-require 'morpheus/cli/option_types'
 
 class Morpheus::Cli::ContainersCommand
   include Morpheus::Cli::CliCommand

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

@@ -1,7 +1,4 @@
-require 'optparse'
-require 'morpheus/logging'
 require 'morpheus/cli/cli_command'
-require 'json'
 
 class Morpheus::Cli::CurlCommand
   include Morpheus::Cli::CliCommand

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

@@ -1,4 +1,3 @@
-require 'json'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::CypherCommand

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

@@ -1,6 +1,4 @@
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'json'
 
 class Morpheus::Cli::DashboardCommand
   include Morpheus::Cli::CliCommand

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

@@ -1,5 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'morpheus/logging'
 
 # This is for use in dotfile scripts
 # It allows you to turn colors on or off globally

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

@@ -1,5 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'yaml'
 
 class Morpheus::Cli::Deploy
   include Morpheus::Cli::CliCommand

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

@@ -1,5 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'yaml'
 
 class Morpheus::Cli::Deploys
   include Morpheus::Cli::CliCommand

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

@@ -2,7 +2,7 @@ require 'morpheus/cli/cli_command'
 
 # This provides commands for authentication 
 # This also includes credential management.
-class Morpheus::Cli::DocCommand
+class Morpheus::Cli::Doc
   include Morpheus::Cli::CliCommand
 
   set_command_name :'doc'

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

@@ -1,6 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'term/ansicolor'
-require 'json'
 
 # This is for use in dotfile scripts for printing
 # It is also responsible for maintaining a map of variables

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

@@ -1,8 +1,6 @@
 require 'morpheus/cli/cli_command'
-require 'term/ansicolor'
-require 'json'
 
-# Command for editing the .morpheus_profile initalization script
+# Command for editing the .morpheus_profile initialization script
 class Morpheus::Cli::EditProfileCommand
   include Morpheus::Cli::CliCommand
   set_command_name :'edit-profile'
@@ -18,7 +16,20 @@ class Morpheus::Cli::EditProfileCommand
         editor = val
       end
       build_common_options(opts, options, [])
-      opts.footer = "Edit your interactive shell script at #{filename}"
+      opts.footer = <<-EOT
+Edit your .morpheus_profile script located in the morpheus home directory.
+This script runs whenever the morpheus terminal command is executed.
+It provides a way to initialize your cli environment for all morpheus commands.
+
+Example:
+
+# disable coloring to exclude ansi characters in output
+coloring off -q
+
+# Enable debugging to print extra output for troubleshooting
+debug on
+
+EOT
     end
     optparse.parse!(args)
 

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

@@ -1,6 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'term/ansicolor'
-require 'json'
 
 # Command for editing the .morpheus_profile initalization script
 class Morpheus::Cli::EditRcCommand
@@ -18,7 +16,25 @@ class Morpheus::Cli::EditRcCommand
         editor = val.gsub("'",'')
       end
       build_common_options(opts, options, [])
-      opts.footer = "Edit your morpheus initialization script at #{filename}"
+      opts.footer = <<-EOT
+Edit your .morpheusrc script located in the morpheus home directory.
+This script runs at the beginning of the interactive morpheus shell command.
+It provides a way to initialize your interactive morpheus shell environment.
+
+Example:
+
+# customize the morpheus shell prompt
+set-prompt "%cyan%username%reset@%magenta%remote %cyanmorpheus> %reset"
+
+# print the morpheus cli version
+version
+
+# print the current remote appliance version
+remote get current
+
+# greetings
+echo "Welcome back %username"
+EOT
     end
     optparse.parse!(args)
     

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

@@ -1,9 +1,4 @@
-require 'io/console'
-require 'rest_client'
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/option_types'
-require 'json'
 
 class Morpheus::Cli::EnvironmentsCommand
   include Morpheus::Cli::CliCommand

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

@@ -1,6 +1,4 @@
 require 'morpheus/cli/cli_command'
-# require 'morpheus/cli/mixins/provisioning_helper'
-# require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::ExecutionRequestCommand
   include Morpheus::Cli::CliCommand

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

@@ -1,6 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'term/ansicolor'
-require 'json'
 
 # Utility command for exiting a shell
 class Morpheus::Cli::ExitCommand

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

@@ -1,11 +1,7 @@
 require 'morpheus/cli/cli_command'
-# require 'morpheus/cli/mixins/provisioning_helper'
-# require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::FileCopyRequestCommand
   include Morpheus::Cli::CliCommand
-  # include Morpheus::Cli::InfrastructureHelper
-  # include Morpheus::Cli::ProvisioningHelper
 
   set_command_name :'file-copy-request'
 

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

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

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

@@ -1,11 +1,4 @@
-require 'fileutils'
-require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
-require 'morpheus/logging'
 
 class Morpheus::Cli::Groups
   include Morpheus::Cli::CliCommand

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

@@ -1,5 +1,5 @@
 require 'morpheus/cli/cli_command'
-require 'date'
+require 'date' #needed?
 
 class Morpheus::Cli::GuidanceCommand
   include Morpheus::Cli::CliCommand

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
@@ -553,7 +544,6 @@ class Morpheus::Cli::Hosts
       server_columns.delete("Cost") if server['hourlyCost'].to_f == 0
       server_columns.delete("Price") if server['hourlyPrice'].to_f == 0 || server['hourlyPrice'] == server['hourlyCost']
       server_columns.delete("Labels") if server['labels'].nil? || server['labels'].empty?
-      server_columns.delete("Tags") if tags.nil? || tags.empty?
 
       print_description_list(server_columns, server)
 

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