morpheus-cli 4.1.4 → 4.1.5

data/lib/morpheus/cli/monitoring_contacts_command.rb

@@ -34,7 +34,8 @@ class Morpheus::Cli::MonitoringContactsCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:list, :query, :json, :csv, :yaml, :fields, :json, :dry_run])
+      build_common_options(opts, options, [:list, :query, :json, :csv, :yaml, :fields, :json, :dry_run, :remote])
+      opts.footer = "List monitoring contacts."
     end
     optparse.parse!(args)
     connect(options)
@@ -79,7 +80,7 @@ class Morpheus::Cli::MonitoringContactsCommand
   def get(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id list]")
+      opts.banner = subcommand_usage("[contact]")
       opts.on(nil,'--history', "Display History") do |val|
         options[:show_history] = true
       end
@@ -87,11 +88,12 @@ class Morpheus::Cli::MonitoringContactsCommand
         options[:show_notifications] = true
       end
       build_common_options(opts, options, [:json, :csv, :fields, :dry_run, :remote])
+      opts.footer = "Get details about a monitoring contact." + "\n" +
+                    "[contact] is required. This is the name or ID of the contact. Supports 1-N [contact] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
-      puts optparse
-      exit 1
+      raise_command_error "wrong number of arguments, expected 1-N and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
     end
     connect(options)
     id_list = parse_id_list(args)
@@ -109,8 +111,10 @@ class Morpheus::Cli::MonitoringContactsCommand
         print_dry_run @monitoring_contacts_interface.dry.get(contact['id'])
         return
       end
-      json_response = @monitoring_contacts_interface.get(contact['id'])
-      contact = json_response['contact']
+      # save a request
+      # json_response = @monitoring_contacts_interface.get(contact['id'])
+      # contact = json_response['contact']
+      json_response = {'contact' => contact}
       
       if options[:json]
         puts as_json(json_response, options, "contact")
@@ -130,16 +134,16 @@ class Morpheus::Cli::MonitoringContactsCommand
         "Name" => 'name',
         "Email" => 'emailAddress',
         "Mobile" => 'smsAddress',
-        # "Slack Hook" => 'slackHook'
+        "Slack Hook" => 'slackHook'
       }
-      description_cols["Slack Hook"] = 'slackHook' if !contact['slackHook'].empty?
+      description_cols.delete("Slack Hook") if contact['slackHook'].to_s.empty?
       puts as_description_list(contact, description_cols)
      
       ## Notifications
       # show notify events here...
 
-      print reset,"\n"
-
+      print reset
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -163,19 +167,36 @@ class Morpheus::Cli::MonitoringContactsCommand
       opts.on("--slackHook STRING", String, "Contact slack hook") do |val|
         params['slackHook'] = val == 'null' ? nil : val
       end
-      build_common_options(opts, options, [:json, :dry_run, :quiet])
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
+      opts.footer = "Create a monitoring contact." + "\n" +
+                    "[name] is required. This is the name of the new contact."
     end
     optparse.parse!(args)
     connect(options)
-
+    if args.count > 1
+      raise_command_error "wrong number of arguments, expected 0-1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    if args[0]
+      params['name'] = args[0]
+    end
     begin
-
-      if !params["name"]
-        print_red_alert "Name is required"
-        puts optparse
-        exit 1
+      params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+      if params['name'].nil?
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => 'Name', 'required' => true, 'description' => 'The name of this contact.'}], options[:options])
+        params['name'] = v_prompt['name']
       end
-
+      if params['emailAddress'].nil?
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'emailAddress', 'type' => 'text', 'fieldLabel' => 'Email', 'required' => false, 'description' => 'Contact email address.'}], options[:options])
+        params['emailAddress'] = v_prompt['emailAddress'] unless v_prompt['emailAddress'].to_s.empty?
+      end
+      if params['smsAddress'].nil?
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'smsAddress', 'type' => 'text', 'fieldLabel' => 'Mobile', 'required' => false, 'description' => 'Contact sms address, or phone number.'}], options[:options])
+        params['smsAddress'] = v_prompt['smsAddress'] unless v_prompt['smsAddress'].to_s.empty?
+      end
+      # if params['slackHook'].nil?
+      #   v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'slackHook', 'type' => 'text', 'fieldLabel' => 'Slack Hook', 'required' => false, 'description' => 'Contact slack hook.'}], options[:options])
+      #   params['slackHook'] = v_prompt['slackHook'] unless v_prompt['slackHook'].to_s.empty?
+      # end
       payload = {
         'contact' => {}
       }
