wavefront-cli 6.1.0 → 7.1.0

data/lib/wavefront-cli/commands/spy.rb

@@ -34,9 +34,4 @@ class WavefrontCommandSpy < WavefrontCommandBase
      '-T, --tag-key=TAG        only show metrics with the given point tag key',
      '-y, --type=STRING        one of METRIC, SPAN, HOST, or STRING']
   end
-
-  def postscript
-    "\nNOTE: This command uses the unofficial 'spy' API endpoint, which " \
-      'is not guaranteed to remain stable.'.cmd_fold(TW, 0)
-  end
 end

data/lib/wavefront-cli/commands/usergroup.rb

@@ -24,17 +24,18 @@ class WavefrontCommandUsergroup < WavefrontCommandBase
   def _commands
     ["list #{CMN} [-al] [-O fields] [-o offset] [-L limit]",
      "describe #{CMN} <id>",
-     "create #{CMN} [-p permission...] <name>",
+     "create #{CMN} [-r role_id...] <name>",
      "delete #{CMN} <id>",
      "dump #{CMN}",
      "import #{CMN} [-uU] <file>",
      "set #{CMN} <key=value> <id>",
+     "add to #{CMN} <id> <user>...",
+     "remove from #{CMN} <id> <user>...",
      "users #{CMN} <id>",
+     "add role #{CMN} <id> <role>...",
+     "remove role #{CMN} <id> <role>...",
+     "roles #{CMN} <id>",
      "permissions #{CMN} <id>",
-     "add user #{CMN} <id> <user>...",
-     "remove user #{CMN} <id> <user>...",
-     "grant #{CMN} <permission> to <id>",
-     "revoke #{CMN} <permission> from <id>",
      "search #{CMN} [-al] [-o offset] [-L limit] [-O fields] <condition>..."]
   end
 
@@ -47,11 +48,6 @@ class WavefrontCommandUsergroup < WavefrontCommandBase
      '-O, --fields=F1,F2,...   only show given fields',
      "-u, --update             update an existing #{thing}",
      "-U, --upsert             import new or update existing #{thing}",
-     '-p, --permission=STRING  Wavefront permission']
-  end
-
-  def postscript
-    "'wf settings list permissions' will give you a list of all " \
-    'currently supported permissions.'.fold(TW, 0)
+     '-r, --role-id=STRING     Wavefront role ID']
   end
 end

data/lib/wavefront-cli/commands/write.rb

@@ -18,7 +18,9 @@ class WavefrontCommandWrite < WavefrontCommandBase
      '<metric> [--] <val>...',
      'file [-DnViq] [-c file] [-P profile] [-E proxy] [-H host] ' \
      '[-p port] [-F infileformat] [-m metric] [-T tag...] [-I interval] ' \
-     '[-u method] [-S socket] <file>']
+     '[-u method] [-S socket] <file>',
+     'noise [-DnViq] [-P profile] [-E proxy] [-H host] [-p port] ' \
+     '[-T tag...] [-I interval] [-x value] [-X value] <metric>']
   end
 
   def _options
@@ -33,9 +35,12 @@ class WavefrontCommandWrite < WavefrontCommandBase
      'a file will be assigned. If the file contains a metric name, ' \
      'the two will be dot-concatenated, with this value first',
      '-i, --delta                increment metric by given value',
-     "-I, --interval=INTERVAL    interval of distribution (default 'm')",
+     "-I, --interval=INTERVAL    interval of distribution (default 'm'), or " \
+     'time in seconds between noise values (default 1)',
      '-u, --using=METHOD         method by which to send points',
      '-S, --socket=FILE          Unix datagram socket',
+     '-x, --min=NUMERIC          lower bound of random values (default -10)',
+     '-X, --max=NUMERIC          upper bound of random values (default 10)',
      "-q, --quiet                don't report the points sent summary " \
      '(unless there were errors)']
   end

data/lib/wavefront-cli/controller.rb

@@ -17,6 +17,7 @@ require_relative 'version'
 require_relative 'constants'
 require_relative 'exception'
 require_relative 'opt_handler'
+require_relative 'exception_handler'
 require_relative 'stdlib/string'
 
 CMD_DIR = Pathname.new(__dir__) + 'commands'
@@ -28,6 +29,7 @@ class WavefrontCliController
   attr_reader :args, :usage, :opts, :cmds, :tw
 
   include WavefrontCli::Constants
+  include WavefrontCli::ExceptionMixins
 
   def initialize(args)
     @args = args
@@ -107,12 +109,8 @@ class WavefrontCliController
   #
   def cli_class(cmd, opts)
     load_cli_class(cmd, opts)
