morpheus-cli 2.10.3 → 2.11.0

data/lib/morpheus/cli/deploys.rb

@@ -57,8 +57,7 @@ class Morpheus::Cli::Deploys
     end
     instance = instance_results['instances'][0]
     instance_id = instance['id']
-    print "\n" ,cyan, bold, "Morpheus Deployment\n","==================", reset, "\n\n"
-
+    print_h1 "Morpheus Deployment"
     if !deploy_args['script'].nil?
       print cyan, bold, "  - Executing Pre Deploy Script...", reset, "\n"
 

data/lib/morpheus/cli/dot_file.rb

@@ -7,9 +7,6 @@ require 'term/ansicolor'
 class Morpheus::Cli::DotFile
   include Term::ANSIColor
 
-  DEFAULT_EXEC_PROC = lambda {|args|
-
-  }
   EXPORTED_ALIASES_HEADER = "# exported aliases"
 
   # the path of the profile source file
@@ -25,9 +22,9 @@ class Morpheus::Cli::DotFile
   end
 
   attr_reader :filename
-  attr_reader :file_contents
-  attr_reader :commands
-  attr_reader :cmd_results
+  # attr_reader :file_contents
+  # attr_reader :commands
+  # attr_reader :cmd_results
 
   def initialize(fn)
     @filename = fn
@@ -44,9 +41,9 @@ class Morpheus::Cli::DotFile
     if !File.exists?(@filename)
       print "#{Term::ANSIColor.red}source file not found: #{@filename}#{Term::ANSIColor.reset}\n" # if Morpheus::Logging.debug?
     else
-      print "#{dark} #=> executing source file #{@filename}#{reset}\n" if Morpheus::Logging.debug?
+      Morpheus::Logging::DarkPrinter.puts "executing source file #{@filename}" if Morpheus::Logging.debug?
     end
-    file_contents ||= File.read(@filename)
+    file_contents = File.read(@filename)
     lines = file_contents.split("\n")
     cmd_results = []
     line_num = 0

data/lib/morpheus/cli/error_handler.rb

@@ -1,40 +1,204 @@
 require 'term/ansicolor'
 require 'optparse'
-#require 'rest_client'
+require 'json'
+require 'rest_client'
+require 'net/https'
 require 'morpheus/logging'
+require 'morpheus/cli/command_error'
+
 class Morpheus::Cli::ErrorHandler
-  include Morpheus::Cli::PrintHelper
+  include Term::ANSIColor
+
+  def initialize(io=$stderr)
+    @stderr = io
+  end
 
   def handle_error(err, options={})
+    exit_code = 1
     # heh
     if Morpheus::Logging.debug? && options[:debug].nil?
       options[:debug] = true
     end
+    do_print_stacktrace = true
     case (err)
-    when OptionParser::InvalidOption, OptionParser::AmbiguousOption, OptionParser::MissingArgument, OptionParser::InvalidArgument
+    when ::OptionParser::InvalidOption, ::OptionParser::AmbiguousOption, 
+        ::OptionParser::MissingArgument, ::OptionParser::InvalidArgument, 
+        ::OptionParser::NeedlessArgument
       # raise err
-      print_red_alert "#{err.message}"
-      puts "Try -h for help with this command."
+      # @stderr.puts "#{red}#{err.message}#{reset}"
+      puts_angry_error err.message
+      @stderr.puts "Try -h for help with this command."
+      do_print_stacktrace = false
+      # exit_code = 127
+    when Morpheus::Cli::CommandError
+      # @stderr.puts "#{red}#{err.message}#{reset}"
+      puts_angry_error err.message
+      do_print_stacktrace = false
+      # @stderr.puts "Try -h for help with this command."
+    when SocketError
+      @stderr.puts "#{red}Error Communicating with the Appliance.#{reset}"
+      @stderr.puts "#{red}#{err.message}#{reset}"
+    when RestClient::Exceptions::Timeout
+      @stderr.puts "#{red}Error Communicating with the Appliance.#{reset}"
+      @stderr.puts "#{red}#{err.message}#{reset}"
     when Errno::ECONNREFUSED