@@ -192,7 +213,7 @@ class Morpheus::Cli::MonitoringContactsCommand
         puts as_json(json_response, options)
       elsif !options[:quiet]
         print_green_success "Created contact (#{contact['id']}) #{contact['name']}"
-        #_get(contact['id'], {})
+        #_get(contact['id'], options)
       end
 
     rescue RestClient::Exception => e
@@ -205,7 +226,7 @@ class Morpheus::Cli::MonitoringContactsCommand
     options = {}
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id]")
+      opts.banner = subcommand_usage("[contact]")
       opts.on("--name STRING", String, "Contact name") do |val|
         params['name'] = val
       end
@@ -218,12 +239,13 @@ class Morpheus::Cli::MonitoringContactsCommand
       opts.on("--slackHook STRING", String, "Contact slack hook") do |val|
         params['slackHook'] = val == 'null' ? nil : val
       end
-      build_common_options(opts, options, [:json, :dry_run, :quiet])
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
+      opts.footer = "Update a monitoring contact." + "\n" +
+                    "[contact] is required. This is the name or ID of the contact."
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      exit 1
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
     end
     connect(options)
 
@@ -247,11 +269,12 @@ class Morpheus::Cli::MonitoringContactsCommand
       end
 
       json_response = @monitoring_contacts_interface.update(contact["id"], payload)
+      contact = json_response['contact']
       if options[:json]
         puts as_json(json_response, options)
       elsif !options[:quiet]
-        print_green_success "Updated contact #{contact['id']}"
-        _get(contact['id'], {})
+        print_green_success "Updated contact (#{contact['id']}) #{contact['name']}"
+        _get(contact['id'], options)
       end
 
     rescue RestClient::Exception => e
@@ -264,17 +287,18 @@ class Morpheus::Cli::MonitoringContactsCommand
   def remove(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id list]")
+      opts.banner = subcommand_usage("[contact]")
       build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
+      opts.footer = "Delete a monitoring contact." + "\n" +
+                    "[contact] is required. This is the name or ID of the contact. Supports 1-N [contact] arguments."
     end
     optparse.parse!(args)
     if args.count < 1
-      puts optparse
-      exit 1
+      raise_command_error "wrong number of arguments, expected 1-N and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
     end
     connect(options)
     id_list = parse_id_list(args)
-    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to delete contact #{id_list.size == 1 ? 'contact' : 'contacts'} #{anded_list(id_list)}?", options)
+    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to delete #{id_list.size == 1 ? 'contact' : 'contacts'} #{anded_list(id_list)}?", options)
       exit 1
     end
     return run_command_for_each_arg(id_list) do |arg|
@@ -303,55 +327,6 @@ class Morpheus::Cli::MonitoringContactsCommand
     end
   end
 
-  def reopen(args)
-    options = {}
-    optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[id list]")
-      build_common_options(opts, options, [:auto_confirm, :quiet, :json, :dry_run, :remote])
-    end
-    optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      exit 1
-    end
-    connect(options)
-    id_list = parse_id_list(args)
-    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to reopen #{id_list.size == 1 ? 'contact' : 'contacts'} #{anded_list(id_list)}?", options)
-      exit 1
-    end
-    return run_command_for_each_arg(id_list) do |arg|
-      _reopen(arg, options)
-    end
-  end
-
-  def _reopen(id, options)
-
-    begin
-      contact = find_contact_by_name_or_id(id)
-      already_open = contact['status'] == 'open'
-      if already_open
-        print bold,yellow,"contact #{contact['id']} is already open",reset,"\n"
-        return false
-      end
-      @monitoring_contacts_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @monitoring_contacts_interface.dry.reopen(contact['id'])
-        return
-      end
-      json_response = @monitoring_contacts_interface.reopen(contact['id'])
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
-      elsif !options[:quiet]
-        print_green_success json_response["msg"] || "contact #{contact['id']} is now open"
-        # _get(contact['id'] {})
-      end
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
-    end
-  end
-
   private
 
   def print_contacts_table(contacts, opts={})

data/lib/morpheus/cli/monitoring_groups_command.rb

@@ -83,6 +83,11 @@ class Morpheus::Cli::MonitoringGroupsCommand
       # opts.on(nil,'--statistics', "Display Statistics") do |val|
       #   options[:show_statistics] = true
       # end
