morpheus-cli 2.10.3 → 2.11.0

data/lib/morpheus/api/monitoring_groups_interface.rb

@@ -0,0 +1,47 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::MonitoringGroupsInterface < Morpheus::APIClient
+  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
+    @access_token = access_token
+    @refresh_token = refresh_token
+    @base_url = base_url
+    @expires_at = expires_at
+  end
+
+  def get(id, params={})
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = "#{@base_url}/api/monitoring/groups/#{id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def list(params={})
+    url = "#{@base_url}/api/monitoring/groups"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def create(payload)
+    url = "#{@base_url}/api/monitoring/groups"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def update(id, payload)
+    url = "#{@base_url}/api/monitoring/groups/#{id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def destroy(id)
+    url = "#{@base_url}/api/monitoring/groups/#{id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, headers: headers}
+    execute(opts)
+  end
+
+end

data/lib/morpheus/api/monitoring_interface.rb

@@ -0,0 +1,36 @@
+require 'morpheus/api/api_client'
+require 'morpheus/api/checks_interface'
+require 'morpheus/api/incidents_interface'
+require 'morpheus/api/monitoring_contacts_interface'
+require 'morpheus/api/monitoring_groups_interface'
+require 'morpheus/api/monitoring_apps_interface'
+
+class Morpheus::MonitoringInterface < Morpheus::APIClient
+  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
+    @access_token = access_token
+    @refresh_token = refresh_token
+    @base_url = base_url
+    @expires_at = expires_at
+  end
+
+  def checks
+    Morpheus::ChecksInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def incidents
+    Morpheus::IncidentsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def contacts
+    Morpheus::MonitoringContactsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def groups
+    Morpheus::MonitoringGroupsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+
+  def apps
+    Morpheus::MonitoringAppsInterface.new(@access_token, @refresh_token, @expires_at, @base_url)
+  end
+  
+end

data/lib/morpheus/api/option_type_lists_interface.rb

@@ -0,0 +1,47 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::OptionTypeListsInterface < Morpheus::APIClient
+  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
+    @access_token = access_token
+    @refresh_token = refresh_token
+    @base_url = base_url
+    @expires_at = expires_at
+  end
+
+  def get(id)
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = "#{@base_url}/api/library/option-type-lists/#{id}"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def list(params={})
+    url = "#{@base_url}/api/library/option-type-lists"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers[:params].merge!(params)
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def create(payload)
+    url = "#{@base_url}/api/library/option-type-lists"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def update(id, payload)
+    url = "#{@base_url}/api/library/option-type-lists/#{id}"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def destroy(id)
+    url = "#{@base_url}/api/library/option-type-lists/#{id}"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, headers: headers}
+    execute(opts)
+  end
+end

data/lib/morpheus/api/option_types_interface.rb

@@ -0,0 +1,47 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::OptionTypesInterface < Morpheus::APIClient
+  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
+    @access_token = access_token
+    @refresh_token = refresh_token
+    @base_url = base_url
+    @expires_at = expires_at
+  end
+
+  def get(id)
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = "#{@base_url}/api/library/option-types/#{id}"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def list(params={})
+    url = "#{@base_url}/api/library/option-types"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers[:params].merge!(params)
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def create(payload)
+    url = "#{@base_url}/api/library/option-types"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def update(id, payload)
+    url = "#{@base_url}/api/library/option-types/#{id}"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def destroy(id)
+    url = "#{@base_url}/api/library/option-types/#{id}"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, headers: headers}
+    execute(opts)
+  end
+end

data/lib/morpheus/api/roles_interface.rb

@@ -13,7 +13,6 @@ class Morpheus::RolesInterface < Morpheus::APIClient
     url = build_url(account_id, id)
     headers = { params: {}, authorization: "Bearer #{@access_token}" }
     execute(method: :get, url: url, headers: headers)
-    execute(method: :get, url: url, headers: headers)
   end
 
   def list(account_id, options={})

data/lib/morpheus/api/setup_interface.rb

@@ -12,20 +12,30 @@ class Morpheus::SetupInterface < Morpheus::APIClient
     @base_url = base_url
   end
 
-  def get(options={})
+  # no JSON here, just a 200 OK 'NOTHING TO SEE HERE'
+  def ping(params={}, timeout=5)
+    url = "#{@base_url}/ping"
+    headers = {:params => params }
+    opts = {method: :get, url: url, headers: headers, timeout: timeout}
+    execute(opts, false)
+  end
+
+  def check(params={}, timeout=5)
+    url = "#{@base_url}/api/setup/check"
+    headers = {:params => params, 'Content-Type' => 'application/json' }
+    execute(method: :get, url: url, headers: headers, timeout: timeout)
+  end
+
+  def get(params={}, timeout=30)
     url = "#{@base_url}/api/setup"
