morpheus-cli 5.0.0 → 5.2.2

data/lib/morpheus/cli/commands/standard/curl_command.rb

@@ -26,8 +26,8 @@ class Morpheus::Cli::CurlCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = "Usage: morpheus curl [path] -- [*args]"
-      opts.on( '-p', '--pretty', "Print result as parsed JSON." ) do
-        options[:pretty] = true
+      opts.on( '-p', '--pretty', "Print result as parsed JSON. Alias for -j" ) do
+        options[:json] = true
       end
       opts.on( '-X', '--request METHOD', "HTTP request method. Default is GET" ) do |val|
         curl_method = val
@@ -41,7 +41,7 @@ class Morpheus::Cli::CurlCommand
       opts.on( '--progress', '--progress', "Display progress output by excluding the -s option." ) do
         show_progress = true
       end
-      build_common_options(opts, options, [:dry_run, :remote])
+      build_common_options(opts, options, [:dry_run, :json, :remote])
       opts.add_hidden_option('--curl')
       #opts.add_hidden_option('--scrub')
       opts.footer = <<-EOT
@@ -134,31 +134,44 @@ EOT
       print reset
       return 0
     end
+    exit_code, err = 0, nil
     # print cyan
     # print "#{cyan}#{curl_cmd_str}#{reset}"
     # print "\n\n"
     print reset
     # print result
     curl_output = `#{curl_cmd}`
-    if options[:pretty]
+
+    if $?.success? != true
+      exit_code = $?.exitstatus
+      err = "curl command exited non-zero"
+    end
+    json_response = {}
+    other_output = nil
+    if options[:json] || options[:yaml] || options[:csv]
       output_lines = curl_output.split("\n")
       last_line = output_lines.pop
       if output_lines.size > 0
-        puts output_lines.join("\n")
+        other_output = output_lines.join("\n")
       end
       begin
-        json_data = JSON.parse(last_line)
-        json_string = JSON.pretty_generate(json_data)
-        puts json_string
+        json_response = JSON.parse(last_line)
       rescue => ex
-        Morpheus::Logging::DarkPrinter.puts "failed to parse curl result as JSON data Error: #{ex.message}" if Morpheus::Logging.debug?
-        puts last_line
+        puts_error curl_output
+        print_red_alert "failed to parse curl result as JSON data Error: #{ex.message}"
+
+        exit_code = 2
+        err = "failed to parse curl result as JSON data Error: #{ex.message}"
+        return exit_code, err
       end
     else
-      puts curl_output
+      other_output = curl_output
     end
-    return $?.success?
-
+    curl_object_key = nil # json_response.keys.first
+    render_response(json_response, options, curl_object_key) do
+      puts other_output
+    end
+    return exit_code, err
   end
 
   def command_available?(cmd)

data/lib/morpheus/cli/commands/standard/history_command.rb

@@ -6,14 +6,16 @@ require 'morpheus/cli/cli_command'
 class Morpheus::Cli::HistoryCommand
   include Morpheus::Cli::CliCommand
   set_command_name :'history'
-  set_command_hidden
+  set_command_description "View morpheus shell command history"
+  # hidden for now because it is a shell command, shouldnt just be shell command though
+  set_command_hidden 
 
   # todo: support all the other :list options too, not just max
   # AND start logging every terminal command, not just shell...
   def handle(args)
     options = {show_pagination:false}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
-      opts.banner = "Usage: morpheus #{command_name}"
+      opts.banner = "Usage: morpheus #{command_name} [search]"
       # -n is a hidden alias for -m
       opts.on( '-n', '--max-commands MAX', "Alias for -m, --max option." ) do |val|
         options[:max] = val
@@ -33,6 +35,7 @@ The --flush option can be used to purge the history.
 Examples: 
     history
     history -m 100
+    history "instances list"
     history --flush
 
 The most recently executed commands are seen by default.  Use --reverse to see the oldest commands.
@@ -40,7 +43,10 @@ EOT
     end
     raw_cmd = "#{command_name} #{args.join(' ')}"
     optparse.parse!(args)
