morpheus-cli 4.1.4 → 4.1.5

data/lib/morpheus/cli/monitoring_apps_command.rb

@@ -8,9 +8,10 @@ class Morpheus::Cli::MonitoringAppsCommand
   set_command_name :'monitor-apps'
 
   register_subcommands :list, :get, :add, :update, :remove
-  register_subcommands :mute, :unmute #, :history, :statistics
+  register_subcommands :mute, :unmute
   register_subcommands :'mute-all' => :mute_all
   register_subcommands :'unmute-all' => :unmute_all
+  #register_subcommands :history
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
@@ -82,6 +83,11 @@ class Morpheus::Cli::MonitoringAppsCommand
       # 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)
@@ -105,6 +111,7 @@ class Morpheus::Cli::MonitoringAppsCommand
         print_dry_run @monitoring_apps_interface.dry.get(monitor_app['id'])
         return
       end
+      # get by ID to sideload associated checks
       json_response = @monitoring_apps_interface.get(monitor_app['id'])
       monitor_app = json_response['monitorApp']
       if options[:json]
@@ -118,7 +125,7 @@ class Morpheus::Cli::MonitoringAppsCommand
         return 0
       end
 
-      print_h1 "Monitoring App Details"
+      print_h1 "Monitoring App Details", [], options
       print cyan
       description_cols = {
         "ID" => lambda {|it| it['id'] },
@@ -129,7 +136,7 @@ class Morpheus::Cli::MonitoringAppsCommand
         "Availability" => lambda {|it| it['availability'] ? "#{it['availability'].to_f.round(3).to_s}%" : "N/A"},
         "Response Time" => lambda {|it| it['lastTimer'] ? "#{it['lastTimer']}ms" : "N/A" }
       }
-      print_description_list(description_cols, monitor_app)
+      print_description_list(description_cols, monitor_app, options)
 
       ## Chart Stats
 
@@ -137,7 +144,7 @@ class Morpheus::Cli::MonitoringAppsCommand
       ## Checks in this app
       checks = json_response["checks"]
       if checks && !checks.empty?
-        print_h2 "Checks"
+        print_h2 "Checks", options
         print_checks_table(checks, options)
       else
         # print "\n"
@@ -147,13 +154,19 @@ class Morpheus::Cli::MonitoringAppsCommand
       ## Check Groups in this app
       check_groups = json_response["checkGroups"]
       if check_groups && !check_groups.empty?
-        print_h2 "Groups"
+        print_h2 "Groups", options
         print_check_groups_table(check_groups, options)
       else
         # print "\n"
         # puts "No check groups in this monitoring app"
       end
 
+      ## Checks in this check group
+      if (!checks || checks.empty?) && (check_groups || check_groups.empty?)
+        print "\n", yellow
+        puts "This monitor app is empty, it contains no checks or groups."
+      end
+
       ## Open Incidents
       open_incidents = json_response["openIncidents"]
       if open_incidents && !open_incidents.empty?
@@ -174,7 +187,7 @@ class Morpheus::Cli::MonitoringAppsCommand
         issues = history_items
         if history_items && !history_items.empty?
           print_h2 "History"
-          print_check_history_table(history_items, options)
+          print_monitor_app_history_table(history_items, options)
           print_results_pagination(history_json_response, {:label => "event", :n_label => "events"})
         else
           print "\n"
@@ -247,7 +260,7 @@ class Morpheus::Cli::MonitoringAppsCommand
       if history_items.empty?
         print cyan,"No history found.",reset,"\n"
       else
-        print_check_history_table(history_items, options)
+        print_monitor_app_history_table(history_items, options)
         print_results_pagination(json_response, {:label => "event", :n_label => "events"})
       end
       print reset,"\n"
@@ -277,15 +290,18 @@ class Morpheus::Cli::MonitoringAppsCommand
       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 app, comma separated list of IDs") do |list|
