morpheus-cli 5.5.1.4 → 5.5.2

data/lib/morpheus/cli/commands/tasks.rb

@@ -28,6 +28,14 @@ class Morpheus::Cli::Tasks
       opts.on('-t', '--type x,y,z', Array, "Filter by task type code(s)") do |val|
         params['taskTypeCodes'] = val
       end
+
+      opts.on('-l', '--labels LABEL', String, "Filter by labels, can match any of the values") do |val|
+        add_query_parameter(params, 'labels', parse_labels(val))
+      end
+      opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
+        add_query_parameter(params, 'allLabels', parse_labels(val))
+      end
+
       build_standard_list_options(opts, options)
       opts.footer = "List tasks."
     end
@@ -125,6 +133,8 @@ class Morpheus::Cli::Tasks
           "Name" => 'name',
           "Code" => 'code',
           "Type" => lambda {|it| it['taskType']['name'] },
+          "Labels" => lambda {|it| format_list(it['labels'], '', 3) rescue '' },
+          "Visibility" => 'visibility',
           "Execute Target" => lambda {|it| 
             if it['executeTarget'] == 'local'
               git_info = []
@@ -252,6 +262,7 @@ class Morpheus::Cli::Tasks
     task_name = nil
     task_code = nil
     task_type_name = nil
+    task_visibility = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] -t TASK_TYPE")
       opts.on( '-t', '--type TASK_TYPE', "Task Type" ) do |val|
@@ -259,6 +270,12 @@ class Morpheus::Cli::Tasks
       end
       opts.on('--name NAME', String, "Task Name" ) do |val|
         task_name = val
+      end
+       opts.on('--visibility VISIBILITY', String, "Task Visibility" ) do |val|
+        task_visibility = val
+      end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        options[:options]['labels'] = parse_labels(val)
       end
       opts.on('--code CODE', String, "Task Code" ) do |val|
         task_code = val
@@ -412,6 +429,13 @@ class Morpheus::Cli::Tasks
           return 1
         end
 
+        # Visibility
+        if task_visibility != nil
+          payload['task']['visibility'] = task_visibility
+        else
+          payload['task']['visibility'] = 'private'
+        end
+
         payload['task']['taskType'] = {"id" => task_type['id'], "code" => task_type['code']}
 
 
@@ -630,6 +654,12 @@ class Morpheus::Cli::Tasks
       opts.on('--name NAME', String, "Task Name" ) do |val|
         options[:options]['name'] = val
       end
+      opts.on('--visibility VISIBILITY', String, "Task Visibility" ) do |val|
+        options[:options]['visibility'] = val
+      end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        options[:options]['labels'] = parse_labels(val)
+      end
       opts.on('--code CODE', String, "Task Code" ) do |val|
         options[:options]['code'] = val
       end
@@ -1175,7 +1205,10 @@ class Morpheus::Cli::Tasks
       {"ID" => lambda {|it| it['id'] } },
       {"NAME" => lambda {|it| it['name'] } },
       {"TYPE" => lambda {|it| it['taskType']['name'] ? it['taskType']['name'] : it['type'] } },
-      {"CREATED" => lambda {|it| format_local_dt(it['dateCreated']) } },
+      {"LABELS" => lambda {|it| format_list(it['labels'], '', 3) rescue '' }},
+      {"VISIBILITY" => lambda {|it| it['visibility'] } },
+      {"CREATED" => lambda {|it| format_local_dt(it['dateCreated']) } }
+
       # {"UPDATED" => lambda {|it| format_local_dt(it['lastUpdated']) } },
     ]
     if opts[:include_fields]

data/lib/morpheus/cli/commands/tenants_command.rb

@@ -245,7 +245,7 @@ EOT
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[tenant]")
-      opts.on('--remove-resources [on|off]', ['on','off'], "Remove Infrastructure. Default is off.") do |val|
+      opts.on('--remove-resources [on|off]', ['on','off'], "Remove Associated Instances. Default is off.") do |val|
         params[:removeResources] = val.nil? ? 'on' : val
       end
       build_standard_remove_options(opts, options)

