wavefront-cli 2.1.6 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f2e02d1e31da1b3ad2fd05c895813c97349e833c270b7bc843c63591b428d82
-  data.tar.gz: bdcf1886e4f5a28387e0ff8a669ebb8517e3d794bee15c0fc6ec19262e9844b7
+  metadata.gz: f672ae4ac7f81edd35c18b5ceff7a187b2e2450cf31ec4b8551de2b3c2f5521f
+  data.tar.gz: 4c6d64235013f1a56c92f129347d9e006d72c213f51eabc66cc2055aa7497dcb
 SHA512:
-  metadata.gz: e48473c939d7be914f2effa82f5542a0395baa3cd7150a5e3f80d27a6b08e34bb026ce41f8623ccec15cb7044f7e256c5685a058d0c903725623a04c972ed43d
-  data.tar.gz: f2443319167863a1cbb90201dd6db6ce711233b2877af8b4841df3311ba9691f6adaea1eb242bf209d231bf0a3c86a4e140dbe62efdb143e49b83a8724f2627d
+  metadata.gz: 8b6e35748122d99bcef965a0f86224679537b0b23b7175ac822255c5ee6321c42938c12eba5a1aca2bbe4dd256435c61525558fed3155dbe6eb70b1e5d3d9255
+  data.tar.gz: db39b5d27705c1d5d4a7f8431e306c0f137ef55322ca8bb958895b0ee0b2331f53d1a7d69fce50c5042de2faf8a9d247cb757277139c8bcd6f4c0ddb2388d6c2

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
 cache: bundler
 rvm:
-- 2.2.7
-- 2.3.4
-- 2.4.1
+- 2.2.9
+- 2.3.6
+- 2.4.3
+- 2.5.0
 before_install: gem install bundler --no-rdoc --no-ri
 deploy:
   provider: rubygems
@@ -13,5 +14,4 @@ deploy:
   on:
     tags: true
     repo: snltd/wavefront-cli
-    ruby: 2.3.4
-
+    ruby: 2.3.6

data/lib/wavefront-cli/alert.rb

@@ -36,6 +36,29 @@ module WavefrontCli
       wf.history(options[:'<id>'], options[:offset], options[:limit])
     end
 
+    def do_firing
+      find_in_state(:firing)
+    end
+
+    def do_snoozed
+      find_in_state(:snoozed)
+    end
+
+    # Does the work for #do_firing() and #do_snoozed()
+    # @param status [Symbol,String] the alert status you wish to
+    #   find
+    # @return Wavefront::Response
+    #
+    def find_in_state(status)
+      search = do_search([format('status=%s', status)])
+
+      items = search.response.items.map do |i|
+        { name: i.name, id: i.id, startTime: i.event.startTime }
+      end
+
+      search.tap { |s| s.response[:items] = items }
+    end
+
     # Take a previously exported alert, and construct a hash which
     # create() can use to re-create it.
     #

data/lib/wavefront-cli/base.rb

@@ -289,11 +289,11 @@ module WavefrontCli
       wf.update(options[:'<id>'], k => v)
     end
 
-    def do_search
+    def do_search(cond = options[:'<condition>'])
       require 'wavefront-sdk/search'
       wfs = Wavefront::Search.new(mk_creds, mk_opts)
 
-      query = conds_to_query(options[:'<condition>'])
+      query = conds_to_query(cond)
 
       wfs.search(klass_word, query, limit: options[:limit],
                                     offset: options[:offset] ||

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

@@ -8,6 +8,8 @@ class WavefrontCommandAlert < WavefrontCommandBase
   end
   def _commands
     ["list #{CMN} [-l] [-f format] [-o offset] [-L limit]",
+     "firing #{CMN} [-o offset] [-L limit]",
+     "snoozed #{CMN} [-o offset] [-L limit]",
      "describe #{CMN} [-f format] [-v version] <id>",
      "delete #{CMN} <id>",
      "undelete #{CMN} <id>",

data/lib/wavefront-cli/controller.rb

@@ -1,16 +1,15 @@
 # For development against a local checkout of the SDK, uncomment
 # this block
 #
-#dir = Pathname.new(__FILE__).dirname.realpath.parent.parent.parent
-#$LOAD_PATH.<< dir + 'lib'
-#$LOAD_PATH.<< dir + 'wavefront-sdk' + 'lib'
+# dir = Pathname.new(__FILE__).dirname.realpath.parent.parent.parent
+# $LOAD_PATH.<< dir + 'lib'
+# $LOAD_PATH.<< dir + 'wavefront-sdk' + 'lib'
 
 require 'pathname'
 require 'pp'
 require 'docopt'
 require_relative './version'
 require_relative './exception'
-
 require_relative './opt_handler'
 
 CMD_DIR = Pathname.new(__FILE__).dirname + 'commands'

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

@@ -15,6 +15,16 @@ module WavefrontDisplay
       multicolumn(:id, :status, :name)
     end
 
+    def do_firing
+      readable_time_arr(:startTime)
+      multicolumn(:id, :name, :startTime)
+    end
+
+    def do_snoozed
+      readable_time_arr(:startTime)
+      multicolumn(:id, :name, :startTime)
+    end
+
     def do_describe
       readable_time(:created, :lastProcessedMillis,
                     :lastNotificationMillis, :createdEpochMillis,
@@ -37,6 +47,7 @@ module WavefrontDisplay
     def do_unsnooze
       puts "Unsnoozed alert '#{options[:'<id>']}'."
     end
+
     def do_summary
       kw = data.keys.map(&:size).max + 2
       data.delete_if { |_k, v| v.zero? } unless options[:all]

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

@@ -122,10 +122,10 @@ module WavefrontDisplay
       if raw.respond_to?(:moreItems) && raw.moreItems == true
         if raw.respond_to?(:offset) && raw.respond_to?(:limit)
           enditem = raw.limit > 0 ? raw.offset + raw.limit - 1 : 0
-          puts format('Showing items %d to %d. Use -o and -L for more.',
+          puts format('List shows items %d to %d. Use -o and -L for more.',
                       raw.offset, enditem)
         else
-          puts 'Showing paginated output. Use -o and -L for more.'
+          puts 'List shows paginated output. Use -o and -L for more.'
         end
       end
     end
@@ -234,7 +234,7 @@ module WavefrontDisplay
       end
     end
 
-    # Modify, in-place, the data structure to make times
+    # Modify, in-place, the @data structure to make times
     # human-readable. Automatically handles second and millisecond
     # epoch times. Currently only operates on top-level keys.
     #
@@ -246,6 +246,15 @@ module WavefrontDisplay
       keys.each { |k| data[k] = human_time(data[k]) if data.key?(k) }
     end
 
+    # As for #readable_time, but when @data is an array. For
+    # instance in "firing" alerts
+    #
+    def readable_time_arr(*keys)
+      data.map do |row|
+        keys.each { |k| row[k] = human_time(row[k]) if row.key?(k) }
+      end
+    end
+
     # Make a time human-readable. Automatically deals with epoch
     # seconds and epoch milliseconds
     #

data/lib/wavefront-cli/version.rb

@@ -1 +1 @@
-WF_CLI_VERSION = '2.1.6'.freeze
+WF_CLI_VERSION = '2.2.0'.freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-cli
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.2.0
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -289,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: CLI for Wavefront API v2