+      opts.on('-a','--all', "Display All Details (History, Notifications)") do
+        options[:show_history] = true
+        options[:show_notifications] = true
+        options[:show_statistics] = true
+      end
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -106,8 +111,10 @@ class Morpheus::Cli::MonitoringGroupsCommand
         print_dry_run @monitoring_groups_interface.dry.get(check_group['id'])
         return
       end
+      # get by ID to sideload associated checks
       json_response = @monitoring_groups_interface.get(check_group['id'])
       check_group = json_response['checkGroup']
+      
       if options[:json]
         puts as_json(json_response, options, "checkGroup")
         return 0
@@ -145,8 +152,8 @@ class Morpheus::Cli::MonitoringGroupsCommand
         # print as_pretty_table(check_groups, [:id, {"Check Group" => :name}], options)
         print_checks_table(checks, options)
       else
-        # print "\n"
-        # puts "No checks found..."
+        print "\n", yellow
+        puts "No Checks"
       end
 
       ## Open Incidents
@@ -157,8 +164,8 @@ class Morpheus::Cli::MonitoringGroupsCommand
         print_incidents_table(open_incidents)
         # print_results_pagination(size: open_incidents.size, total: open_incidents.size)
       else
-        print "\n", cyan
-        puts "No open incidents for this check group"
+        # print "\n", cyan
+        # puts "No open incidents for this check group"
       end
 
       ## History (plain old Hash)
@@ -170,7 +177,7 @@ class Morpheus::Cli::MonitoringGroupsCommand
         issues = history_items
         if history_items && !history_items.empty?
           print_h2 "History"
-          print_check_history_table(history_items, options)
+          print_check_group_history_table(history_items, options)
           print_results_pagination(history_json_response, {:label => "event", :n_label => "events"})
         else
           print "\n"
@@ -241,7 +248,7 @@ class Morpheus::Cli::MonitoringGroupsCommand
       if history_items.empty?
         print cyan,"No history found.",reset,"\n"
       else
-        print_check_history_table(history_items, options)
+        print_check_group_history_table(history_items, options)
         print_results_pagination(json_response, {:label => "event", :n_label => "events"})
       end
       print reset,"\n"
@@ -253,7 +260,7 @@ class Morpheus::Cli::MonitoringGroupsCommand
 
   def add(args)
     options = {}
-    params = {'inUptime' => true, 'severity' => 'critical'}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       opts.on('--name VALUE', String, "Name") do |val|
@@ -266,13 +273,13 @@ class Morpheus::Cli::MonitoringGroupsCommand
         params['minHappy'] = val.to_i
       end
       opts.on('--severity VALUE', String, "Max Severity. Determines the maximum severity level this group can incur on an incident when failing. Default is critical") do |val|
-        params['severity'] = val
+        params['severity'] = val.to_s.downcase
       end
       opts.on('--inUptime [on|off]', String, "Affects Availability. Default is on.") do |val|
         params['inUptime'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
       end
-      opts.on('--checks LIST', Array, "Checks to include in this group, comma separated list of IDs") do |list|
-        if list.size == 1 && list[0] == 'null' # hacky way to clear it
+      opts.on('--checks LIST', Array, "Checks to include in this group, comma separated list of names or IDs.") do |list|
+        if list.size == 1 && ('[]' == list[0]) # clear array
           params['checks'] = []
         else
           params['checks'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
@@ -301,9 +308,35 @@ class Morpheus::Cli::MonitoringGroupsCommand
       else
         # merge -O options into normally parsed options
         params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
-        if params['checks']
-          params['checks'] = params['checks'].collect {|it| it.to_i }
+        if params['name'].nil?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => 'Name', 'required' => true, 'description' => 'The name of this contact.'}], options[:options])
+          params['name'] = v_prompt['name']
+        end
+        if params['description'].nil?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'type' => 'text', 'fieldLabel' => 'Description', 'required' => false, 'description' => 'Contact email address.'}], options[:options])
+          params['description'] = v_prompt['description'] unless v_prompt['description'].to_s.empty?
+        end
+        if params['minHappy'].nil?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'minHappy', 'type' => 'text', 'fieldLabel' => 'Min. Checks', 'required' => false, 'description' => 'Min Checks. This specifies the minimum number of checks within the group that must be happy to keep the group from becoming unhealthy.', 'defaultValue' => 1}], options[:options])
+          params['minHappy'] = v_prompt['minHappy'] unless v_prompt['minHappy'].to_s.empty?
+        end
+        if params['severity'].nil?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'severity', 'type' => 'text', 'fieldLabel' => 'Severity', 'required' => false, 'description' => 'Max Severity. Determines the maximum severity level this group can incur on an incident when failing. Default is critical', 'defaultValue' => 'critical'}], options[:options])
+          params['severity'] = v_prompt['severity'] unless v_prompt['severity'].to_s.empty?
         end