-    # headers = {:params => {}, authorization: "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    headers = {:params => {}, 'Content-Type' => 'application/json' }
-    headers[:params].merge!(options)
-    execute(method: :get, url: url, headers: headers)
+    headers = {:params => params, 'Content-Type' => 'application/json' }
+    execute(method: :get, url: url, headers: headers, timeout: timeout)
   end
 
-  def init(options={})
+  def init(payload={}, timeout=60)
     url = "#{@base_url}/api/setup/init"
-    # headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     headers = { 'Content-Type' => 'application/json' }
-    payload = options
-    execute(method: :post, url: url, timeout: 30, headers: headers, payload: payload.to_json)
+    execute(method: :post, url: url, headers: headers, payload: payload.to_json, timeout: timeout)
   end
 
 end

data/lib/morpheus/cli.rb

@@ -1,4 +1,5 @@
 require "morpheus/cli/version"
+require 'morpheus/cli/command_error'
 require "morpheus/rest_client"
 require 'morpheus/formatters'
 require 'morpheus/logging'
@@ -39,6 +40,8 @@ module Morpheus
       # utilites
       require 'morpheus/cli/cli_registry.rb'
       require 'morpheus/cli/dot_file.rb'
+      require 'morpheus/cli/command_error'
+
       load 'morpheus/cli/cli_command.rb'
       load 'morpheus/cli/option_types.rb'
       load 'morpheus/cli/credentials.rb'
@@ -81,7 +84,23 @@ module Morpheus
       load 'morpheus/cli/library.rb'
       load 'morpheus/cli/version_command.rb'
       load 'morpheus/cli/alias_command.rb'
-      # Your new commands goes here...
+      # todo: combine checks, incidents, apps, and goups under monitoring?
+      # `monitoring apps|groups` still needed, 
+      # maybe they should go under the apps and groups commands instead?
+      # load 'morpheus/cli/monitoring_command.rb'
+      load 'morpheus/cli/monitoring_incidents_command.rb'
+      load 'morpheus/cli/monitoring_checks_command.rb'
+      load 'morpheus/cli/monitoring_contacts_command.rb'
+      load 'morpheus/cli/monitoring_groups_command.rb'
+      load 'morpheus/cli/monitoring_apps_command.rb'
+
+      # nice to have commands
+      load 'morpheus/cli/curl_command.rb'
+      load 'morpheus/cli/set_prompt_command.rb'
+      load 'morpheus/cli/man_command.rb' # please implement me
+
+
+      # Your new commands go here...
 
     end
 

data/lib/morpheus/cli/accounts.rb

@@ -52,7 +52,12 @@ class Morpheus::Cli::Accounts
         print JSON.pretty_generate(json_response)
         print "\n"
       else
-        print "\n" ,cyan, bold, "Morpheus Accounts\n","==================", reset, "\n\n"
+        title = "Morpheus Accounts"
+        subtitles = []
+        if params[:phrase]
+          subtitles << "Search: #{params[:phrase]}".strip
+        end
+        print_h1 title, subtitles
         if accounts.empty?
           puts yellow,"No accounts found.",reset
         else
@@ -95,7 +100,7 @@ class Morpheus::Cli::Accounts
         print JSON.pretty_generate({account: account})
         print "\n"
       else
-        print "\n" ,cyan, bold, "Account Details\n","==================", reset, "\n\n"
+        print_h1 "Account Details"
         print cyan
         puts "ID: #{account['id']}"
         puts "Name: #{account['name']}"
@@ -112,7 +117,7 @@ class Morpheus::Cli::Accounts
           status_state = "#{red}INACTIVE#{cyan}"
         end
         puts "Status: #{status_state}"
-        print "\n" ,cyan, bold, "Account Instance Limits\n","==================", reset, "\n\n"
+        print_h2 "Account Instance Limits"
         print cyan
         puts "Max Storage (bytes): #{account['instanceLimits'] ? account['instanceLimits']['maxStorage'] : 0}"
         puts "Max Memory (bytes): #{account['instanceLimits'] ? account['instanceLimits']['maxMemory'] : 0}"

data/lib/morpheus/cli/app_templates.rb