-      print_red_alert "#{err.message}"
-      # more special errors?
+      @stderr.puts "#{red}Error Communicating with the Appliance.#{reset}"
+      @stderr.puts "#{red}#{err.message}#{reset}"
+      # @stderr.puts "Try -h for help with this command."
     when OpenSSL::SSL::SSLError
-      print_red_alert "Error Communicating with the Appliance. #{err.message}"
+      @stderr.puts "#{red}Error Communicating with the Appliance.#{reset}"
+      @stderr.puts "#{red}#{err.message}#{reset}"
     when RestClient::Exception
       print_rest_exception(err, options)
     else
-      print_red_alert "Unexpected Error."
-      if !options[:debug]
-        print "Use --debug for more information.\n"
+      @stderr.puts "#{red}Unexpected Error#{reset}"
+    end
+
+    if do_print_stacktrace
+      if options[:debug]
+        if err.is_a?(Exception)
+          print_stacktrace(err)
+        else
+          @stderr.puts err.to_s
+        end
+      else
+        @stderr.puts "Use --debug for more information."
       end
     end
 
-    if options[:debug]
-      print Term::ANSIColor.red, "\n", "#{err.class}: #{err.message}", "\n", Term::ANSIColor.reset
-      print err.backtrace.join("\n"), "\n\n"
+    return exit_code
+
+  end
+
+  def print_stacktrace(err)
+    @stderr.print red, "\n", "#{err.class}: #{err.message}", "\n", reset
+    @stderr.print err.backtrace.join("\n"), "\n\n"
+  end
+
+  # def handle_rest_exception(err, io=@stderr)
+  #   if !err.is_a?(RestClient::Exception)
+  #     raise err
+  #   end
+  #   print_rest_exception(err, io=@stderr)    
+  # end
+
+
+  def print_rest_exception(err, options)
+    e = err
+    if err.response
+      if options[:debug]
+        begin
+          print_rest_exception_request_and_response(e)
+        ensure
+          @stderr.print reset
+        end
+        return
+      end
+      if err.response.code == 400
+        response = JSON.parse(err.response.to_s)
+        print_rest_errors(response, options)
+      else
+        @stderr.print red, "Error Communicating with the Appliance. #{e}", reset, "\n"
+        if options[:json] || options[:debug]
+          begin
+            response = JSON.parse(e.response.to_s)
+            # @stderr.print red
+            @stderr.print JSON.pretty_generate(response)
+            @stderr.print reset, "\n"
+          rescue TypeError, JSON::ParserError => ex
+            @stderr.print red, "Failed to parse JSON response: #{ex}", reset, "\n"
+            # @stderr.print red
+            @stderr.print response.to_s
+            @stderr.print reset, "\n"
+          ensure
+            @stderr.print reset
+          end
+        else
+          @stderr.puts "Use --debug for more information."
+        end
+      end
     else
-      #print "Use --debug for more information.\n"
+      @stderr.print red, "Error Communicating with the Appliance. #{e}", reset, "\n"
+    end
+  end
+
+  def print_rest_errors(response, options={})
+    begin
+      if options[:json]
+        @stderr.print red
+        @stderr.print JSON.pretty_generate(response)
+        @stderr.print reset, "\n"
+      else
+        if !response['success']
+          @stderr.print red,bold
+          if response['msg']
+            @stderr.puts response['msg']
+          end
+          if response['errors']
+            response['errors'].each do |key, value|
+              @stderr.print "* #{key}: #{value}\n"
+            end
+          end
+          @stderr.print reset
+        else
+          # this should not really happen
+          @stderr.print cyan,bold, "\nSuccess!"
+        end
+      end
+    ensure
+      @stderr.print reset
+    end
+  end
+
+  def print_rest_request(req)
+    @stderr.print "Request:"
+    @stderr.print "\n"
+    @stderr.print "#{req.method.to_s.upcase} #{req.url.inspect}"
+    @stderr.print "\n"
+  end
+
+  def print_rest_response(res)
+    # size = @raw_response ? File.size(@tf.path) : (res.body.nil? ? 0 : res.body.size)
+    size = (res.body.nil? ? 0 : res.body.size)
+    @stderr.print "Response:"
+    @stderr.print "\n"
+    display_size = Filesize.from("#{size} B").pretty rescue size
+    @stderr.print "HTTP #{res.net_http_res.code} - #{res.net_http_res.message} | #{(res['Content-type'] || '').gsub(/;.*$/, '')} #{display_size}"
+    @stderr.print "\n"
+    begin
+      @stderr.print JSON.pretty_generate(JSON.parse(res.body))
+    rescue
+      @stderr.print res.body.to_s
     end