+        if params['inUptime'].nil?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'inUptime', 'type' => 'checkbox', 'fieldLabel' => 'Affects Availability', 'required' => false, 'description' => 'Affects Availability. Default is on.', 'defaultValue' => true}], options[:options])
+          params['inUptime'] = v_prompt['inUptime'] unless v_prompt['inUptime'].to_s.empty?
+        end
+
+        # Checks
+        prompt_results = prompt_for_checks(params, options, @api_client)
+        if prompt_results[:success]
+          params['checks'] = prompt_results[:data] unless prompt_results[:data].nil?
+        else
+          return 1
+        end
+        
         # todo: prompt?
         payload = {'checkGroup' => params}
       end
@@ -318,7 +351,7 @@ class Morpheus::Cli::MonitoringGroupsCommand
       elsif !options[:quiet]
         check_group = json_response['checkGroup']
         print_green_success "Added check group #{check_group['name']}"
-        _get(check_group['id'], {})
+        _get(check_group['id'], options)
       end
       return 0
     rescue RestClient::Exception => e
@@ -348,8 +381,8 @@ class Morpheus::Cli::MonitoringGroupsCommand
       opts.on('--inUptime [on|off]', String, "Affects Availability. Default is on.") do |val|
         params['inUptime'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
       end
-      opts.on('--checks LIST', Array, "Checks to include in this group, comma separated list of IDs") do |list|
-        if list.size == 1 && list[0] == 'null' # hacky way to clear it
+      opts.on('--checks LIST', Array, "Checks to include in this group, comma separated list of names or IDs.") do |list|
+        if list.size == 1 && ('[]' == list[0]) # clear array
           params['checks'] = []
         else
           params['checks'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
@@ -375,10 +408,15 @@ class Morpheus::Cli::MonitoringGroupsCommand
       else
         # merge -O options into normally parsed options
         params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+        # Checks
         if params['checks']
-          params['checks'] = params['checks'].collect {|it| it.to_i }
+          prompt_results = prompt_for_checks(params, options, @api_client)
+          if prompt_results[:success]
+            params['checks'] = prompt_results[:data] unless prompt_results[:data].nil?
+          else
+            return 1
+          end
         end
-        # todo: prompt?
         payload = {'checkGroup' => params}
       end
       @monitoring_groups_interface.setopts(options)
@@ -391,7 +429,7 @@ class Morpheus::Cli::MonitoringGroupsCommand
         puts as_json(json_response, options)
       elsif !options[:quiet]
         print_green_success "Updated check group #{check_group['name']}"
-        _get(check_group['id'], {})
+        _get(check_group['id'], options)
       end
       return 0
     rescue RestClient::Exception => e
@@ -441,7 +479,7 @@ class Morpheus::Cli::MonitoringGroupsCommand
         else
           print_green_success "Unmuted group #{check_group['name']}"
         end
-        _get(monitor_app['id'], {})
+        _get(check_group['id'], options)
       end
       return 0
     rescue RestClient::Exception => e
@@ -485,7 +523,7 @@ class Morpheus::Cli::MonitoringGroupsCommand
         puts as_json(json_response, options)
       elsif !options[:quiet]
         print_green_success "Unmuted group #{check_group['name']}"
-        _get(check_group['id'], {})
+        _get(check_group['id'], options)
       end
       return 0
     rescue RestClient::Exception => e
@@ -496,10 +534,11 @@ class Morpheus::Cli::MonitoringGroupsCommand
 
   def mute_all(args)
     options = {}
-    params = {'enabled' => true}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       opts.on(nil, "--disable", "Disable mute, the same as unmute-all") do
+        params['muted'] = false
         params['enabled'] = false
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote, :quiet])
@@ -544,7 +583,7 @@ class Morpheus::Cli::MonitoringGroupsCommand
 
   def unmute_all(args)
     options = {}
-    params = {'enabled' => false}
+    params = {'muted' => false, 'enabled' => false}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       build_common_options(opts, options, [:payload, :json, :dry_run, :remote, :quiet])
@@ -589,7 +628,7 @@ class Morpheus::Cli::MonitoringGroupsCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:json, :dry_run, :quiet])
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :quiet, :remote])
     end
     optparse.parse!(args)
     if args.count < 1