morpheus-cli 3.3.2.6.2 → 3.3.2.7

data/lib/morpheus/cli/load_balancers.rb

@@ -44,19 +44,13 @@ class Morpheus::Cli::LoadBalancers
       end
       json_response = @load_balancers_interface.get(params)
       if options[:json]
-        if options[:include_fields]
-          json_response = {"loadBalancers" => filter_data(json_response["loadBalancers"], options[:include_fields]) }
-        end
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "loadBalancers")
         return 0
       elsif options[:csv]
         puts records_as_csv(json_response["loadBalancers"], options)
         return 0
       elsif options[:yaml]
-        if options[:include_fields]
-          json_response = {"loadBalancers" => filter_data(json_response["loadBalancers"], options[:include_fields]) }
-        end
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "loadBalancers")
         return 0
       else
         lbs = json_response['loadBalancers']
@@ -112,19 +106,13 @@ class Morpheus::Cli::LoadBalancers
       #puts "LB TYPE: #{lb_type}"
       if options[:json]
         puts JSON.pretty_generate({loadBalancer: lb})
-        if options[:include_fields]
-          json_response = {"loadBalancer" => filter_data(json_response["loadBalancer"], options[:include_fields]) }
-        end
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "loadBalancer")
         return 0
       elsif options[:csv]
         puts records_as_csv(json_response["loadBalancer"], options)
         return 0
       elsif options[:yaml]
-        if options[:include_fields]
-          json_response = {"loadBalancer" => filter_data(json_response["loadBalancer"], options[:include_fields]) }
-        end
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "loadBalancer")
         return 0
       else
         print_h1 "Load Balancer Details"

data/lib/morpheus/cli/monitoring_apps_command.rb

@@ -42,17 +42,14 @@ class Morpheus::Cli::MonitoringAppsCommand
       end
 
       json_response = @monitoring_interface.apps.list(params)