@@ -54,9 +54,14 @@ class Morpheus::Cli::AppTemplates
         print JSON.pretty_generate(json_response)
         print "\n"
       else
-        print "\n" ,cyan, bold, "Morpheus App Templates\n","==================", reset, "\n\n"
+        title = "Morpheus App Templates"
+        subtitles = []
+        if params[:phrase]
+          subtitles << "Search: #{params[:phrase]}".strip
+        end
+        print_h1 title, subtitles
         if app_templates.empty?
-          puts yellow,"No app templates found.",reset
+          print cyan,"No app templates found.",reset,"\n"
         else
           print_app_templates_table(app_templates)
           print_results_pagination(json_response)
@@ -103,12 +108,15 @@ class Morpheus::Cli::AppTemplates
         print JSON.pretty_generate(json_response)
         print "\n"
       else
-        print "\n" ,cyan, bold, "App Template Details\n","==================", reset, "\n\n"
+        print_h1 "App Template Details"
         print cyan
-        puts "ID: #{app_template['id']}"
-        puts "Name: #{app_template['name']}"
-        #puts "Category: #{app_template['category']}"
-        puts "Account: #{app_template['account'] ? app_template['account']['name'] : ''}"
+        description_cols = {
+          "ID" => 'id',
+          "Name" => 'name',
+          "Account" => lambda {|it| it['account'] ? it['account']['name'] : '' }
+        }
+        print_description_list(description_cols, app_template)
+
         instance_type_names = (app_template['instanceTypes'] || []).collect {|it| it['name'] }
         #puts "Instance Types: #{instance_type_names.join(', ')}"
         config = app_template['config']['tierView']
@@ -722,9 +730,9 @@ class Morpheus::Cli::AppTemplates
         print JSON.pretty_generate(json_response)
         print "\n"
       else
-        print "\n" ,cyan, bold, "Tiers\n","==================", reset, "\n\n"
+        print_h1 "Available Tiers"
         if tiers.empty?