data/lib/morpheus/cli/commands/user_settings_command.rb

@@ -79,6 +79,7 @@ EOT
         "First Name" => lambda {|it| it['firstName'] },
         "Last Name" => lambda {|it| it['lastName'] },
         "Email" => lambda {|it| it['email'] },
+        "Theme" => lambda {|it| it['activeTheme'] ? it['activeTheme'] : '' },
         "Avatar" => lambda {|it| it['avatar'] ? it['avatar'].split('/').last : '' },
         "Notifications" => lambda {|it| format_boolean(it['receiveNotifications']) },
         "Linux Username" => lambda {|it| it['linuxUsername'] },
@@ -102,8 +103,8 @@ EOT
           "USERNAME" => lambda {|it| it['username'] },
           "ACCESS TOKEN" => lambda {|it| it['maskedAccessToken'] },
           "REFRESH TOKEN" => lambda {|it| it['maskedRefreshToken'] },
-          "EXPIRATION" => lambda {|it| format_local_dt(it['expiration']) },
-          "TTL" => lambda {|it| it['expiration'] ? (format_duration(it['expiration']) rescue '') : '' }
+          "ACCESS EXPIRATION" => lambda {|it| format_local_dt(it['expiration']) },
+          "ACCESS TTL" => lambda {|it| it['expiration'] ? (format_duration(it['expiration']) rescue '') : '' }
         }
         print cyan
         puts as_pretty_table(access_tokens, cols)
@@ -807,6 +808,14 @@ EOT
       {'switch' => 'change-password', 'fieldName' => 'password', 'fieldLabel' => 'Password', 'type' => 'password', 'description' => 'Change user credentials to use a new password'},
       {'fieldName' => 'avatar', 'fieldLabel' => 'Avatar', 'type' => 'file', 'description' => 'Local filepath of image file to upload as user avatar'},
       {'fieldName' => 'desktopBackground', 'fieldLabel' => 'Desktop Background', 'type' => 'file', 'description' => 'Local filepath of image file to upload as user desktop background'},
+      {'switch' => 'theme', 'fieldName' => 'activeTheme', 'fieldLabel' => 'Theme', 'type' => 'select', 'optionSource' => lambda {|api_client, api_params| 
+        begin
+          api_client.options_for_source("themes", api_params)['data']
+        rescue => ex
+          Morpheus::Logging::DarkPrinter.puts "Failed to load options for themes. Exception: (#{ex.class}) '#{ex.message}'" if Morpheus::Logging.debug?
+          [{"name" => "Default", "value" => "default"}, {"name" => "Dark Mode", "value" => "darkMode"}]
+        end
+      }, 'description' => 'Active Theme to use for the UI, default or darkMode.'},
       # api cannot yet modify isUsing2fa
       # {'switch' => '2fa', 'fieldName' => 'isUsing2fa', 'fieldLabel' => '2FA Enabled', 'type' => 'checkbox', 'description' => 'Enable or Disable 2FA for your user.'}
     ]

data/lib/morpheus/cli/commands/users.rb

@@ -129,15 +129,15 @@ class Morpheus::Cli::Users
       opts.on('-g','--global', "Global (All Tenants). Find users across all tenants. Default is your own tenant only.") do
         options[:global] = true
       end
-      opts.on('-p','--permissions', "Display Permissions") do |val|
+      opts.on('-p','--permissions', "Display Permissions [deprecated]") do |val|
         options[:include_features_access] = true
         params['includeAccess'] = true
       end
-      opts.on(nil,'--feature-access', "Display Permissions") do |val|
+      opts.add_hidden_option('-p,')
+      opts.on(nil,'--feature-access', "Display Feature Access") do |val|
         options[:include_features_access] = true
         params['includeAccess'] = true
       end
-      opts.add_hidden_option('--feature-access')
       opts.on(nil,'--group-access', "Display Group Access") do
         options[:include_sites_access] = true
         params['includeAccess'] = true