-      if options[:include_fields]
-        json_response = {"monitorApps" => filter_data(json_response["monitorApps"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "monitorApps")
         return 0
       elsif options[:csv]
         puts records_as_csv(json_response['monitorApps'], options)
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "monitorApps")
         return 0
       end
       monitor_apps = json_response['monitorApps']
@@ -117,14 +114,11 @@ class Morpheus::Cli::MonitoringAppsCommand
       end
       json_response = @monitoring_interface.apps.get(monitor_app['id'])
       monitor_app = json_response['monitorApp']
-      if options[:include_fields]
-        json_response = {"monitorApp" => filter_data(json_response["monitorApp"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "monitorApp")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "monitorApp")
         return 0
       elsif options[:csv]
         puts records_as_csv([json_response['monitorApp']], options)
@@ -245,10 +239,7 @@ class Morpheus::Cli::MonitoringAppsCommand
 
       json_response = @monitoring_interface.apps.history(monitor_app['id'], params)
       if options[:json]
-        if options[:include_fields]
-          json_response = {"history" => filter_data(json_response["history"], options[:include_fields]) }
-        end
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "history")
         return 0
       end
       if options[:csv]

data/lib/morpheus/cli/monitoring_checks_command.rb

@@ -44,14 +44,11 @@ class Morpheus::Cli::MonitoringChecksCommand
         return
       end
       json_response = @monitoring_interface.checks.list(params)
-      if options[:include_fields]
-        json_response = {"checks" => filter_data(json_response["checks"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "checks")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "checks")
         return 0
       elsif options[:csv]
         puts records_as_csv(json_response['checks'], options)
@@ -118,14 +115,11 @@ class Morpheus::Cli::MonitoringChecksCommand
       end
       json_response = @monitoring_interface.checks.get(check['id'])
       check = json_response['check']
-      if options[:include_fields]
-        json_response = {'check' => filter_data(check, options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, 'check')
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, 'check')
         return 0
       elsif options[:csv]
         puts records_as_csv([json_response['check']], options)
@@ -248,7 +242,7 @@ class Morpheus::Cli::MonitoringChecksCommand
       opts.on('--severity LIST', Array, "Filter by severity. critical, warning, info") do |list|
         params['severity'] = list
       end
-      build_common_options(opts, options, [:list, :last_updated, :json, :csv, :fields, :json, :dry_run, :remote])
+      build_common_options(opts, options, [:list, :last_updated, :json, :yaml, :csv, :fields, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
     if args.count < 1
@@ -272,10 +266,10 @@ class Morpheus::Cli::MonitoringChecksCommand
 
       json_response = @monitoring_interface.checks.history(check['id'], params)
       if options[:json]
-        if options[:include_fields]
-          json_response = {"history" => filter_data(json_response["history"], options[:include_fields]) }
-        end
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "history")
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "history")
         return 0
       end
       if options[:csv]
@@ -601,28 +595,14 @@ class Morpheus::Cli::MonitoringChecksCommand
       end
 
       json_response = @monitoring_interface.checks.list_check_types(params)
-      if options[:include_fields]
-        json_response = {"checkTypes" => filter_data(json_response["checkTypes"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
-        return 0
-      elsif options[:csv]
-        puts records_as_csv(json_response['monitorApps'], options)
+        puts as_json(json_response, options, "checkTypes")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
-        return 0
-      end
-      if options[:json]
-        if options[:include_fields]
-          json_response = {"checkTypes" => filter_data(json_response["checkTypes"], options[:include_fields]) }
-        end
-        puts as_json(json_response, options)
+        puts as_yaml(json_response, options, "checkTypes")
         return 0
-      end
-      if options[:csv]
-        puts records_as_csv(json_response['checkTypes'], options)
+      elsif options[:csv]
+        puts records_as_csv(json_response["checkTypes"], options)
         return 0
       end
       check_types = json_response['checkTypes']

data/lib/morpheus/cli/monitoring_contacts_command.rb

@@ -34,7 +34,7 @@ class Morpheus::Cli::MonitoringContactsCommand
     params = {}
     optparse = OptionParser.new do|opts|
       opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:list, :json, :csv, :fields, :json, :dry_run])
+      build_common_options(opts, options, [:list, :json, :csv, :yaml, :fields, :json, :dry_run])
     end
     optparse.parse!(args)
     connect(options)
@@ -51,13 +51,12 @@ class Morpheus::Cli::MonitoringContactsCommand
 
       json_response = @monitoring_interface.contacts.list(params)
       if options[:json]
-        if options[:include_fields]
-          json_response = {"contacts" => filter_data(json_response["contacts"], options[:include_fields]) }
-        end
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "contacts")
         return 0
-      end
-      if options[:csv]
+      elsif options[:yaml]
+        puts as_json(json_response, options, "contacts")
+        return 0
+      elsif options[:csv]
         puts records_as_csv(json_response['contacts'], options)
         return 0
       end
@@ -117,10 +116,10 @@ class Morpheus::Cli::MonitoringContactsCommand
       contact = json_response['contact']
       
       if options[:json]
-        if options[:include_fields]
-          json_response = {"contact" => filter_data(json_response["contact"], options[:include_fields]) }
-        end
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "contact")
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "contact")
         return 0
       elsif options[:csv]
         puts records_as_csv([json_response['contact']], options)

data/lib/morpheus/cli/monitoring_groups_command.rb

@@ -31,9 +31,8 @@ class Morpheus::Cli::MonitoringGroupsCommand
     optparse.parse!(args)
     connect(options)
     begin
-      [:phrase, :offset, :max, :sort, :direction, :lastUpdated].each do |k|
-        params[k] = options[k] unless options[k].nil?
-      end
+      # construct payload
+      params.merge!(parse_list_options(options))
 
       if options[:dry_run]
         print_dry_run @monitoring_interface.groups.dry.list(params)
@@ -41,31 +40,21 @@ class Morpheus::Cli::MonitoringGroupsCommand
       end
 
       json_response = @monitoring_interface.groups.list(params)
-      if options[:include_fields]
-        json_response = {"checkGroups" => filter_data(json_response["checkGroups"], options[:include_fields]) }
-      end
+
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "checkGroups")
         return 0
       elsif options[:csv]
         puts records_as_csv(json_response['checkGroups'], options)
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "checkGroups")
         return 0
       end
       check_groups = json_response['checkGroups']
       title = "Morpheus Monitoring Check Groups"
       subtitles = []
-      # if group
-      #   subtitles << "Group: #{group['name']}".strip
-      # end
-      # if cloud
-      #   subtitles << "Cloud: #{cloud['name']}".strip
-      # end
-      if params[:phrase]
-        subtitles << "Search: #{params[:phrase]}".strip
-      end
+      subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if check_groups.empty?
         print cyan,"No check groups found.",reset,"\n"
@@ -116,14 +105,11 @@ class Morpheus::Cli::MonitoringGroupsCommand
       end
       json_response = @monitoring_interface.groups.get(check_group['id'])
       check_group = json_response['checkGroup']