+    @stderr.print "\n"
   end
 
+  def print_rest_exception_request_and_response(e)
+    @stderr.puts "#{red}Error Communicating with the Appliance. (#{e.response.code})#{reset}"
+    response = e.response
+    request = response.instance_variable_get("@request")
+    @stderr.print red
+    print_rest_request(request)
+    @stderr.print "\n"
+    print_rest_response(response)
+    @stderr.print reset
+  end
+
+
+protected
+  
+  def puts_angry_error(*msgs)
+    # @stderr.print "#{Term::ANSIColor.red}morpheus: #{Term::ANSIColor.reset}#{msg}\n"
+    @stderr.print(Morpheus::Terminal.angry_prompt)
+    @stderr.puts(*msgs)
+  end
+
+  # def puts(*args)
+  #   @stderr.puts(*args) 
+  # end
+
+  # def print(*args)
+  #   @stderr.print(*args)
+  # end
+
 end

data/lib/morpheus/cli/groups.rb

@@ -52,7 +52,7 @@ class Morpheus::Cli::Groups
         return
       end
       groups = json_response['groups']
-      print "\n" ,cyan, bold, "Morpheus Groups\n","==================", reset, "\n\n"
+      print_h1 "Morpheus Groups"
       if groups.empty?
         puts yellow,"No groups currently configured.",reset
       else
@@ -62,7 +62,7 @@ class Morpheus::Cli::Groups
           active_group = groups.find { |it| it['id'] == @active_group_id }
           active_group = active_group || find_group_by_name_or_id(@active_group_id)
           #unless @appliances.keys.size == 1
-            print cyan, "\n# => Currently using #{active_group['name']}\n", reset
+            print cyan, "\n# => Currently using group #{active_group['name']}\n", reset
           #end
         else
           unless options[:remote]
@@ -99,17 +99,24 @@ class Morpheus::Cli::Groups
         return
       end
       group = json_response['group']
-
       is_active = @active_group_id && (@active_group_id == group['id'])
-
-      print "\n" ,cyan, bold, "Group Details\n","==================", reset, "\n\n"
+      print_h1 "Group Details"
       print cyan
-      puts "ID: #{group['id']}"
-      puts "Name: #{group['name']}"
-      puts "Code: #{group['code']}"
-      puts "Location: #{group['location']}"
-      puts "Clouds: #{group['zones'].collect {|it| it['name'] }.join(', ')}"
-      puts "Hosts: #{group['serverCount']}"
+      description_cols = {
+        "ID" => 'id',
+        "Name" => 'name',
+        "Code" => 'code',
+        "Location" => 'location',
+        "Clouds" => lambda {|it| it['zones'].collect {|z| z['name'] }.join(', ') },
+        "Hosts" => 'serverCount'
+      }
+      print_description_list(description_cols, group)
+      # puts "ID: #{group['id']}"
+      # puts "Name: #{group['name']}"
+      # puts "Code: #{group['code']}"
+      # puts "Location: #{group['location']}"
+      # puts "Clouds: #{group['zones'].collect {|it| it['name'] }.join(', ')}"
+      # puts "Hosts: #{group['serverCount']}"
       if is_active
         puts "\n => This is the active group."
       end
@@ -441,7 +448,8 @@ class Morpheus::Cli::Groups
     if group
       print cyan,group['name'].to_s,"\n",reset
     else