-        if list.size == 1 && list[0] == 'null' # hacky way to clear it
+      opts.on('--muted [on|off]', String, "Muted, Turns Affects Availability off.") do |val|
+        params['muted'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
+      end
+      opts.on('--checks LIST', Array, "Checks to include in this app, 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
         end
       end
-      opts.on('--checkGroups LIST', Array, "Check Groups to include in this app, comma separated list of IDs") do |list|
-        if list.size == 1 && list[0] == 'null' # hacky way to clear it
+      opts.on('--groups LIST', Array, "Check Groups to include in this app, comma separated list of names or IDs.") do |list|
+        if list.size == 1 && ('[]' == list[0]) # clear array
           params['checkGroups'] = []
         else
           params['checkGroups'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
@@ -314,13 +330,35 @@ class Morpheus::Cli::MonitoringAppsCommand
       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 alert rule.'}], options[:options])
+          params['name'] = v_prompt['name']
         end
-        if params['checkGroups']
-          params['checkGroups'] = params['checkGroups'].collect {|it| it.to_i }
+        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 app 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? && params['muted'].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?
+
+        # Check Groups
+        prompt_results = prompt_for_check_groups(params, options, @api_client)
+        if prompt_results[:success]
+          params['checkGroups'] = prompt_results[:data] unless prompt_results[:data].nil?
+        else
+          return 1
+        end
+
         payload = {'monitorApp' => params}
       end
       @monitoring_apps_interface.setopts(options)
@@ -363,15 +401,18 @@ class Morpheus::Cli::MonitoringAppsCommand
       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 app, comma separated list of IDs") do |list|
-        if list.size == 1 && list[0] == 'null' # hacky way to clear it
+      opts.on('--muted [on|off]', String, "Muted, Turns Affects Availability off.") do |val|
+        params['muted'] = val.nil? || val.to_s == 'on' || val.to_s == 'true'
+      end
+      opts.on('--checks LIST', Array, "Checks to include in this app, 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
         end
       end
-      opts.on('--checkGroups LIST', Array, "Check Groups to include in this app, comma separated list of IDs") do |list|
-        if list.size == 1 && list[0] == 'null' # hacky way to clear it
+      opts.on('--groups LIST', Array, "Check Groups to include in this app, comma separated list of names or IDs.") do |list|
+        if list.size == 1 && ('[]' == list[0]) # clear array
           params['checkGroups'] = []
         else
           params['checkGroups'] = list.collect {|it| it.to_s.strip.empty? ? nil : it.to_s.strip }.compact.uniq
@@ -397,13 +438,27 @@ class Morpheus::Cli::MonitoringAppsCommand
       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_results(params, options, @api_client)
+          if prompt_results[:success]
+            params['checks'] = prompt_results[:data] unless prompt_results[:data].nil?
+          else
+            return 1
+          end
         end
+
+        # Check Groups
         if params['checkGroups']
-          params['checkGroups'] = params['checkGroups'].collect {|it| it.to_i }
+          prompt_results = prompt_for_check_groups(params, options, @api_client)
+          if prompt_results[:success]
+            params['checkGroups'] = prompt_results[:data] unless prompt_results[:data].nil?
+          else
+            return 1
+          end
         end
-        # todo: prompt?
+
         payload = {'monitorApp' => params}
       end
       @monitoring_apps_interface.setopts(options)
@@ -427,11 +482,12 @@ class Morpheus::Cli::MonitoringAppsCommand
 
   def mute(args)
     options = {}
-    params = {'enabled' => true}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       opts.on(nil, "--disable", "Unmute instead, the same as the unmute command") do
         params['enabled'] = false
+        params['muted'] = false
       end
       opts.footer = "Mute a monitoring app. This prevents it from creating new incidents." + "\n" +
                     "[name] is required. This is the name or id of a monitoring app."
@@ -477,7 +533,7 @@ class Morpheus::Cli::MonitoringAppsCommand
 
   def unmute(args)
     options = {}
-    params = {'enabled' => false}
+    params = {'muted' => false, 'enabled' => false}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_common_options(opts, options, [:payload, :json, :dry_run, :remote, :quiet])
@@ -521,10 +577,11 @@ class Morpheus::Cli::MonitoringAppsCommand
 
   def mute_all(args)
     options = {}
-    params = {'enabled' => true}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       opts.on(nil, "--disable", "Unmute instead, the same as the unmute-all command") do
+        params['muted'] = false
         params['enabled'] = false
       end
       opts.footer = "Mute all monitoring apps. This prevents the creation of new incidents."
@@ -569,7 +626,7 @@ class Morpheus::Cli::MonitoringAppsCommand
 
   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])
@@ -614,7 +671,7 @@ class Morpheus::Cli::MonitoringAppsCommand
     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

data/lib/morpheus/cli/monitoring_checks_command.rb

@@ -84,6 +84,11 @@ class Morpheus::Cli::MonitoringChecksCommand
       # 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, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
@@ -107,8 +112,11 @@ class Morpheus::Cli::MonitoringChecksCommand
         print_dry_run @monitoring_checks_interface.dry.get(check['id'])
         return
       end
+
+      # get by ID to sideload associated checks
       json_response = @monitoring_checks_interface.get(check['id'])
       check = json_response['check']
+      
       if options[:json]
         puts as_json(json_response, options, 'check')
         return 0
@@ -164,9 +172,9 @@ class Morpheus::Cli::MonitoringChecksCommand
       
       check_groups = json_response["groups"]
       if check_groups && !check_groups.empty?
-        print_h2 "Groups"
-        #print as_pretty_table(check_groups, [:id, :name], options)
-        print_check_groups_table(check_groups, options)
+        print_h2 "Check Groups"
+        print as_pretty_table(check_groups, [:id, :name], options)
+        #print_check_groups_table(check_groups, options)
       else
         # print "\n"
         # puts "This check is not in any check groups."
@@ -184,18 +192,17 @@ class Morpheus::Cli::MonitoringChecksCommand
       ## Open Incidents
 
       open_incidents = json_response["openIncidents"]
+
       if open_incidents && !open_incidents.empty?
         print_h2 "Open Incidents"
-        # puts "\n(table coming soon...)\n"
-        puts JSON.pretty_generate(open_incidents)
-        # todo: move this to MonitoringHelper ?
-        # print_incidents_table(issues, options)
+        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"
+        puts "No open incidents for this monitoring app"
       end
 
-      ## History (plain old Hash)
+      ## History
       if options[:show_history]
         # history_items = json_response["history"]
         # gotta go get it
@@ -293,15 +300,12 @@ class Morpheus::Cli::MonitoringChecksCommand
   def add(args)
     options = {:skip_booleanize => true}
     params = {'inUptime' => true, 'severity' => 'critical'}
+    check_type_code = nil
     check_type = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] -t CODE")
-      opts.on('-t', '--type CODE', "Check Type Code or ID") do |val|
-        if val.to_s =~ /\A\d{1,}\Z/
-          params['checkType'] = {'id' => val.to_i}
-        else
-          params['checkType'] = {'code' => val}
-        end
+      opts.on('-t', '--type CODE', "Check Type Code") do |val|
+        check_type_code = val
       end
       opts.on('--name VALUE', String, "Name") do |val|
         params['name'] = val
@@ -345,7 +349,36 @@ class Morpheus::Cli::MonitoringChecksCommand
         payload = options[:payload]
       else
         params.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
-        # todo: load option types based on type and prompt
+        # merge in arbitrary option values
+        if params['name'].nil?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => 'Name', 'required' => true, 'description' => 'The name of this check.'}], options[:options])
+          params['name'] = v_prompt['name']
+        end
+
+        # Check Type
+        # rescue pre 3.6.5 error with maxResults.toLong()
+        available_check_types = []
+        begin
+          available_check_types = @monitoring_checks_interface.list_check_types({max:1000})['checkTypes']
+        rescue RestClient::Exception => e
+          available_check_types = @monitoring_checks_interface.list_check_types({})['checkTypes']
+        end
+        if available_check_types && available_check_types.size > 0
+          options[:options]['type'] = check_type_code if check_type_code
+          check_types_dropdown = available_check_types.collect {|it| {'name' => it['name'], 'value' => it['code']} }
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'type' => 'select', 'selectOptions' => check_types_dropdown, 'fieldLabel' => 'Check Type', 'required' => true, 'description' => 'The check type code.'}], options[:options])
+          check_type_code = v_prompt['type']
+        end
+        if check_type_code
+          params['checkType'] = {'code' => check_type_code}
+        end
+
+        # todo: load check type optionTypes and prompt accordingly..
+
+        # include arbitrary -O options
+        extra_passed_options = options[:options].reject {|k,v| k.is_a?(Symbol) || ['type'].include?(k)}
+        params.deep_merge!(extra_passed_options)
+
         payload = {'check' => params}
       end
       @monitoring_checks_interface.setopts(options)