-      if options[:include_fields]
-        json_response = {"checkGroup" => filter_data(json_response["checkGroup"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "checkGroup")
         return 0
       elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_yaml(json_response, options, "checkGroup")
         return 0
       elsif options[:csv]
         puts records_as_csv([json_response['checkGroup']], options)
@@ -227,10 +213,8 @@ class Morpheus::Cli::MonitoringGroupsCommand
       check_group = find_check_group_by_name_or_id(args[0])
       return 1 if check_group.nil?
       
-      [:phrase, :offset, :max, :sort, :direction, :lastUpdated].each do |k|
-        params[k] = options[k] unless options[k].nil?
-      end
-      # JD: lastUpdated 500ing, checks don't have that property ? =o  Fix it!
+      # construct payload
+      params.merge!(parse_list_options(options))
 
       if options[:dry_run]
         print_dry_run @monitoring_interface.groups.dry.history(check_group['id'], params)
@@ -239,22 +223,19 @@ class Morpheus::Cli::MonitoringGroupsCommand
 
       json_response = @monitoring_interface.groups.history(check_group['id'], params)
       if options[:json]
-        if options[:include_fields]
-          json_response = {"history" => filter_data(json_response["history"], options[:include_fields]) }
-        end
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "history")
         return 0
-      end
-      if options[:csv]
-        puts records_as_csv(json_response['history'], options)
+      elsif options[:csv]
+        puts records_as_csv(json_response["history"], options)
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "history")
         return 0
       end
-      history_items = json_response['history']
-      title = "Check Group History: #{check_group['id']}: #{check_group['displayName'] || check_group['name']}"
+      history_items = json_response["history"]
+      title = "Check Group History - [#{check_group['id']}] #{check_group['displayName'] || check_group['name']}"
       subtitles = []
-      if params[:phrase]
-        subtitles << "Search: #{params[:phrase]}".strip
-      end
+      subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if history_items.empty?
         print cyan,"No history found.",reset,"\n"

data/lib/morpheus/cli/monitoring_incidents_command.rb

@@ -33,39 +33,26 @@ class Morpheus::Cli::MonitoringIncidentsCommand
     optparse.parse!(args)
     connect(options)
     begin
-      [:phrase, :offset, :max, :sort, :direction, :lastUpdated].each do |k|
-        params[k] = options[k] unless options[k].nil?
-      end
+      params.merge!(parse_list_options(options))
       if options[:dry_run]
         print_dry_run @monitoring_interface.incidents.dry.list(params)
         return
       end
       json_response = @monitoring_interface.incidents.list(params)
-      if options[:include_fields]
-        json_response = {"incidents" => filter_data(json_response["incidents"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_json(json_response, options, "incidents")
         return 0
       elsif options[:csv]
         puts records_as_csv(json_response['incidents'], options)
         return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "incidents")
+        return 0
       end
       incidents = json_response['incidents']
       title = "Morpheus Monitoring Incidents"
       subtitles = []
-      # if group
-      #   subtitles << "Group: #{group['name']}".strip
-      # end
-      # if cloud
-      #   subtitles << "Cloud: #{cloud['name']}".strip
-      # end
-      if params[:phrase]
-        subtitles << "Search: #{params[:phrase]}".strip
-      end
+      subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if incidents.empty?
         print cyan,"No incidents found.",reset,"\n"
@@ -104,25 +91,23 @@ class Morpheus::Cli::MonitoringIncidentsCommand
     connect(options)
     begin
       params = {}
-      [:phrase, :offset, :max, :sort, :direction, :lastUpdated].each do |k|
-        params[k] = options[k] unless options[k].nil?
-      end
+      params.merge!(parse_list_options(options))
       if options[:dry_run]
         print_dry_run @monitoring_interface.incidents.dry.stats(params)
         return
       end
       json_response = @monitoring_interface.incidents.stats(params)
       if options[:json]
-        if options[:include_fields]
-          json_response.merge!({"openIncidents" => filter_data(json_response["openIncidents"], options[:include_fields])})
-        end
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "openIncidents")
+        return 0
+      elsif options[:csv]
+        puts records_as_csv(json_response['openIncidents'], options)
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "openIncidents")
         return 0
       end
-      # if options[:csv]
-      #   puts records_as_csv(json_response['openIncidents'], options)
-      #   return 0
-      # end
+      
       open_incidents = json_response['openIncidents']
       open_incidents_count = json_response['openIncidentCount']
       stats = json_response['incidentStats']