-      print dark,"No active group. See `groups use`","\n",reset
+      print yellow,"No active group. See `groups use`","\n",reset
+      return false
     end
   end
 
@@ -539,7 +547,7 @@ public
     def load_group_file
       fn = groups_file_path
       if File.exist? fn
-        print "#{dark} #=> loading groups file #{fn}#{reset}\n" if Morpheus::Logging.debug?
+        Morpheus::Logging::DarkPrinter.puts "loading groups file #{fn}" if Morpheus::Logging.debug?
         return YAML.load_file(fn)
       else
         {}

data/lib/morpheus/cli/hosts.rb

@@ -44,7 +44,44 @@ class Morpheus::Cli::Hosts
       opts.on( '-c', '--cloud CLOUD', "Cloud Name or ID" ) do |val|
         options[:cloud] = val
       end
-      build_common_options(opts, options, [:list, :json, :dry_run, :remote])
+      opts.on( '-M', '--managed', "Show only Managed Servers" ) do |val|
+        params[:managed] = true
+      end
+      opts.on( '-U', '--unmanaged', "Show only Unmanaged Servers" ) do |val|
+        params[:managed] = false
+      end
+      opts.on( '-t', '--type TYPE', "Show only Certain Server Types" ) do |val|
+        params[:serverType] = val
+      end
+      opts.on( '-p', '--power STATE', "Filter by Power Status" ) do |val|
+        params[:powerState] = val
+      end
+      opts.on( '-i', '--ip IPADDRESS', "Filter by IP Address" ) do |val|
+        params[:ip] = val
+      end
+      opts.on( '', '--vm', "Show only virtual machines" ) do |val|
+        params[:vm] = true
+      end
+      opts.on( '', '--hypervisor', "Show only VM Hypervisors" ) do |val|
+        params[:vmHypervisor] = true
+      end
+      opts.on( '', '--container', "Show only Container Hypervisors" ) do |val|
+        params[:containerHypervisor] = true
+      end
+      opts.on( '', '--baremetal', "Show only Baremetal Servers" ) do |val|
+        params[:bareMetalHost] = true
+      end
+      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|
+        params[:agentInstalled] = true
+      end
+      opts.on( '', '--noagent', "Show only Servers with No agent" ) do |val|
+        params[:agentInstalled] = false
+      end
+      build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
     connect(options)
@@ -72,8 +109,27 @@ class Morpheus::Cli::Hosts
       json_response = @servers_interface.get(params)
 
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        if options[:include_fields]
+          json_response = {"servers" => filter_data(json_response["servers"], options[:include_fields]) }
+        end
+        puts as_json(json_response, options)
+        return 0
+      elsif options[:yaml]
+        if options[:include_fields]
+          json_response = {"servers" => filter_data(json_response["servers"], options[:include_fields]) }
+        end
+        puts as_yaml(json_response, options)
+        return 0
+      elsif options[:csv]
+        # merge stats to be nice here..
+        if json_response['servers']
+          all_stats = json_response['stats'] || {}
+          json_response['servers'].each do |it|
+            it['stats'] ||= all_stats[it['id'].to_s] || all_stats[it['id']]
+          end
+        end
+        puts records_as_csv(json_response['servers'], options)
+        return 0
       else
         servers = json_response['servers']
         title = "Morpheus Hosts"
@@ -87,12 +143,59 @@ class Morpheus::Cli::Hosts
         if params[:phrase]
           subtitles << "Search: #{params[:phrase]}".strip
         end
-        subtitle = subtitles.join(', ')
-        print "\n" ,cyan, bold, title, (subtitle.empty? ? "" : " - #{subtitle}"), "\n", "==================", reset, "\n\n"
+        print_h1 title, subtitles
         if servers.empty?
-          puts yellow,"No hosts found.",reset
+          print yellow,"No hosts found.",reset,"\n"
         else