-          puts yellow,"No tiers found.",reset
+          print yellow,"No tiers found.",reset,"\n"
         else
           rows = tiers.collect do |tier|
             {
@@ -766,9 +774,9 @@ class Morpheus::Cli::AppTemplates
         print JSON.pretty_generate(json_response)
         print "\n"
       else
-        print "\n" ,cyan, bold, "Instance Types\n","==================", reset, "\n\n"
+        print_h1 "Available Instance Types"
         if instance_types.empty?
-          puts yellow,"No instance types found.",reset
+          print yellow,"No instance types found.",reset,"\n"
         else
           rows = instance_types.collect do |instance_type|
             {

data/lib/morpheus/cli/apps.rb

@@ -60,11 +60,23 @@ class Morpheus::Cli::Apps
         return
       end
       apps = json_response['apps']
-      print "\n" ,cyan, bold, "Morpheus Apps\n","==================", reset, "\n\n"
+      title = "Morpheus Apps"
+      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
+      print_h1 title, subtitles
       if apps.empty?
-        puts yellow,"No apps currently configured.",reset
+        print cyan,"No apps found.",reset,"\n"
       else
         print_apps_table(apps)
+        print_results_pagination(json_response)
       end
       print reset,"\n"
     rescue RestClient::Exception => e
@@ -150,21 +162,22 @@ class Morpheus::Cli::Apps
         print JSON.pretty_generate(json_response)
         return
       end
-      print "\n" ,cyan, bold, "App Details\n","==================", reset, "\n\n"
+      print_h1 "App Details"
       print cyan
-      puts "ID: #{app['id']}"
-      puts "Name: #{app['name']}"
-      puts "Description: #{app['description']}"
-      puts "Account: #{app['account'] ? app['account']['name'] : ''}"
-      # puts "Group: #{app['siteId']}"
+      description_cols = {
+        "ID" => 'id',
+        "Name" => 'name',
+        "Description" => 'description',
+        # "Group" => lambda {|it| it['group'] ? it['group']['name'] : it['siteId'] },
+        "Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+        "Status" => lambda {|it| format_app_status(it) }
+      }
+      print_description_list(description_cols, app)
+
       stats = app['stats']
-      if ((stats['maxMemory'].to_i != 0) || (stats['maxStorage'].to_i != 0))
-        print "\n"
-        # print cyan, "Memory: \t#{Filesize.from("#{stats['usedMemory']} B").pretty} / #{Filesize.from("#{stats['maxMemory']} B").pretty}\n"
-        # print cyan, "Storage: \t#{Filesize.from("#{stats['usedStorage']} B").pretty} / #{Filesize.from("#{stats['maxStorage']} B").pretty}\n\n",reset
+      if app['instanceCount'].to_i > 0
+        print_h2 "App Usage"
         print_stats_usage(stats, {include: [:memory, :storage]})
-      else
-        #print yellow, "No stat data.", reset
       end
 
       app_tiers = app['appTiers']
@@ -172,13 +185,14 @@ class Morpheus::Cli::Apps
         puts yellow, "This app is empty", reset
       else
         app_tiers.each do |app_tier|
-          print "\n" ,cyan, bold, "Tier: #{app_tier['tier']['name']}\n","==================", reset, "\n\n"
+          print_h2 "Tier: #{app_tier['tier']['name']}\n"
           print cyan
           instances = (app_tier['appInstances'] || []).collect {|it| it['instance']}
           if instances.empty?
             puts yellow, "This tier is empty", reset
           else
             instance_table = instances.collect do |instance|
+              # JD: fix bug here, status is not returned because withStats: false !?
               status_string = instance['status'].to_s
               if status_string == 'running'
                 status_string = "#{green}#{status_string.upcase}#{cyan}"
@@ -628,11 +642,13 @@ class Morpheus::Cli::Apps
       end
       json_response = @apps_interface.security_groups(app['id'])
       securityGroups = json_response['securityGroups']
-      print "\n" ,cyan, bold, "Morpheus Security Groups for App: #{app['name']}\n","==================", reset, "\n\n"
-      print cyan, "Firewall Enabled=#{json_response['firewallEnabled']}\n\n"
+      print_h1 "Morpheus Security Groups for App: #{app['name']}"
+      print cyan
+      print_description_list({"Firewall Enabled" => lambda {|it| format_boolean it['firewallEnabled'] } }, json_response)
       if securityGroups.empty?
-        puts yellow,"No security groups currently applied.",reset
+        print yellow,"\n","No security groups currently applied.",reset,"\n"
       else
+        print "\n"
         securityGroups.each do |securityGroup|
           print cyan, "=  #{securityGroup['id']} (#{securityGroup['name']}) - (#{securityGroup['description']})\n"
         end
@@ -734,30 +750,18 @@ class Morpheus::Cli::Apps
   end
 
   def print_apps_table(apps, opts={})
+    output = ""
     table_color = opts[:color] || cyan
     rows = apps.collect do |app|
       instances_str = (app['instanceCount'].to_i == 1) ? "1 Instance" : "#{app['instanceCount']} Instances"
       containers_str = (app['containerCount'].to_i == 1) ? "1 Container" : "#{app['containerCount']} Containers"
-      status_string = app['status']
-      if app['instanceCount'].to_i == 0
-        # show this instead of WARNING
-        status_string = "#{white}EMPTY#{table_color}"
-      elsif status_string == 'running'
-        status_string = "#{green}#{status_string.upcase}#{table_color}"
-      elsif status_string == 'stopped' or status_string == 'failed'
-        status_string = "#{red}#{status_string.upcase}#{table_color}"
-      elsif status_string == 'unknown'
-        status_string = "#{white}#{status_string.upcase}#{table_color}"
-      else
-        status_string = "#{yellow}#{status_string.upcase}#{table_color}"
-      end
       {
         id: app['id'],
         name: app['name'],
         instances: instances_str,
         containers: containers_str,
         account: app['account'] ? app['account']['name'] : nil,
-        status: status_string,
+        status: format_app_status(app, table_color),
         #dateCreated: format_local_dt(app['dateCreated'])
       }
     end
@@ -774,10 +778,21 @@ class Morpheus::Cli::Apps
     print reset
   end
 
-  def generate_id(len=16)
-    id = ""
-    len.times { id << (1 + rand(9)).to_s }
-    id
+  def format_app_status(app, return_color=cyan)
+    out = ""
+    status_string = app['status']
+    if app['instanceCount'].to_i == 0
+      # show this instead of WARNING
+      out <<  "#{white}EMPTY#{return_color}"
+    elsif status_string == 'running'
+      out <<  "#{green}#{status_string.upcase}#{return_color}"
+    elsif status_string == 'stopped' or status_string == 'failed'
+      out <<  "#{red}#{status_string.upcase}#{return_color}"
+    elsif status_string == 'unknown'
+      out <<  "#{white}#{status_string.upcase}#{return_color}"
+    else
+      out <<  "#{yellow}#{status_string.upcase}#{return_color}"
+    end
+    out
   end
-
 end