@@ -162,6 +162,22 @@ class Morpheus::Cli::Users
         options[:include_personas_access] = true
         params['includeAccess'] = true
       end
+      opts.on(nil,'--vdi-pool-access', "Display VDI Pool Access") do
+        options[:include_vdi_pools_access] = true
+        params['includeAccess'] = true
+      end
+      opts.on(nil,'--report-type-access', "Display Report Type Access") do
+        options[:include_report_types_access] = true
+        params['includeAccess'] = true
+      end
+      opts.on(nil,'--workflow-access', "Display Workflow Access") do
+        options[:include_task_sets_access] = true
+        params['includeAccess'] = true
+      end
+      opts.on(nil,'--task-access', "Display Task Access") do
+        options[:include_tasks_access] = true
+        params['includeAccess'] = true
+      end
       opts.on(nil,'--all', "Display All Access Lists") do
         options[:include_features_access] = true
         options[:include_sites_access] = true
@@ -170,6 +186,10 @@ class Morpheus::Cli::Users
         options[:include_app_templates_access] = true
         options[:include_catalog_item_types_access] = true
         options[:include_personas_access] = true
+        options[:include_vdi_pools_access] = true
+        options[:include_report_types_access] = true
+        options[:include_task_sets_access] = true
+        options[:include_tasks_access] = true
         params['includeAccess'] = true
       end
       opts.on(nil, '--hide-none-access', "Hide records with 'none' access") do
@@ -185,6 +205,7 @@ EOT
     verify_args!(args:args, optparse:optparse, min:1)
     connect(options)
     id_list = parse_id_list(args)
+    params.merge!(parse_query_options(options))
     return run_command_for_each_arg(id_list) do |arg|
       _get(arg, params, options)
     end
@@ -244,15 +265,24 @@ EOT
           puts yellow,"No permissions found.",reset
         end
       else
-        available_field_options = {'features' => 'Feature', 'sites' => 'Group', 'zones' => 'Cloud', 'instance_types' => 'Instance Type',
-         'app_templates' => 'Blueprint', 'catalog_item_types' => 'Catalog Item Type', 'personas' => 'Persona', 'vdi_pools' => 'VDI Pool', 'report_types' => 'Report Type'}
+        available_field_options = {
+          'features' => 'Feature', 'sites' => 'Group', 'zones' => 'Cloud', 'instance_types' => 'Instance Type',
+          'app_templates' => 'Blueprint', 'report_types' => 'Report Type', 'personas' => 'Persona',
+          'catalog_item_types' => 'Catalog Item Type', 'vdi_pools' => 'VDI Pool', 'task_sets' => 'Workflow', 'tasks' => 'Task'
+        }
+
+        if is_tenant_account
+          available_field_options.delete("sites")
+        else
+          available_field_options.delete("zones")
+        end
+
         available_field_options.each do |field, label|
-          if !(field == 'sites' && is_tenant_account) && options["include_#{field}_access".to_sym]
-            access = user['access'][field.split('_').enum_for(:each_with_index).collect {|word, idx| idx == 0 ? word : word.capitalize}.join]
+          if options["include_#{field}_access".to_sym]
+            access = user['access'][field.to_s.camelcase] || []
             access = access.reject {|it| it['access'] == 'none'} if options[:hide_none_access]
 
             if field == "features"
-              # print_h2 "Permissions", options
               print_h2 "#{label} Access", options
             else
               print_h2 "#{label} Access", options
@@ -366,7 +396,18 @@ EOT
 
         print_h1 "User Permissions: #{user['username']}", options
 