-          print_servers_table(servers)
+          # print_servers_table(servers)
+          # server returns stats in a separate key stats => {"id" => {} }
+          # the id is a string right now..for some reason..
+          all_stats = json_response['stats'] || {} 
+          servers.each do |it|
+            found_stats = all_stats[it['id'].to_s] || all_stats[it['id']]
+            if !it['stats']
+              it['stats'] = found_stats # || {}
+            else
+              it['stats'] = found_stats.merge!(it['stats'])
+            end
+          end
+
+          rows = servers.collect {|server| 
+            stats = server['stats']
+            
+            if !stats['maxMemory']
+              stats['maxMemory'] = stats['usedMemory'] + stats['freeMemory']
+            end
+            cpu_usage_str = !stats ? "" : generate_usage_bar((stats['usedCpu'] || stats['cpuUsage']).to_f, 100, {max_bars: 10})
+            memory_usage_str = !stats ? "" : generate_usage_bar(stats['usedMemory'], stats['maxMemory'], {max_bars: 10})
+            storage_usage_str = !stats ? "" : generate_usage_bar(stats['usedStorage'], stats['maxStorage'], {max_bars: 10})
+            row = {
+              id: server['id'],
+              name: server['name'],
+              platform: server['serverOs'] ? server['serverOs']['name'].upcase : 'N/A',
+              cloud: server['zone'] ? server['zone']['name'] : '',
+              type: server['computeServerType'] ? server['computeServerType']['name'] : 'unmanaged',
+              nodes: server['containers'] ? server['containers'].size : '',
+              status: format_host_status(server, cyan),
+              power: format_server_power_state(server, cyan),
+              cpu: cpu_usage_str + cyan,
+              memory: memory_usage_str + cyan,
+              storage: storage_usage_str + cyan
+            }
+            row
+          }
+          columns = [:id, :name, :type, :cloud, :nodes, :status, :power]
+          term_width = current_terminal_width()
+          if term_width > 170
+            columns += [:cpu, :memory, :storage]
+          end
+          # custom pretty table columns ...
+          if options[:include_fields]
+            columns = options[:include_fields]
+          end
+          print cyan
+          print as_pretty_table(rows, columns, options)
+          print reset
           print_results_pagination(json_response)
         end
         print reset,"\n"
@@ -107,7 +210,7 @@ class Morpheus::Cli::Hosts
     options = {}
     optparse = OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:json, :dry_run, :remote])