-  rescue WavefrontCli::Exception::UnhandledCommand
-    abort 'Fatal error. Unsupported command. Please open a Github issue.'
-  rescue WavefrontCli::Exception::InvalidInput => e
-    abort "Invalid input. #{e.message}"
-  rescue RuntimeError => e
-    abort "Unable to run command. #{e.message}."
+  rescue StandardError => e
+    exception_handler(e)
   end
 
   def load_cli_class(cmd, opts)
@@ -120,68 +118,12 @@ class WavefrontCliController
     Object.const_get('WavefrontCli').const_get(cmds[cmd].sdk_class).new(opts)
   end
 
-  # rubocop:disable Metrics/MethodLength
-  # rubocop:disable Metrics/AbcSize
   def run_command(cli_class_obj)
     cli_class_obj.validate_opts
     cli_class_obj.run
-  rescue Interrupt
-    abort "\nOperation aborted at user request."
-  rescue WavefrontCli::Exception::ConfigFileNotFound => e
-    abort "Configuration file #{e}' not found."
-  rescue WavefrontCli::Exception::CredentialError => e
-    handle_missing_credentials(e)
-  rescue WavefrontCli::Exception::MandatoryValue
-    abort 'A value must be supplied.'
-  rescue Wavefront::Exception::NetworkTimeout
-    abort 'Connection timed out.'
-  rescue Wavefront::Exception::InvalidPermission => e
-    abort "'#{e}' is not a valid privilege."
-  rescue Wavefront::Exception::InvalidUserGroupId => e
-    abort "'#{e}' is not a valid user group id."
-  rescue WavefrontCli::Exception::InvalidValue => e
-    abort "Invalid value for #{e}."
-  rescue WavefrontCli::Exception::ProfileExists => e
-    abort "Profile '#{e}' already exists."
-  rescue WavefrontCli::Exception::ProfileNotFound => e
-    abort "Profile '#{e}' not found."
-  rescue WavefrontCli::Exception::FileNotFound
-    abort 'File not found.'
-  rescue WavefrontCli::Exception::InsufficientData => e
-    abort "Insufficient data. #{e.message}"
-  rescue WavefrontCli::Exception::InvalidQuery => e
-    abort "Invalid query. API message: '#{e.message}'."
-  rescue WavefrontCli::Exception::SystemError => e
-    abort "Host system error. #{e.message}"
-  rescue WavefrontCli::Exception::UnparseableInput => e
-    abort "Cannot parse input. #{e.message}"
-  rescue WavefrontCli::Exception::UnparseableSearchPattern
-    abort 'Searches require a key, a value, and a match operator.'
-  rescue WavefrontCli::Exception::UnsupportedFileFormat
-    abort 'Unsupported file format.'
-  rescue WavefrontCli::Exception::UnsupportedOperation => e
-    abort "Unsupported operation.\n#{e.message}"
-  rescue WavefrontCli::Exception::UnsupportedOutput => e
-    abort e.message
-  rescue WavefrontCli::Exception::UnsupportedNoop
-    abort 'Multiple API call operations cannot be performed as no-ops.'
-  rescue WavefrontCli::Exception::UserGroupNotFound => e
-    abort "Cannot find user group '#{e.message}'."
-  rescue Wavefront::Exception::UnsupportedWriter => e
-    abort "Unsupported writer '#{e.message}'."
-  rescue WavefrontCli::Exception::UserError => e
-    abort "User error: #{e.message}."
-  rescue WavefrontCli::Exception::ImpossibleSearch
-    abort 'Search on non-existent key. Please use a top-level field.'
-  rescue Wavefront::Exception::InvalidSamplingValue
-    abort 'Sampling rates must be between 0 and 0.05.'
   rescue StandardError => e
-    warn "general error: #{e}"
-    backtrace_message(e)
-    abort
+    exception_handler(e)
   end
-  # rubocop:enable Metrics/MethodLength
-  # rubocop:enable Metrics/AbcSize
 
   def backtrace_message(err)
     if opts[:debug]

data/lib/wavefront-cli/display/account.rb