-        available_field_options = {'features' => 'Feature', 'sites' => 'Group', 'zones' => 'Cloud', 'instance_types' => 'Instance Type', 'app_templates' => 'Blueprint', 'catalog_item_types' => 'Catalog Item Type', 'vdi_pools' => 'VDI Pool', 'report_types' => 'Report Type','personas' => 'Persona'}
+        available_field_options = {
+          'features' => 'Feature', 'sites' => 'Group', 'zones' => 'Cloud', 'instance_types' => 'Instance Type',
+          'app_templates' => 'Blueprint', 'report_types' => 'Report Type', 'personas' => 'Persona',
+          'catalog_item_types' => 'Catalog Item Type', 'vdi_pools' => 'VDI Pool', 'task_sets' => 'Workflow', 'tasks' => 'Task'
+        }
+
+        if is_tenant_account
+          available_field_options.reject! {|k| k == 'sites'}
+        else
+          available_field_options.reject! {|k| k == 'zones'}
+        end
+
         available_field_options.each do |field, label|
           if !(field == 'sites' && is_tenant_account)
             access = json_response['access'][field.split('_').enum_for(:each_with_index).collect {|word, idx| idx == 0 ? word : word.capitalize}.join]

data/lib/morpheus/cli/commands/virtual_images.rb

@@ -42,6 +42,12 @@ class Morpheus::Cli::VirtualImages
        opts.on('--synced', "Synced Images" ) do
         options[:filterType] = 'Synced'
       end
+      opts.on('-l', '--labels LABEL', String, "Filter by labels, can match any of the values") do |val|
+        add_query_parameter(params, 'labels', parse_labels(val))
+      end
+      opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
+        add_query_parameter(params, 'allLabels', parse_labels(val))
+      end
       opts.on('--tags Name=Value',String, "Filter by tags (metadata name value pairs).") do |val|
         val.split(",").each do |value_pair|
           k,v = value_pair.strip.split("=")