-    verify_args!(args:args, count: 0, optparse:optparse)
+    # verify_args!(args:args, count: 0, optparse:optparse)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
     if options[:do_flush]
       command_count = Morpheus::Cli::Shell.instance.history_commands_count
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to flush your command history (#{format_number(command_count)} #{command_count == 1 ? 'command' : 'commands'})?")

data/lib/morpheus/cli/commands/standard/man_command.rb

@@ -9,7 +9,7 @@ class Morpheus::Cli::ManCommand
 
   # this should be read only anyway...
   @@default_editor = "less" # ENV['EDITOR']
-  
+
   def handle(args)
     options = {}
     regenerate = false
@@ -28,6 +28,12 @@ class Morpheus::Cli::ManCommand
       opts.on('-g','--generate', "Regenerate the manual file") do
         regenerate = true
       end
+      opts.on('-o','--out FILE', "Write manual file to a custom location") do |val|
+        options[:outfile] = val
+      end
+      opts.on('--overwrite', '--overwrite', "Overwrite output file if it already exists.") do |val|
+        options[:overwrite] = true
+      end
       opts.on('-q','--quiet', "Do not open manual, for use with the -g option.") do
         options[:quiet] = true
       end
@@ -47,7 +53,8 @@ class Morpheus::Cli::ManCommand
       end
       opts.footer = <<-EOT
 Open the morpheus manual located at #{Morpheus::Cli::ManCommand.man_file_path}
-The -g switch be used to regenerate the file.
+The -g option can be used to regenerate the file.
+The --out FILE option be used to write the manual file to a custom location.
 EOT
     end
     optparse.parse!(args)
@@ -65,18 +72,35 @@ EOT
     end
 
     fn = Morpheus::Cli::ManCommand.man_file_path
+    if options[:outfile]
+      regenerate = true
+      fn = File.expand_path(options[:outfile])
+      if File.directory?(fn)
+        # if you give me a directory, could still work and use the default filename
+        # fn = File.join(fn, "CLI-Manual-#{Morpheus::Cli::VERSION}.md")
+        # raise_command_error "outfile is invalid. It is the name of an existing directory: #{fn}"
+        print_error "#{red}Output file '#{fn}' is invalid.#{reset}\n"
+        print_error "#{red}It is the name of an existing directory.#{reset}\n"
+        return 1
+      end
+      if File.exists?(fn) && options[:overwrite] != true
+        print_error "#{red}Output file '#{fn}' already exists.#{reset}\n"
+        print_error "#{red}Use --overwrite to overwrite the existing file.#{reset}\n"
+        return 1
+      end
+    end
+    exit_code, err = 0, nil
     if regenerate || !File.exists?(fn)
       #Morpheus::Logging::DarkPrinter.puts "generating manual #{fn} ..." if Morpheus::Logging.debug? && !options[:quiet]
-      Morpheus::Cli::ManCommand.generate_manual(options)
+      exit_code, err = Morpheus::Cli::ManCommand.generate_manual(options)
     end
     
     if options[:quiet]
-      return 0, nil
+      return exit_code, err
     end
     
     Morpheus::Logging::DarkPrinter.puts "opening manual file #{fn}" if Morpheus::Logging.debug? && !options[:quiet]
     
-    
     if open_as_link # not used atm
       link = "file://#{fn}"
       if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
@@ -138,6 +162,14 @@ EOT
     # todo: use pandoc or something else to convert the CLI-Manual.md to a man page
     # and install it, so the os command `man morpheus` will work too.
     fn = man_file_path()
+    if options[:outfile]
+      fn = File.expand_path(options[:outfile])
+      if File.exists?(fn) && options[:overwrite] != true
+        print_error "#{red}Output file '#{options[:outfile]}' already exists.#{reset}\n"
+        print_error "#{red}Use --overwrite to overwrite the existing file.#{reset}\n"
+        return 1, "output file already exists"
+      end
+    end
     if !Dir.exists?(File.dirname(fn))
       FileUtils.mkdir_p(File.dirname(fn))
     end
@@ -153,7 +185,7 @@ EOT
     begin
 
       manpage.print <<-ENDTEXT
-morpheus v#{Morpheus::Cli::VERSION}
+#{prog_name} v#{Morpheus::Cli::VERSION}
 
 ## NAME
 
@@ -170,17 +202,17 @@ morpheus v#{Morpheus::Cli::VERSION}
     This is a command line interface for managing a Morpheus Appliance.
     All communication with the remote appliance is done via the Morpheus API.
 
-    To get started, see the command `remote add` command.
+    Use the command `#{prog_name} remote add` to connect to your Morpheus appliance.
 
     To learn more, visit https://github.com/gomorpheus/morpheus-cli/wiki/Getting-Started
 
-    To learn more about the Morpheus Appliance, visit https://www.morpheusdata.com/features
+    To learn more about the Morpheus Appliance, visit https://www.morpheusdata.com
 
     To learn more about the Morpheus API, visit https://apidocs.morpheusdata.com
 
 ## GLOBAL OPTIONS
 
-    Morpheus supports a few global options.
+    There are several global options available.
 
     -v, --version                    Print the version.
         --noprofile                  Do not read and execute the personal initialization script .morpheus_profile
@@ -190,30 +222,42 @@ morpheus v#{Morpheus::Cli::VERSION}
 
 ## COMMON OPTIONS
 
-    There are some common options that many commands support. They work the same way for each command.
+    There are many common options that are supported by a most commands.
 
     -O, --option OPTION              Option value in the format -O var="value" (deprecated soon in favor of first class options)
     -N, --no-prompt                  Skip prompts. Use default values for all optional fields.
+        --payload FILE               Payload from a local JSON or YAML file, skip all prompting
+        --payload-dir DIRECTORY      Payload from a local directory containing 1-N JSON or YAML files, skip all prompting
+        --payload-json JSON          Payload JSON, skip all prompting
+        --payload-yaml YAML          Payload YAML, skip all prompting
     -j, --json                       JSON Output
     -d, --dry-run                    Dry Run, print the API request instead of executing it
-    -r, --remote REMOTE              Remote Appliance Name to use for this command. The active appliance is used by default.
-    -I, --insecure                   Allow for insecure HTTPS communication i.e. bad SSL certificate       
-    -y, --yes                        Auto confirm, skip any 'Are you sure?' confirmations.
-    -r, --quiet                      No Output, when successful.
+        --curl                       Dry Run to output API request as a curl command.
+        --scrub                      Mask secrets in output, such as the Authorization header. For use with --curl and --dry-run.
+    -r, --remote REMOTE              Remote name. The current remote is used by default.
+        --remote-url URL             Remote url. This allows adhoc requests instead of using a configured remote.
+    -T, --token TOKEN                Access token for authentication with --remote. Saved credentials are used by default.
+    -U, --username USERNAME          Username for authentication.
+    -P, --password PASSWORD          Password for authentication.
+    -I, --insecure                   Allow insecure HTTPS communication.  i.e. bad SSL certificate.
+    -H, --header HEADER              Additional HTTP header to include with requests.
+        --timeout SECONDS            Timeout for api requests. Default is typically 30 seconds.
+    -y, --yes                        Auto Confirm
+    -q, --quiet                      No Output, do not print to stdout
 
 ## MORPHEUS COMMANDS
 
-    We divide morpheus into commands.  
-    Every morpheus command may have 0-N sub-commands that it supports. 
+    The morpheus executable is divided into commands.
+    Each morpheus command may have 0-N sub-commands that it supports. 
     Commands generally map to the functionality provided in the Morpheus UI.
        
     You can get help for any morpheus command by using the -h option.
 
-    The available commands and their options are also documented below.
+    The available commands and their options are documented below.
 ENDTEXT
       
       terminal = Morpheus::Terminal.new($stdin, manpage)
-      Morpheus::Logging::DarkPrinter.puts "appending command help `morpheus --help`" if Morpheus::Logging.debug? && !options[:quiet]
+      Morpheus::Logging::DarkPrinter.puts "appending command help `#{prog_name} --help`" if Morpheus::Logging.debug? && !options[:quiet]
 
       manpage.print "\n"
       manpage.print "## morpheus\n"
@@ -226,7 +270,7 @@ ENDTEXT
       Morpheus::Cli::CliRegistry.all.keys.sort.each do |cmd|
         cmd_klass = Morpheus::Cli::CliRegistry.instance.get(cmd)
         cmd_instance = cmd_klass.new
-        Morpheus::Logging::DarkPrinter.puts "appending command help `morpheus #{cmd} --help`" if Morpheus::Logging.debug? && !options[:quiet]
+        Morpheus::Logging::DarkPrinter.puts "appending command help `#{prog_name} #{cmd} --help`" if Morpheus::Logging.debug? && !options[:quiet]
         #help_cmd = "morpheus #{cmd} --help"
         #help_output = `#{help_cmd}`
         manpage.print "\n"
@@ -243,7 +287,7 @@ ENDTEXT
         subcommands = cmd_klass.visible_subcommands
         if subcommands && subcommands.size > 0
           subcommands.sort.each do |subcommand, subcommand_method|
-            Morpheus::Logging::DarkPrinter.puts "appending command help `morpheus #{cmd} #{subcommand} --help`" if Morpheus::Logging.debug? && !options[:quiet]
+            Morpheus::Logging::DarkPrinter.puts "appending command help `#{prog_name} #{cmd} #{subcommand} --help`" if Morpheus::Logging.debug? && !options[:quiet]
             manpage.print "\n"
             manpage.print "#### morpheus #{cmd} #{subcommand}\n"
             manpage.print "\n"
@@ -289,7 +333,7 @@ morpheus> remote list
 Morpheus Appliances
 ==================
 
-You have no appliances configured. See the `remote add` command.
+You have no appliances configured. See the `#{prog_name} remote add` command.
 
 ```
 
@@ -319,11 +363,10 @@ The `appliances` YAML file contains a list of known appliances, keyed by name.
 Example:
 ```yaml
 :qa:
-  :host: https://qa.mycoolsite.com
+  :host: https://qa.mymorpheus.com
   :active: true
 :production:
-  :host: https://morpheus.mycoolsite.com
-  :active: false
+  :host: https://mymorpheus.com
 ```
 
 ### credentials file
@@ -349,7 +392,7 @@ This may be inhibited by using the `--noprofile` option.
 
 ### .morpheusrc file
 
-When started as an interactive shell with the `morpheus shell` command,
+When started as an interactive shell with the `#{prog_name} shell` command,
 Morpheus reads and executes `$MORPHEUS_CLI_HOME/.morpheusrc` (if it exists). This may be inhibited by using the `--norc` option. 
 
 An example startup script might look like this:
@@ -357,20 +400,11 @@ An example startup script might look like this:
 ```
 # .morpheusrc
 
-# aliases
-alias our-instances='instances list -c "Our Cloud"'
-
-# switch to our appliance that we created with `remote add morphapp1`
-remote use morphapp1
-
-# greeting
-echo "Welcome back human,  have fun!"
-
-# print current user information
-whoami
-
-# print the list of instances in our cloud
-our-instances
+set-prompt "%cyan%username%reset@%magenta%remote %cyanmorpheus> %reset"
+version
+remote current
+echo "Welcome back %username"
+echo
 
 ```
 
@@ -383,7 +417,7 @@ ENDTEXT
       terminal = Morpheus::Terminal.new()
     end
 
-    return true
+    return 0, nil
   end
 
 end

data/lib/morpheus/cli/containers_command.rb

@@ -699,28 +699,4 @@ private
     end
   end
 
-  def format_container_status(container, return_color=cyan)
-    out = ""
-    status_string = container['status'].to_s
-    if status_string == 'running'
-      out << "#{green}#{status_string.upcase}#{return_color}"
-    elsif status_string == 'stopped' or status_string == 'failed'
-      out << "#{red}#{status_string.upcase}#{return_color}"
-    elsif status_string == 'unknown'
-      out << "#{white}#{status_string.upcase}#{return_color}"
-    else
-      out << "#{yellow}#{status_string.upcase}#{return_color}"
-    end
-    out
-  end
-
-  def format_container_connection_string(container)
-    if !container['ports'].nil? && container['ports'].empty? == false
-      connection_string = "#{container['ip']}:#{container['ports'][0]['external']}"
-    else
-      # eh? more logic needed here i think, see taglib morph:containerLocationMenu
-      connection_string = "#{container['ip']}"
-    end
-  end
-
 end

data/lib/morpheus/cli/cypher_command.rb

@@ -265,6 +265,9 @@ EOT
       opts.on( '-v', '--value VALUE', "Secret value. This can be used to store a string instead of an object, and can also be passed as the second argument." ) do |val|
         item_value = val
       end
+      # opts.on( '--type VALUE', String, "Type, default is based on key engine, string or object" ) do |val|
+      #   params['type'] = val
+      # end
       opts.on( '-t', '--ttl SECONDS', "Time to live, the lease duration before this key expires." ) do |val|
         ttl = val
         if val.to_s.empty? || val.to_s == '0'
@@ -276,7 +279,7 @@ EOT
       # opts.on( '--no-overwrite', '--no-overwrite', "Do not overwrite existing keys. Existing keys are overwritten by default." ) do
       #   params['overwrite'] = false
       # end
-      build_common_options(opts, options, [:auto_confirm, :options, :payload, :json, :yaml, :csv, :fields, :outfile, :dry_run, :quiet, :remote])
+      build_common_options(opts, options, [:auto_confirm, :options, :payload, :query, :json, :yaml, :csv, :fields, :outfile, :dry_run, :quiet, :remote])
       opts.footer = "Create or update a cypher key." + "\n" +
                     "[key] is required. This is the key of the cypher being created or updated. The key includes the mount prefix eg. secret/hello" + "\n" +
                     "[value] is required for some cypher engines, such as secret. This is the secret value or k=v pairs being stored. Supports 1-N arguments." + "\n" +
@@ -292,7 +295,8 @@ EOT
     #   return 1
     # end
     connect(options)
-    
+    params.merge!(parse_query_options(options))
+
     # parse arguments like [value] or [k=v]
     if args.count == 0
       # prompt for key and value

data/lib/morpheus/cli/dashboard_command.rb

@@ -4,8 +4,9 @@ require 'json'
 
 class Morpheus::Cli::DashboardCommand
   include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::ProvisioningHelper
   set_command_name :dashboard
-  set_command_hidden # remove once this is done
+  set_command_description "View Morpheus Dashboard"
 
   def initialize()
     # @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
@@ -28,34 +29,273 @@ class Morpheus::Cli::DashboardCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = usage
-      build_common_options(opts, options, [:json, :dry_run]) # todo: support :account
+      opts.on('-a', '--details', "Display all details: more instance usage stats, etc" ) do
+        options[:details] = true
+      end
+      build_standard_list_options(opts, options)
+      opts.footer = <<-EOT
+View Morpheus Dashboard.
+This includes instance and backup counts, favorite instances, monitoring and recent activity.
+      EOT
     end
     optparse.parse!(args)
-
+    verify_args!(args:args, optparse:optparse, count:0)
     connect(options)
-    begin
-      params = {}
-      @dashboard_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @dashboard_interface.dry.get(params)
-        return
+    params = {}
+    params.merge!(parse_list_options(options))
+    @dashboard_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @dashboard_interface.dry.get(params)
+      return
+    end
+    json_response = @dashboard_interface.get(params)
+    render_response(json_response, options) do
+      print_h1 "Morpheus Dashboard", [], options
+
+      ## STATUS
+
+      status_column_definitions = {
+        "Instances" => lambda {|it|
+          format_number(it['instanceStats']['total']) rescue nil
+        },
+        "Running" => lambda {|it|
+          format_number(it['instanceStats']['running']) rescue nil
+        },
+        # "Used Storage" => lambda {|it|
+        #   ((it['instanceStats']['maxStorage'].to_i > 0) ? ((it['instanceStats']['usedStorage'].to_f / it['instanceStats']['maxStorage'].to_f) * 100).round(1) : 0).to_s + '%' rescue nil
+        # },
+      }
+      print as_description_list(json_response, status_column_definitions, options)
+      # print reset,"\n"
+
+      stats = json_response['instanceStats']
+      if stats
+        print_h2 "Instance Usage", options
+        print_stats_usage(stats, {include: [:max_cpu, :avg_cpu, :memory, :storage]})
       end
-      json_response = @dashboard_interface.get(params)
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+
+      
+
+      open_incident_count = json_response['monitoring']['openIncidents'] rescue (json_response['appStatus']['openIncidents'] rescue nil)
+      
+      avg_response_time = json_response['monitoring']['avgResponseTime'] rescue nil
+      warning_apps = json_response['monitoring']['warningApps'] rescue 0
+      warning_checks = json_response['monitoring']['warningChecks'] rescue 0
+      fail_checks = json_response['monitoring']['failChecks'] rescue 0
+      fail_apps = json_response['monitoring']['failApps'] rescue 0
+      success_checks = json_response['monitoring']['successChecks'] rescue 0
+      success_apps = json_response['monitoring']['successApps'] rescue 0
+      monitoring_status_color = cyan
+      if fail_checks > 0 || fail_apps > 0
+        monitoring_status_color = red
+      elsif warning_checks > 0 || warning_apps > 0
+        monitoring_status_color = yellow
+      end
+      
+      print_h2 "Monitoring"
+
+      monitoring_column_definitions = {
+        "Status" => lambda {|it|
+          if fail_apps > 0 # || fail_checks > 0
+            # check_summary = [fail_apps > 0 ? "#{fail_apps} Apps" : nil,fail_checks > 0 ? "#{fail_checks} Checks" : nil].compact.join(", ")
+            # red + "ERROR" + " (" + check_summary + ")" + cyan
+            red + "ERROR" + cyan
+          elsif warning_apps > 0 || warning_checks > 0
+            # check_summary = [warning_apps > 0 ? "#{warning_apps} Apps" : nil,warning_checks > 0 ? "#{warning_checks} Checks" : nil].compact.join(", ")
+            # red + "WARNING" + " (" + check_summary + ")" + cyan
+            yellow + "WARNING" + cyan
+          else
+            cyan + "HEALTHY" + cyan
+          end
+        },
+        # "Availability" => lambda {|it|
+        #   # todo
+        # },
+        "Response Time" => lambda {|it|
+          # format_number(avg_response_time).to_s + "ms"
+          (avg_response_time.round).to_s + "ms"
+        },
+        "Open Incidents" => lambda {|it|
+          monitoring_status_color = cyan
+          # if fail_checks > 0 || fail_apps > 0
+          #   monitoring_status_color = red
+          # elsif warning_checks > 0 || warning_apps > 0
+          #   monitoring_status_color = yellow
+          # end
+          if open_incident_count.nil? 
+            yellow + "n/a" + cyan + "\n"
+          elsif open_incident_count == 0
+            monitoring_status_color + "0 Open Incidents" + cyan
+          elsif open_incident_count == 1
+            monitoring_status_color + "1 Open Incident" + cyan
+          else
+            monitoring_status_color + "#{open_incident_count} Open Incidents" + cyan
+          end
+        }
+      }
+      #print as_description_list(json_response, monitoring_column_definitions, options)
+      print as_pretty_table([json_response], monitoring_column_definitions.upcase_keys!, options)
+
+      
+      if json_response['logStats']
+        # todo: should come from monitoring.startMs-endMs
+        log_period_display = "7 Days"
+        print_h2 "Logs (#{log_period_display})", options
+        error_log_data = json_response['logStats']['data'].find {|it| it['key'].to_s.upcase == 'ERROR' }
+        error_count = error_log_data["count"] rescue 0
+        fatal_log_data = json_response['logStats']['data'].find {|it| it['key'].to_s.upcase == 'FATAL' }
+        fatal_count = fatal_log_data["count"] rescue 0
+        # total error is actaully error + fatal
+        total_error_count = error_count + fatal_count
+        # if total_error_count.nil? 
+        #   print yellow + "n/a" + cyan + "\n"
+        # elsif total_error_count == 0
+        #   print cyan + "0 Errors" + cyan + "\n"
+        # elsif total_error_count == 1
+        #   print red + "1 Error" + cyan + "\n"
+        # else
+        #   print red + "#{total_error_count} Errors" + cyan + "\n"
+        # end
+        if total_error_count == 0
+          print cyan + "(0 Errors)" + cyan + "\n"
+          #print cyan + "0-0-0-0-0-0-0-0 (0 Errors)" + cyan + "\n"
+        end
+        if error_count > 0
+          if error_log_data["values"]
+            log_plot = ""
+            plot_index = 0
+            error_log_data["values"].each do |k, v|
+              if v.to_i == 0
+                log_plot << cyan + v.to_s
+              else
+                log_plot << red + v.to_s
+              end
+              if plot_index != error_log_data["values"].size - 1
+                log_plot << cyan + "-"
+              end
+              plot_index +=1
+            end
+            print log_plot
+            print " "
+            if error_count == 0
+              print cyan + "(0 Errors)" + cyan
+            elsif error_count == 1
+              print red + "(1 Errors)" + cyan
+            else
+              print red + "(#{error_count} Errors)" + cyan
+            end
+            print reset + "\n"
+          end
+        end
+        if fatal_count > 0
+          if fatal_log_data["values"]
+            log_plot = ""
+            plot_index = 0
+            fatal_log_data["values"].each do |k, v|
+              if v.to_i == 0
+                log_plot << cyan + v.to_s
+              else
+                log_plot << red + v.to_s
+              end
+              if plot_index != fatal_log_data["values"].size - 1
+                log_plot << cyan + "-"
+              end
+              plot_index +=1
+            end
+            print log_plot
+            print " "
+            if fatal_count == 0
+              print cyan + "(0 FATAL)" + cyan
+            elsif fatal_count == 1
+              print red + "(1 FATAL)" + cyan
+            else
+              print red + "(#{fatal_count} FATAL)" + cyan
+            end
+            print reset + "\n"
+          end
+        end
+      end
+
+      print_h2 "Backups (7 Days)"
+      backup_status_column_definitions = {
+        # "Total" => lambda {|it|
+        #   it['backups']['accountStats']['lastSevenDays']['completed'] rescue nil
+        # },
+        "Successful" => lambda {|it|
+          it['backups']['accountStats']['lastSevenDays']['successful'] rescue nil
+        },
+        "Failed" => lambda {|it|
+          n = it['backups']['accountStats']['lastSevenDays']['failed'] rescue nil
+          if n == 0
+            cyan + n.to_s + reset
+          else
+            red + n.to_s + reset
+          end
+        }
+      }
+      print as_description_list(json_response, backup_status_column_definitions, options)
+      #print as_pretty_table([json_response], backup_status_column_definitions, options)
+      # print reset,"\n"
+
+      favorite_instances = json_response["provisioning"]["favoriteInstances"] || [] rescue []
+      if favorite_instances.empty?
+        # print cyan, "No favorite instances.",reset,"\n"
       else
+        print_h2 "My Instances"
+        favorite_instances_columns = {
+          "ID" => lambda {|instance|
+            instance['id']
+          },
+          "Name" => lambda {|instance|
+            instance['name']
+          },
+          "Type" => lambda {|instance|
+            instance['instanceType']['name'] rescue nil
+          },
+          "IP/PORT" => lambda {|instance|
+            format_instance_connection_string(instance)
+          },
+          "Status" => lambda {|it| format_instance_status(it) }
+        }
+        #print as_description_list(json_response, status_column_definitions, options)
+        print as_pretty_table(favorite_instances, favorite_instances_columns, options)
+        # print reset,"\n"
+      end
 
-        print_h1 "Dashboard"
-        print cyan
-        puts "Coming soon... see --json"
-        print reset,"\n"
+      # RECENT ACTIVITY
+      activity = json_response["activity"] || json_response["recentActivity"] || []
+      print_h2 "Recent Activity", [], options
+      if activity.empty?
+        print cyan, "No activity found.",reset,"\n"
+      else
+        columns = [
+          # {"SEVERITY" => lambda {|record| format_activity_severity(record['severity']) } },
+          {"TYPE" => lambda {|record| record['activityType'] } },
+          {"NAME" => lambda {|record| record['name'] } },
+          {"RESOURCE" => lambda {|record| "#{record['objectType']} #{record['objectId']}" } },
+          {"MESSAGE" => lambda {|record| record['message'] || '' } },
+          {"USER" => lambda {|record| record['user'] ? record['user']['username'] : record['userName'] } },
+          #{"DATE" => lambda {|record| "#{format_duration_ago(record['ts'] || record['timestamp'])}" } },
+          {"DATE" => lambda {|record| 
+            # show full time if searching for custom timerange, otherwise the default is to show relative time
+            if params['start'] || params['end'] || params['timeframe']
+              "#{format_local_dt(record['ts'] || record['timestamp'])}"
+            else
+              "#{format_duration_ago(record['ts'] || record['timestamp'])}"
+            end
+
+          } },
+        ]
+        print as_pretty_table(activity, columns, options)
+        # print_results_pagination(json_response)
+        # print reset,"\n"
 
       end
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
+
     end
+    print reset,"\n"
+    return 0, nil
   end
 
+
 end