@@ -0,0 +1,122 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+module WavefrontDisplay
+  #
+  # Format human-readable output for account management.
+  #
+  class Account < Base
+    def do_list_brief
+      filter_user_list
+      puts(data.map { |account| account[:identifier] })
+    end
+
+    def do_list
+      filter_user_list
+      super
+    end
+
+    def do_role_add_to
+      puts format("Gave %<quoted_roles>s to '%<id>s'.",
+                  id: options[:'<id>'],
+                  quoted_roles: quoted(options[:'<role>']))
+    end
+
+    def do_role_remove_from
+      puts format("Removed %<quoted_roles>s from '%<id>s'.",
+                  id: options[:'<id>'],
+                  quoted_roles: quoted(options[:'<role>']))
+    end
+
+    def do_roles
+      roles = data.fetch(:roles, [])
+      puts roles.empty? ? "'#{options[:'<id>']}' has no roles." : roles
+    end
+
+    def do_group_add_to
+      puts format("Added '%<id>s' to %<quoted_group>s.",
+                  id: options[:'<id>'],
+                  quoted_group: quoted(options[:'<group>']))
+    end
+
+    def do_group_remove_from
+      puts format("Removed '%<id>s' from %<quoted_group>s.",
+                  id: options[:'<id>'],
+                  quoted_group: quoted(options[:'<group>']))
+    end
+
+    def do_groups
+      groups = data.fetch(:userGroups, [])
+
+      if groups.empty?
+        puts "'#{options[:'<id>']}' does not belong to any groups."
+      else
+        puts groups.sort
+      end
+    end
+
+    def do_business_functions
+      puts data.sort
+    end
+
+    def do_grant_to
+      puts format("Granted '%<permission>s' to %<quoted_accounts>s.",
+                  permission: options[:'<permission>'],
+                  quoted_accounts: quoted(options[:'<account>']))
+    end
+
+    def do_revoke_from
+      puts format("Revoked '%<permission>s' from %<quoted_accounts>s.",
+                  permission: options[:'<permission>'],
+                  quoted_accounts: quoted(options[:'<account>']))
+    end
+
+    def do_permissions
+      perms = data.fetch(:groups, [])
+
+      if perms.empty?
+        puts "'#{options[:'<id>']}' does not have any permissions directly " \
+             'attached.'
+      else
+        puts perms.sort
+      end
+    end
+
+    def do_ingestionpolicy_add_to
+      puts format("Added '%<policy>s' to '%<id>s'.",
+                  id: options[:'<id>'],
+                  policy: options[:'<policy>'])
+    end
+
+    def do_ingestionpolicy_remove_from
+      puts format("Removed '%<policy>s' from '%<id>s'.",
+                  id: options[:'<id>'],
+                  policy: options[:'<policy>'])
+    end
+
+    def do_ingestionpolicy
+      policy = data.fetch(:ingestionPolicyId, [])
+
+      if policy.empty?
+        puts "'#{options[:'<id>']}' has no ingestion policy."
+      else
+        puts policy
+      end
+    end
+
+    def do_invite_user
+      puts format("Sent invitation to '%<id>s'.", id: options[:'<id>'])
+    end
+
+    private
+
+    def filter_user_list
+      if options[:user]
+        data.delete_if { |a| a[:identifier].start_with?('sa::') }
+      elsif options[:service]
+        data.delete_if { |a| !a[:identifier].start_with?('sa::') }
+      end
+    end
+  end
+end

data/lib/wavefront-cli/display/alert.rb

@@ -74,5 +74,13 @@ module WavefrontDisplay
     def do_version
       puts data.max
     end
+
+    def do_affected_hosts
+      if data == [nil]
+        puts 'Alert event is not attached to any hosts.'
+      else
+        long_output
+      end
+    end
   end
 end

data/lib/wavefront-cli/display/base.rb

@@ -112,7 +112,7 @@ module WavefrontDisplay
     # long listing objects. Subclasses may define their own.
     #
     def priority_keys
-      %i[id name]
+      %i[id name identifier]
     end
 
     def prioritize_keys(data, keys)

data/lib/wavefront-cli/display/cloudintegration.rb

@@ -8,11 +8,12 @@ module WavefrontDisplay
   #
   class CloudIntegration < Base
     def do_list_brief
-      multicolumn(:id, :service)
+      multicolumn(:id, :service, :name)
     end
 
     def do_describe
-      readable_time(:lastReceivedDataPointMs, :lastProcessingTimestamp)
+      readable_time(:lastReceivedDataPointMs, :lastProcessingTimestamp,
+                    :createdEpochMillis, :updatedEpochMillis)
       drop_fields(:forceSave, :inTrash, :deleted)
       long_output
     end

data/lib/wavefront-cli/display/printer/long.rb

@@ -8,6 +8,7 @@ module WavefrontDisplayPrinter
   #
   class Long
     attr_reader :opts, :list, :kw
+
     #
     # @param data [Hash] of data to display
     # @param fields [Array[Symbol]] requred fields
@@ -55,7 +56,7 @@ module WavefrontDisplayPrinter
     def preened_value(value)
       return value unless value.is_a?(String) && value =~ /<.*>/
 