+      build_common_options(opts, options, [:json, :csv, :yaml, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
     if args.count < 1
@@ -115,58 +218,65 @@ class Morpheus::Cli::Hosts
       exit 1
     end
     connect(options)
+    id_list = parse_id_list(args)
+    return run_command_for_each_arg(id_list) do |arg|
+      _get(arg, options)
+    end
+  end
+
+  def _get(arg, options)
     begin
       if options[:dry_run]
-        if args[0].to_s =~ /\A\d{1,}\Z/
-          print_dry_run @servers_interface.dry.get(args[0].to_i)
+        if arg.to_s =~ /\A\d{1,}\Z/
+          print_dry_run @servers_interface.dry.get(arg.to_i)
         else
-          print_dry_run @servers_interface.dry.get({name: args[0]})
+          print_dry_run @servers_interface.dry.get({name: arg})
         end
         return
       end
-      server = find_host_by_name_or_id(args[0])
+      server = find_host_by_name_or_id(arg)
       json_response = @servers_interface.get(server['id'])
       if options[:json]
-        print JSON.pretty_generate(json_response), "\n"
-        return
+        if options[:include_fields]
+          json_response = {"server" => filter_data(json_response["server"], options[:include_fields]) }
+        end
+        puts as_json(json_response, options)
+        return 0
+      elsif options[:yaml]
+        if options[:include_fields]
+          json_response = {"server" => filter_data(json_response["server"], options[:include_fields]) }
+        end
+        puts as_yaml(json_response, options)
+        return 0
+      end
+      if options[:csv]
+        puts records_as_csv([json_response['server']], options)
+        return 0
       end
       server = json_response['server']
       #stats = server['stats'] || json_response['stats'] || {}
       stats = json_response['stats'] || {}
-
-      print "\n" ,cyan, bold, "Host Details\n","==================", reset, "\n\n"
+      title = "Host Details"
+      print_h1 title
       print cyan
-      puts "ID: #{server['id']}"
-      puts "Name: #{server['name']}"
-      puts "Description: #{server['description']}"
-      puts "Account: #{server['account'] ? server['account']['name'] : ''}"
-      #puts "Group: #{server['group'] ? server['group']['name'] : ''}"
-      #puts "Cloud: #{server['cloud'] ? server['cloud']['name'] : ''}"
-      puts "Cloud: #{server['zone'] ? server['zone']['name'] : ''}"
-      puts "Nodes: #{server['containers'] ? server['containers'].size : ''}"
-      puts "Type: #{server['computeServerType'] ? server['computeServerType']['name'] : 'unmanaged'}"
-      puts "Platform: #{server['serverOs'] ? server['serverOs']['name'].upcase : 'N/A'}"
-      puts "Plan: #{server['plan'] ? server['plan']['name'] : ''}"
-      if server['agentInstalled']
-        puts "Agent: #{server['agentVersion'] || ''} updated at #{format_local_dt(server['lastAgentUpdate'])}"
-      else
-        puts "Agent: (not installed)"
-      end
-      puts "Status: #{format_host_status(server)}"
-      puts "Power: #{format_server_power_state(server)}"
-      if ((stats['maxMemory'].to_i != 0) || (stats['maxStorage'].to_i != 0))
-        # stats_map = {}
-        print "\n"
-        #print "\n" ,cyan, bold, "Host Stats\n","==================", reset, "\n\n"
-        # stats_map[:memory] = "#{Filesize.from("#{stats['usedMemory']} B").pretty} / #{Filesize.from("#{stats['maxMemory']} B").pretty}"
-        # stats_map[:storage] = "#{Filesize.from("#{stats['usedStorage']} B").pretty} / #{Filesize.from("#{stats['maxStorage']} B").pretty}"
-        # stats_map[:cpu] = "#{stats['cpuUsage'].to_f.round(2)}%"
-        # tp [stats_map], :memory,:storage,:cpu
-        print_stats_usage(stats)
-      else
-        #print yellow, "No stat data.", reset
-      end
-
+      print_description_list({
+        "ID" => 'id',
+        "Name" => 'name',
+        "Description" => 'description',
+        "Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+        #"Group" => lambda {|it| it['group'] ? it['group']['name'] : '' },
+        "Cloud" => lambda {|it| it['zone'] ? it['zone']['name'] : '' },
+        "Type" => lambda {|it| it['computeServerType'] ? it['computeServerType']['name'] : 'unmanaged' },
+        "Platform" => lambda {|it| it['serverOs'] ? it['serverOs']['name'].upcase : 'N/A' },
+        "Plan" => lambda {|it| it['plan'] ? it['plan']['name'] : '' },
+        "Agent" => lambda {|it| it['agentInstalled'] ? "#{server['agentVersion'] || ''} updated at #{format_local_dt(server['lastAgentUpdate'])}" : '(not installed)' },
+        "Status" => lambda {|it| format_host_status(it) },
+        "Nodes" => lambda {|it| it['containers'] ? it['containers'].size : 0 },
+        "Power" => lambda {|it| format_server_power_state(it) },
+      }, server)
+      
+      print_h2 "Host Usage"
+      print_stats_usage(stats)
       print reset, "\n"
 
     rescue RestClient::Exception => e
@@ -179,7 +289,7 @@ class Morpheus::Cli::Hosts
     options = {}
     optparse = OptionParser.new do|opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:json, :dry_run, :remote])
+      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
     if args.count < 1
@@ -187,43 +297,51 @@ class Morpheus::Cli::Hosts
       exit 1
     end
     connect(options)
+    ids = args
+    id_list = parse_id_list(args)
+    return run_command_for_each_arg(id_list) do |arg|
+      _stats(arg, options)
+    end
+  end
+
+  def _stats(arg, options)
     begin
       if options[:dry_run]