@@ -205,17 +190,14 @@ class Morpheus::Cli::MonitoringIncidentsCommand
       json_response = @monitoring_interface.incidents.get(incident['id'])
       incident = json_response['incident']
       
-      if options[:include_fields]
-        json_response = {"incident" => filter_data(json_response["incident"], options[:include_fields]) }
-      end
       if options[:json]
-        puts as_json(json_response, options)
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options)
+        puts as_json(json_response, options, "incident")
         return 0
       elsif options[:csv]
-        puts records_as_csv(json_response['incident'], options)
+        puts records_as_csv([json_response['incident']], options)
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "incident")
         return 0
       end
 
@@ -303,7 +285,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
       opts.on('--severity LIST', Array, "Filter by severity. critical, warning, info") do |list|
         params['severity'] = list
       end
-      build_common_options(opts, options, [:list, :last_updated, :json, :csv, :fields, :json, :dry_run, :remote])
+      build_common_options(opts, options, [:list, :last_updated, :json, :csv, :yaml, :fields, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
     if args.count < 1
@@ -313,12 +295,9 @@ class Morpheus::Cli::MonitoringIncidentsCommand
     connect(options)
     begin
       incident = find_incident_by_id(args[0])
-      # return false if incident.nil?
+      return 1 if incident.nil?
       
-      [:phrase, :offset, :max, :sort, :direction, :lastUpdated].each do |k|
-        params[k] = options[k] unless options[k].nil?
-      end
-      # JD: lastUpdated 500ing, incidents don't have that property ? =o  Fix it!
+      params.merge!(parse_list_options(options))
 
       if options[:dry_run]
         print_dry_run @monitoring_interface.incidents.dry.history(incident['id'], params)
@@ -327,22 +306,19 @@ class Morpheus::Cli::MonitoringIncidentsCommand
 
       json_response = @monitoring_interface.incidents.history(incident['id'], params)
       if options[:json]
-        if options[:include_fields]
-          json_response = {"history" => filter_data(json_response["history"], options[:include_fields]) }
-        end
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "history")
         return 0
-      end
-      if options[:csv]
+      elsif options[:csv]
         puts records_as_csv(json_response['history'], options)
         return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "history")
+        return 0
       end
       history_items = json_response['history']
       title = "Incident History: #{incident['id']}: #{incident['displayName'] || incident['name']}"
       subtitles = []
-      if params[:phrase]
-        subtitles << "Search: #{params[:phrase]}".strip
-      end
+      subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if history_items.empty?
         print cyan,"No history found.",reset,"\n"
@@ -361,7 +337,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
     options = {}
     optparse = OptionParser.new do|opts|
       opts.banner = subcommand_usage("[id] [options]")
-      build_common_options(opts, options, [:list, :json, :csv, :fields, :json, :dry_run, :remote])
+      build_common_options(opts, options, [:list, :json, :csv, :yaml, :fields, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
     if args.count < 1
@@ -373,9 +349,7 @@ class Morpheus::Cli::MonitoringIncidentsCommand
       incident = find_incident_by_id(args[0])
       # return false if incident.nil?
       params = {}
-      [:phrase, :offset, :max, :sort, :direction].each do |k|
-        params[k] = options[k] unless options[k].nil?
-      end
+      params.merge!(parse_list_options(options))
       
       if options[:dry_run]
         print_dry_run @monitoring_interface.incidents.dry.notifications(incident['id'], params)
@@ -384,22 +358,19 @@ class Morpheus::Cli::MonitoringIncidentsCommand
 
       json_response = @monitoring_interface.incidents.notifications(incident['id'], params)
       if options[:json]
-        if options[:include_fields]
-          json_response = {"notifications" => filter_data(json_response["notifications"], options[:include_fields]) }
-        end
-        puts as_json(json_response, options)
+        puts as_json(json_response, options, "notifications")
         return 0
-      end
-      if options[:csv]
+      elsif options[:csv]
         puts records_as_csv(json_response['notifications'], options)
         return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "notifications")
+        return 0
       end
       notification_items = json_response['notifications']
       title = "Incident Notifications: #{incident['id']}: #{incident['displayName'] || incident['name']}"
       subtitles = []
-      if params[:phrase]
-        subtitles << "Search: #{params[:phrase]}".strip
-      end
+      subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
       if notification_items.empty?
         print cyan,"No notifications found.",reset,"\n"