@@ -101,6 +107,7 @@ class Morpheus::Cli::VirtualImages
         virtual_image_column_definitions = {
           "ID" => 'id',
           "Name" => 'name',
+          "Labels" => lambda {|it| format_list(it['labels'], '', 3) rescue '' },
           "Type" => lambda {|it| 
             # yick, api should return the type with every virtualImage
             image_type = virtual_image_type_for_name_or_code(it['imageType'])
@@ -197,6 +204,7 @@ EOT
         description_cols = {
           "ID" => 'id',
           "Name" => 'name',
+          "Labels" => lambda {|it| format_list(it['labels']) },
           "Type" => lambda {|it| image_type_display },
           "Operating System" => lambda {|it| it['osType'] ? it['osType']['name'] : "" }, 
           "Storage" => lambda {|it| !image['storageProvider'].nil? ? image['storageProvider']['name'] : 'Default' }, 
@@ -302,6 +310,9 @@ EOT
           tenants_list = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        options[:options]['labels'] = parse_labels(val)
+      end
       opts.on('--tags LIST', String, "Tags in the format 'name:value, name:value'. This will add and remove tags.") do |val|
         options[:tags] = val
       end
@@ -440,6 +451,9 @@ EOT
           tenants_list = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
         end
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        options[:options]['labels'] = parse_labels(val)
+      end
       opts.on('--tags LIST', String, "Metadata tags in the format 'name:value, name:value'") do |val|
         options[:tags] = val
       end

data/lib/morpheus/cli/commands/workflows.rb

@@ -40,6 +40,12 @@ class Morpheus::Cli::Workflows
         end
         params['type'] = workflow_type
       end
+      opts.on('-l', '--labels LABEL', String, "Filter by labels, can match any of the values") do |val|
+        add_query_parameter(params, 'labels', parse_labels(val))
+      end
+      opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
+        add_query_parameter(params, 'allLabels', parse_labels(val))
+      end
       build_standard_list_options(opts, options)
       opts.footer = "List workflows."
     end
@@ -93,6 +99,9 @@ class Morpheus::Cli::Workflows
       opts.on("--name NAME", String, "Name for workflow") do |val|
         params['name'] = val
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        options[:options]['labels'] = parse_labels(val)
+      end
       opts.on("--description DESCRIPTION", String, "Description of workflow") do |val|
         params['description'] = val
       end
@@ -341,6 +350,7 @@ class Morpheus::Cli::Workflows
         description_cols = {
           "ID" => 'id',
           "Name" => 'name',
+          "Labels" => lambda {|it| format_list(it['labels'], '', 3) rescue '' },
           "Description" => 'description',
           "Type" => lambda {|workflow| format_workflow_type(workflow) },
           "Platform" => lambda {|it| format_platform(it['platform']) },
@@ -407,6 +417,9 @@ class Morpheus::Cli::Workflows
       opts.on("--name NAME", String, "New name for workflow") do |val|
         params['name'] = val
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        options[:options]['labels'] = parse_labels(val)
+      end
       opts.on("--description DESCRIPTION", String, "Description of workflow") do |val|
         params['description'] = val
       end
@@ -762,6 +775,7 @@ class Morpheus::Cli::Workflows
     columns = [
       {"ID" => lambda {|workflow| workflow['id'] } },
       {"NAME" => lambda {|workflow| workflow['name'] } },
+      {"LABELS" => lambda {|it| format_list(it['labels'], '', 3) rescue '' }},
       {"DESCRIPTION" => lambda {|workflow| workflow['description'] } },
       {"TYPE" => lambda {|workflow| format_workflow_type(workflow) } },
       {"TASKS" => lambda {|workflow| 

data/lib/morpheus/cli/mixins/accounts_helper.rb

@@ -389,18 +389,19 @@ module Morpheus::Cli::AccountsHelper
   end
 
   def get_access_color(access)
-    access ||= 'none'
+    access ||= 'default'
     if access == 'none'
       # maybe reset instead of white?
       white
-    elsif access == 'read'
-      cyan
-    else
+    elsif access.include? 'full'
       green
+    else
+      cyan
     end
   end
 
   def get_access_string(access, return_color=cyan)
+    access ||= 'default'
     get_access_color(access) + access.to_s + return_color.to_s
     # access ||= 'none'
     # if access == 'none'
@@ -469,7 +470,7 @@ module Morpheus::Cli::AccountsHelper
     end
     # ok build out string
     out = ""
-    access_color = get_access_color(access)
+    access_color = get_access_color(access || 'default')
     out << access_color if access_color
     out << padded_value
     out << reset if access_color

data/lib/morpheus/cli/mixins/infrastructure_helper.rb

@@ -479,4 +479,83 @@ module Morpheus::Cli::InfrastructureHelper
     return {success:true, data: record_ids}
   end
 
+  def network_pool_server_list_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => lambda {|it| it['name'] },
+      "Type" => lambda {|it| it['type'] ? it['type']['name'] : '' },
+      "URL" => lambda {|it| it['serviceUrl'] },
+      #"Pools" => lambda {|it| it['pools'] ? anded_list(it['pools'].collect {|p| p['name'] }, 3) : '' },
+      "Enabled" => lambda {|it| format_boolean(it['enabled']) },
+      "Status" => lambda {|it| format_network_pool_server_status(it) },
+      "Date Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      "Last Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
+    }
+  end
+
+  def network_pool_server_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => lambda {|it| it['name'] },
+      "Type" => lambda {|it| it['type'] ? it['type']['name'] : '' },
+      "URL" => lambda {|it| it['serviceUrl'] },
+      "App ID" => lambda {|it| it['config'] ? it['config']['appId'] : nil },
+      "Credentials" => lambda {|it| it['credential'] ? (it['credential']['type'] == 'local' ? '(Local)' : it['credential']['name']) : nil },
+      "Username" => lambda {|it| it['serviceUsername'] },
+      "Password" => lambda {|it| it['servicePassword'] },
+      "Throttle Rate" => lambda {|it| it['serviceThrottleRate'] },
+      "Disable SSL SNI" => lambda {|it| format_boolean it['ignoreSsl'] },
+      "Inventory Existing" => lambda {|it| format_boolean(it['config'] ? it['config']['inventoryExisting'] : nil) },
+      "IP Mode" => lambda {|it| it['serviceMode'] },
+      "Network Filter" => lambda {|it| it['networkFilter'] },
+      "Zone Filter" => lambda {|it| it['zoneFilter'] },
+      "Tenant Match" => lambda {|it| it['tenantMatch'] },
+      "Extra Attributes" => lambda {|it| it['config'] ? it['config']['extraAttributes'] : nil },
+      "Enabled" => lambda {|it| format_boolean(it['enabled']) },
+      "Status" => lambda {|it| format_network_pool_server_status(it) },
+      #"Pools" => lambda {|it| it['pools'] ? anded_list(it['pools'].collect {|p| p['name'] }, 3) : '' },
+      "Date Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      "Last Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
+    }
+  end
+
+  def format_network_pool_server_status(network_pool_server, return_color=cyan)
+    out = ""
+    status_string = network_pool_server['status']
+    if status_string.nil? || status_string.empty? || status_string == "unknown"
+      out << "#{white}UNKNOWN#{network_pool_server['statusMessage'] ? "#{return_color} - #{network_pool_server['statusMessage']}" : ''}#{return_color}"
+    # elsif network_pool_server['enabled'] == false
+    #   out << "#{red}DISABLED#{network_pool_server['statusMessage'] ? "#{return_color} - #{network_pool_server['statusMessage']}" : ''}#{return_color}"
+    elsif status_string == 'ok'
+      out << "#{green}#{status_string.upcase}#{return_color}"
+    elsif status_string == 'error' || status_string == 'offline'
+      out << "#{red}#{status_string ? status_string.upcase : 'N/A'}#{network_pool_server['statusMessage'] ? "#{return_color} - #{network_pool_server['statusMessage']}" : ''}#{return_color}"
+    else
+      out << "#{yellow}#{status_string.upcase}#{return_color}"
+    end
+    out
+  end
+
+  def network_pool_server_type_list_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Code" => 'code',
+    }
+  end
+
+  def network_pool_server_type_column_definitions(options)
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Code" => 'code',
+      # "Integration Code" => 'integrationCode',
+      "Description" => 'description',
+      "Enabled" => lambda {|it| format_boolean(it['enabled']) },
+      "Selectable" => lambda {|it| format_boolean(it['selectable']) },
+      "Plugin" => lambda {|it| format_boolean(it['isPlugin']) },
+      "Embedded" => lambda {|it| format_boolean(it['isEmbedded']) },
+    }
+  end
+
 end

data/lib/morpheus/cli/mixins/jobs_helper.rb

@@ -79,22 +79,21 @@ module Morpheus::Cli::JobsHelper
 
       if process_data[:output] && process_data[:output].strip.length > 0
         print_h2 "Output"
-        print process['output']
+        print process['output'].to_s.strip
+        print reset,"\n"
       end
       if process_data[:error] && process_data[:error].strip.length > 0
         print_h2 "Error"
-        print process['message'] || process['error']
+        print (process['message'] || process['error']).to_s.strip
         print reset,"\n"
       end
-      
 
       if process['events'] && !process['events'].empty?
         print_h2 "Process Events", options
         print_process_events(process['events'], options)
       end
-    else
-      print reset,"\n"
     end
+    print reset,"\n"
     return 0, nil
   end
 

data/lib/morpheus/cli/mixins/library_helper.rb

@@ -59,6 +59,7 @@ module Morpheus::Cli::LibraryHelper
       {"NAME" => lambda {|instance_type| instance_type['name'] } },
       {"CODE" => lambda {|instance_type| instance_type['code'] } },
       {"TECHNOLOGY" => lambda {|instance_type| format_instance_type_technology(instance_type) } },
+      {"LABELS" => lambda {|instance_type| format_list(instance_type['labels'], '', 3) } },
       {"CATEGORY" => lambda {|instance_type| instance_type['category'].to_s.capitalize } },
       {"FEATURED" => lambda {|instance_type| format_boolean instance_type['featured'] } },
       {"OWNER" => lambda {|instance_type| instance_type['account'] ? instance_type['account']['name'] : '' } },
@@ -169,6 +170,7 @@ module Morpheus::Cli::LibraryHelper
       {"NAME" => lambda {|it| it['name'] } },
       {"SHORT NAME" => lambda {|it| it['shortName'] } },
       {"VERSION" => lambda {|it| it['containerVersion'] } },
+      {"LABELS" => lambda {|it| format_list(it['labels'], '', 3) } },
       {"CATEGORY" => lambda {|it| it['category'] } },
       {"OWNER" => lambda {|it| it['account'] ? it['account']['name'] : '' } }
     ]

data/lib/morpheus/cli/mixins/logs_helper.rb

@@ -47,6 +47,9 @@ module Morpheus::Cli::LogsHelper
     table_color = options.key?(:color) ? options[:color] : cyan
     term_width = current_terminal_width()
     message_col_width = current_terminal_width() - (show_object ? 56 : 36)
+    if options[:reverse]
+      log_records.reverse!
+    end
     log_records.each do |log_entry|
       log_level = format_log_level(log_entry['level'], table_color, 6)
       out << table_color if table_color

data/lib/morpheus/cli/mixins/monitoring_helper.rb

@@ -823,7 +823,7 @@ module Morpheus::Cli::MonitoringHelper
     # Apps
       
     monitor_app_list = nil
-    monitor_app_ids = nil
+    monitor_app_ids = []
     if params['apps'].nil?
       still_prompting = true
       while still_prompting

data/lib/morpheus/cli/mixins/print_helper.rb

@@ -714,7 +714,13 @@ module Morpheus::Cli::PrintHelper
   #
   def as_pretty_table(data, columns, options={})
     data = [data].flatten
-    
+    if options[:reverse]
+      if data.is_a?(Array)
+        data.reverse!
+      elsif data.is_a?(Hash)
+        data.values.each {|v| v.reverse! if v.is_a?(Array) }
+      end
+    end
     # support --fields x,y,z and --all-fields or --fields all
     all_fields = data.first ? data.first.keys : []
     #todo: support --raw-fields   meh, not really needed..
@@ -1106,7 +1112,13 @@ module Morpheus::Cli::PrintHelper
     newline = options[:csv_newline] || options[:newline] || "\n"
     include_header = options[:csv_no_header] ? false : true
     do_quotes = options[:csv_quotes] || options[:quotes]
-
+    if options[:reverse]
+      if data.is_a?(Array)
+        data.reverse!
+      elsif data.is_a?(Hash)
+        data.values.each {|v| v.reverse! if v.is_a?(Array) }
+      end
+    end
     if options[:include_fields]
       data = transform_data_for_field_options(data, options, object_key)
       if data.is_a?(Hash)
@@ -1134,7 +1146,7 @@ module Morpheus::Cli::PrintHelper
         if data.is_a?(Hash)
           data = data[object_key]
         else
-          Morpheus::Logging::DarkPrinter.puts "as_csv() expects data as an to fetch object key '#{object_key}' from, #{records.class}." if Morpheus::Logging.debug?
+          Morpheus::Logging::DarkPrinter.puts "as_csv() expects data as an to fetch object key '#{object_key}' from, #{data.class}." if Morpheus::Logging.debug?
         end
       end
     end
@@ -1216,7 +1228,13 @@ module Morpheus::Cli::PrintHelper
     if !data
       return "null" # "No data"
     end
-
+    if options[:reverse]
+      if data.is_a?(Array)
+        data.reverse!
+      elsif data.is_a?(Hash)
+        data.values.each {|v| v.reverse! if v.is_a?(Array) }
+      end
+    end
     if options[:include_fields]
       data = transform_data_for_field_options(data, options, object_key)
     end
@@ -1236,6 +1254,13 @@ module Morpheus::Cli::PrintHelper
     if !data
       return "null" # "No data"
     end
+    if options[:reverse]
+      if data.is_a?(Array)
+        data.reverse!
+      elsif data.is_a?(Hash)
+        data.values.each {|v| v.reverse! if v.is_a?(Array) }
+      end
+    end
     if options[:include_fields]
       data = transform_data_for_field_options(data, options, object_key)
     end