-        if args[0].to_s =~ /\A\d{1,}\Z/
-          print_dry_run @servers_interface.dry.get(args[0].to_i)
+        if arg.to_s =~ /\A\d{1,}\Z/
+          print_dry_run @servers_interface.dry.get(arg.to_i)
         else
-          print_dry_run @servers_interface.dry.get({name: args[0]})
+          print_dry_run @servers_interface.dry.get({name: arg})
         end
         return
       end
-      server = find_host_by_name_or_id(args[0])
+      server = find_host_by_name_or_id(arg)
       json_response = @servers_interface.get(server['id'])
       if options[:json]
         print JSON.pretty_generate(json_response), "\n"
-        return
+        return 0
+      elsif options[:yaml]
+        if options[:include_fields]
+          json_response = {"stats" => filter_data(json_response["stats"], options[:include_fields]) }
+        end
+        puts as_yaml(json_response, options)
+        return 0
+      elsif options[:csv]
+        puts records_as_csv([json_response['stats']], options)
+        return 0
       end
       server = json_response['server']
       #stats = server['stats'] || json_response['stats'] || {}
       stats = json_response['stats'] || {}
-
-      print "\n" ,cyan, bold, "Host Stats: #{server['name']} (#{server['computeServerType'] ? server['computeServerType']['name'] : 'unmanaged'})\n","==================", "\n\n", reset, cyan
-      puts "Status: #{format_host_status(server)}"
-      puts "Power: #{format_server_power_state(server)}"
-      if ((stats['maxMemory'].to_i != 0) || (stats['maxStorage'].to_i != 0))
-        # stats_map = {}
-        print "\n"
-        #print "\n" ,cyan, bold, "Host Stats\n","==================", reset, "\n\n"
-        # stats_map[:memory] = "#{Filesize.from("#{stats['usedMemory']} B").pretty} / #{Filesize.from("#{stats['maxMemory']} B").pretty}"
-        # stats_map[:storage] = "#{Filesize.from("#{stats['usedStorage']} B").pretty} / #{Filesize.from("#{stats['maxStorage']} B").pretty}"
-        # stats_map[:cpu] = "#{stats['cpuUsage'].to_f.round(2)}%"
-        # tp [stats_map], :memory,:storage,:cpu
-        print_stats_usage(stats)
-      else
-        #print yellow, "No stat data.", reset
-      end
+      title = "Host Stats: #{server['name']} (#{server['computeServerType'] ? server['computeServerType']['name'] : 'unmanaged'})"
+      print_h1 title
+      puts cyan + "Power: ".rjust(12) + format_server_power_state(server).to_s
+      puts cyan + "Status: ".rjust(12) + format_host_status(server).to_s
+      puts cyan + "Nodes: ".rjust(12) + (server['containers'] ? server['containers'].size : '').to_s
+      #print_h2 "Host Usage"
+      print_stats_usage(stats, {label_width: 10})
 
       print reset, "\n"
-
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -243,36 +361,47 @@ class Morpheus::Cli::Hosts
     end
     connect(options)
     begin
-      host = find_host_by_name_or_id(args[0])
+      server = find_host_by_name_or_id(args[0])
       params = {}
       [:phrase, :offset, :max, :sort, :direction].each do |k|
         params[k] = options[k] unless options[k].nil?
       end
       params[:query] = params.delete(:phrase) unless params[:phrase].nil?
       if options[:dry_run]
-        print_dry_run @logs_interface.dry.server_logs([host['id']], params)
+        print_dry_run @logs_interface.dry.server_logs([server['id']], params)
         return
       end
-      logs = @logs_interface.server_logs([host['id']], params)
+      logs = @logs_interface.server_logs([server['id']], params)
       output = ""
       if options[:json]
         output << JSON.pretty_generate(logs)
       else