@@ -359,7 +392,7 @@ class Morpheus::Cli::MonitoringChecksCommand
       elsif !options[:quiet]
         check = json_response['check']
         print_green_success "Added check #{check['name']}"
-        _get(check['id'], {})
+        _get(check['id'], options)
       end
       return 0
     rescue RestClient::Exception => e
@@ -425,7 +458,7 @@ class Morpheus::Cli::MonitoringChecksCommand
         puts as_json(json_response, options)
       elsif !options[:quiet]
         print_green_success "Updated check #{check['name']}"
-        _get(check['id'], {})
+        _get(check['id'], options)
       end
       return 0
     rescue RestClient::Exception => e
@@ -437,11 +470,12 @@ class Morpheus::Cli::MonitoringChecksCommand
 
   def mute(args)
     options = {}
-    params = {'enabled' => true}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       opts.on(nil, "--disable", "Disable mute state instead, the same as unmute") do
         params['enabled'] = false
+        params['muted'] = false
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
       opts.footer = "Mute a check. This prevents it from creating new incidents." + "\n" +
@@ -476,7 +510,7 @@ class Morpheus::Cli::MonitoringChecksCommand
         else
           print_green_success "Unmuted check #{check['name']}"
         end
-        _get(check['id'], {})
+        _get(check['id'], options)
       end
       return 0
     rescue RestClient::Exception => e
@@ -520,7 +554,7 @@ class Morpheus::Cli::MonitoringChecksCommand
         puts as_json(json_response, options)
       elsif !options[:quiet]
         print_green_success "Unmuted check #{check['name']}"
-        _get(check['id'], {})
+        _get(check['id'], options)
       end
       return 0
     rescue RestClient::Exception => e
@@ -531,10 +565,11 @@ class Morpheus::Cli::MonitoringChecksCommand
 
   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 state instead, the same as unmute-all") do
+        params['muted'] = false
         params['enabled'] = false
       end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
@@ -579,7 +614,7 @@ class Morpheus::Cli::MonitoringChecksCommand
 
   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, :quiet, :remote])
@@ -624,7 +659,7 @@ class Morpheus::Cli::MonitoringChecksCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :quiet, :remote])
     end
     optparse.parse!(args)
     if args.count != 1
@@ -717,8 +752,6 @@ class Morpheus::Cli::MonitoringChecksCommand
     end
   end
 
-  private
-
-  
+  private  
 
 end