morpheus-cli 5.2.1 → 5.3.0

data/lib/morpheus/cli/cli_command.rb

@@ -466,11 +466,16 @@ module Morpheus
 
           when :list
             opts.on( '-m', '--max MAX', "Max Results" ) do |val|
-              max = val.to_i
-              if max <= 0
-                raise ::OptionParser::InvalidArgument.new("must be a positive integer")
+              # api supports max=-1 for all at the moment..
+              if val.to_s == "all" || val.to_s == "-1"
+                options[:max] = "-1"
+              else
+                max = val.to_i
+                if max <= 0
+                  raise ::OptionParser::InvalidArgument.new("must be a positive integer")
+                end
+                options[:max] = max
               end
-              options[:max] = max
             end
 
             opts.on( '-o', '--offset OFFSET', "Offset Results" ) do |val|
@@ -486,12 +491,17 @@ module Morpheus
             end
 
             opts.on( '-S', '--sort ORDER', "Sort Order. DIRECTION may be included as \"ORDER [asc|desc]\"." ) do |v|
-              v_parts = v.to_s.split(" ")
-              if v_parts.size > 1
-                options[:sort] = v_parts[0]
-                options[:direction] = (v_parts[1].strip == "desc") ? "desc" : "asc"
-              else
+              if v.to_s.include?(",")
+                # sorting on multiple properties, just pass it as is, newer api supports multiple fields
                 options[:sort] = v
+              else
+                v_parts = v.to_s.split(" ")
+                if v_parts.size > 1
+                  options[:sort] = v_parts[0]
+                  options[:direction] = (v_parts[1].strip == "desc") ? "desc" : "asc"
+                else
+                  options[:sort] = v
+                end
               end
             end
 

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
@@ -134,29 +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] || options[:json]
+
+    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
-        puts as_json(JSON.parse(last_line), options)
+        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

@@ -15,7 +15,7 @@ class Morpheus::Cli::HistoryCommand
   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
@@ -35,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.
@@ -42,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/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'] } },
+          options[:details] ? {"RESOURCE" => lambda {|record| "#{record['objectType']} #{record['objectId']}" } } : nil,
+          {"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'] || options[:details]
+              "#{format_local_dt(record['ts'] || record['timestamp'])}"
+            else
+              "#{format_duration_ago(record['ts'] || record['timestamp'])}"
+            end
+
+          } },
+        ].compact
+        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

data/lib/morpheus/cli/execution_request_command.rb

@@ -31,6 +31,10 @@ class Morpheus::Cli::ExecutionRequestCommand
     handle_subcommand(args)
   end
 
+  def default_refresh_interval
+    5
+  end
+
   def get(args)
     raw_args = args
     options = {}
@@ -134,7 +138,7 @@ class Morpheus::Cli::ExecutionRequestCommand
     options = {}
     params = {}
     script_content = nil
-    do_refresh = true
+    options[:refresh_until_finished] = true
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[options]")
       opts.on('--server ID', String, "Server ID") do |val|
@@ -161,8 +165,14 @@ class Morpheus::Cli::ExecutionRequestCommand
           exit 1
         end
       end
-      opts.on(nil, '--no-refresh', "Do not refresh until finished" ) do
-        do_refresh = false
+      opts.on('--refresh [SECONDS]', String, "Refresh until execution is finished. Default interval is #{default_refresh_interval} seconds.") do |val|
+        options[:refresh_until_finished] = true
+        if !val.to_s.empty?
+          options[:refresh_interval] = val.to_f
+        end
+      end
+      opts.on(nil, '--no-refresh', "Do not refresh. The default behavior is to refresh until finished." ) do
+        options[:refresh_until_finished] = false
       end
       #build_option_type_options(opts, options, add_user_source_option_types())
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
@@ -212,8 +222,8 @@ class Morpheus::Cli::ExecutionRequestCommand
       end
       execution_request = json_response['executionRequest']
       print_green_success "Executing request #{execution_request['uniqueId']}"
-      if do_refresh
-        get([execution_request['uniqueId'], "--refresh"] + (options[:remote] ? ["-r",options[:remote]] : []))
+      if options[:refresh_until_finished]
+        get([execution_request['uniqueId'], "--refresh", options[:refresh_interval] ? options[:refresh_interval].to_s : nil].compact + (options[:remote] ? ["-r",options[:remote]] : []))
       else
         get([execution_request['uniqueId']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end