-        logs['data'].reverse.each do |log_entry|
-          log_level = ''
-          case log_entry['level']
-          when 'INFO'
-            log_level = "#{blue}#{bold}INFO#{reset}"
-          when 'DEBUG'
-            log_level = "#{white}#{bold}DEBUG#{reset}"
-          when 'WARN'
-            log_level = "#{yellow}#{bold}WARN#{reset}"
-          when 'ERROR'
-            log_level = "#{red}#{bold}ERROR#{reset}"
-          when 'FATAL'
-            log_level = "#{red}#{bold}FATAL#{reset}"
+        title = "Host Logs: #{server['name']} (#{server['computeServerType'] ? server['computeServerType']['name'] : 'unmanaged'})"
+        subtitles = []
+        if params[:query]
+          subtitles << "Search: #{params[:query]}".strip
+        end
+        # todo: startMs, endMs, sorts insteaad of sort..etc
+        print_h1 title, subtitles
+        if logs['data'].empty?
+          output << "#{cyan}No logs found.#{reset}\n"
+        else
+          logs['data'].reverse.each do |log_entry|
+            log_level = ''
+            case log_entry['level']
+            when 'INFO'
+              log_level = "#{blue}#{bold}INFO#{reset}"
+            when 'DEBUG'
+              log_level = "#{white}#{bold}DEBUG#{reset}"
+            when 'WARN'
+              log_level = "#{yellow}#{bold}WARN#{reset}"
+            when 'ERROR'
+              log_level = "#{red}#{bold}ERROR#{reset}"
+            when 'FATAL'
+              log_level = "#{red}#{bold}FATAL#{reset}"
+            end
+            output << "[#{log_entry['ts']}] #{log_level} - #{log_entry['message']}\n"
           end
-          output << "[#{log_entry['ts']}] #{log_level} - #{log_entry['message']}\n"
         end
       end
       print output, reset, "\n"
@@ -305,9 +434,9 @@ class Morpheus::Cli::Hosts
       print JSON.pretty_generate(cloud_server_types)
       print "\n"
     else
-      print "\n" ,cyan, bold, "Morpheus Server Types - Cloud: #{zone['name']}\n","==================", reset, "\n\n"
+      print_h1 "Morpheus Server Types - Cloud: #{zone['name']}"
       if cloud_server_types.nil? || cloud_server_types.empty?
-        puts yellow,"No server types found for the selected cloud.",reset
+        print yellow,"No server types found for the selected cloud",reset,"\n"
       else
         cloud_server_types.each do |server_type|
           print cyan, "[#{server_type['code']}]".ljust(20), " - ", "#{server_type['name']}", "\n"
@@ -424,7 +553,7 @@ class Morpheus::Cli::Hosts
           payload[:networkInterfaces] = network_interfaces
         end
       rescue RestClient::Exception => e
-        print_yellow_warning "Unable to load network options. Proceeding..."
+        print yellow,"Unable to load network options. Proceeding...",reset,"\n"
         print_rest_exception(e, options) if Morpheus::Logging.debug?
       end
     end
@@ -644,7 +773,7 @@ class Morpheus::Cli::Hosts
       #       payload[:networkInterfaces] = network_interfaces
       #     end
       #   rescue RestClient::Exception => e
-      #     print_yellow_warning "Unable to load network options. Proceeding..."
+      #     print yellow,"Unable to load network options. Proceeding...",reset,"\n"
       #     print_rest_exception(e, options) if Morpheus::Logging.debug?
       #   end
       # end
@@ -898,25 +1027,6 @@ class Morpheus::Cli::Hosts
     end
   end
 
-  def print_servers_table(servers, opts={})
-    table_color = opts[:color] || cyan
-    rows = servers.collect do |server|
-      {
-        id: server['id'],
-        name: server['name'],
-        platform: server['serverOs'] ? server['serverOs']['name'].upcase : 'N/A',
-        cloud: server['zone'] ? server['zone']['name'] : '',
-        type: server['computeServerType'] ? server['computeServerType']['name'] : 'unmanaged',
-        nodes: server['containers'] ? server['containers'].size : '',
-        status: format_host_status(server, table_color),
-        power: format_server_power_state(server, table_color)
-      }
-    end
-    columns = [:id, :name, :type, :cloud, :nodes, :status, :power]
-    print table_color
-    tp rows, columns
-    print reset
-  end
 
   def format_server_power_state(server, return_color=cyan)
     out = ""