-      value.gsub(%r{<\/?[^>]*>}, '').delete("\n")
+      value.gsub(%r{</?[^>]*>}, '').delete("\n")
     end
 
     # A recursive function which takes a structure, most likely a

data/lib/wavefront-cli/display/role.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+module WavefrontDisplay
+  #
+  # Format human-readable output for role command
+  #
+  class Role < Base
+    def do_list_brief
+      data.map! do |d|
+        d.merge(acct_count: "#{d[:linkedAccountsCount]} accounts",
+                group_count: "#{d[:linkedGroupsCount]} groups")
+      end
+      multicolumn(:id, :name, :acct_count, :group_count)
+    end
+
+    def do_accounts
+      if data.empty?
+        puts "No accounts have role '#{options[:'<id>']}'."
+      else
+        multicolumn(:identifier)
+      end
+    end
+
+    def do_groups
+      if data.empty?
+        puts "No groups have role '#{options[:'<id>']}'."
+      else
+        multicolumn(:id, :name)
+      end
+    end
+
+    def do_permissions
+      if data[:permissions].empty?
+        puts "Role '#{options[:'<id>']}' has no permissions."
+      else
+        puts data[:permissions]
+      end
+    end
+
+    def do_grant
+      puts format("Granted '%<perm>s' permission to '%<id>s'.",
+                  perm: options[:'<permission>'],
+                  id: options[:'<id>'])
+    end
+
+    def do_revoke
+      puts format("Revoked '%<perm>s' permission from '%<id>s'.",
+                  perm: options[:'<permission>'],
+                  id: options[:'<id>'])
+    end
+
+    def do_give_to
+      puts format("Gave '%<role>s' to %<members>s.",
+                  members: quoted(options[:'<member>']),
+                  role: options[:'<id>']).fold(TW, 0)
+    end
+
+    def do_take_from
+      puts format("Took '%<role>s' from %<members>s.",
+                  members: quoted(options[:'<member>']),
+                  role: options[:'<id>']).fold(TW, 0)
+    end
+  end
+end

data/lib/wavefront-cli/display/settings.rb

@@ -8,6 +8,7 @@ module WavefrontDisplay
   #
   class Settings < Base
     def do_list_permissions
+      data.sort_by! { |p| p[:groupName] }
       options[:long] ? long_output : multicolumn(:groupName)
     end
 

data/lib/wavefront-cli/display/usergroup.rb

@@ -15,28 +15,28 @@ module WavefrontDisplay
       puts "Deleted user group '#{options[:'<id>']}'."
     end
 
-    def do_add_user
+    def do_add_to
       puts format("Added %<quoted_user>s to '%<group_id>s'.",
                   quoted_user: quoted(options[:'<user>']),
                   group_id: options[:'<id>']).fold(TW, 0)
     end
 
-    def do_remove_user
+    def do_remove_from
       puts format("Removed %<quoted_user>s from '%<group_id>s'.",
                   quoted_user: quoted(options[:'<user>']),
                   group_id: options[:'<id>']).fold(TW, 0)
     end
 
-    def do_grant
-      puts format("Granted '%<perm>s' permission to '%<group_id>s'.",
-                  perm: options[:'<permission>'],
-                  group_id: options[:'<id>'])
+    def do_add_role
+      puts format("Added %<quoted_role>s to '%<group_id>s'.",
+                  quoted_role: quoted(options[:'<role>']),
+                  group_id: options[:'<id>']).fold(TW, 0)
     end
 
-    def do_revoke
-      puts format("Revoked '%<perm>s' permission from '%<group_id>s'.",
-                  perm: options[:'<permission>'],
-                  group_id: options[:'<id>'])
+    def do_remove_role
+      puts format("Removed %<quoted_role>s from '%<group_id>s'.",
+                  quoted_role: quoted(options[:'<role>']),
+                  group_id: options[:'<id>']).fold(TW, 0)
     end
 
     def do_users
@@ -47,12 +47,16 @@ module WavefrontDisplay
            end)
     end
 
-    def do_permissions
-      puts(if !data.include?(:permissions) || data[:permissions].empty?
-             "Group '#{options[:'<id>']}' has no permissions."
+    def do_roles
+      puts(if !data.include?(:roles) || data[:roles].empty?
+             "Group '#{options[:'<id>']}' has no roles attached."
            else
-             data[:permissions]
+             data[:roles].map { |r| r[:id] }
            end)
     end
+
+    def do_permissions
+      puts data[:roles].map { |r| r[:permissions] }.flatten.sort.uniq
+    end
   end
 end