wavefront-client 3.3.1 → 3.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzlmYWM4Y2YyZjljNjE0OTVmNjRlZmU5NDU5YTI1ZWY0MDM1YWUyOQ==
+    ZDFjYTkzZTY4OGIzM2JlYTJiYmZmMGU0NjQzYjVmYTY1Y2MyZTBlOA==
   data.tar.gz: !binary |-
-    NmZhNGMyYmZkYjY1NzgwZjI5OTYxMzI4YmVjYjYxNTBhMzEwNzg0MA==
+    MjBhZjI0MzA5NjdhNDhlZmU4OTBkN2E1MjVmNmYxZDA2MWNhN2YwMA==
 SHA512:
   metadata.gz: !binary |-
-    MmE0OTFjMGU3M2ZiOTFmNDFiNjBhOTZhYTNhZDZiM2JkYTEzZGJhNjkzMDdl
-    YzFmODUyMDRmNDVmMGFlYjMzMTgzODFhM2I5MTc3ZDMwYWEyYzgwOTBhZDA1
-    ODI3OTI3OGMzODIzZTYwNjMxMWY5Zjc5ZTM3OGQ5YTliMDRhZjg=
+    Nzc4MWJhMzNiYjAzZmYzYTYyYWRlNTQ4OTBjNzI2ZDg0YmVkMTdhYjNlYjNj
+    MjM2MjEzMmQzNzFiYjI3YjQ1Y2FjZTlhYTFlODlhODg4Yjk5NjFhNTI4NzU1
+    YjBhMWU3ODA4M2EzZTZiNWYyZTMwNWRhMTY4NDM4MzE2OGE1YzY=
   data.tar.gz: !binary |-
-    MWFlN2NhZTc2YzNmMzY1MGFhOGI3YTY2NTM0NGJiZGY2NjQxMmUwNDBkNmMx
-    OGYwYzExOGFhZmQ0M2YzNmYzMDYyNTM5ZjI3Njc1NTIwMDA5NGFjYWY2MTM5
-    N2ExY2M4ZWRiOWRkZDI1YmJmMmJhMTAyNWFiMjMxY2UxMjBjMmQ=
+    MjQ3MDIzNzRhZTYwZGMwM2FlMjM3N2FjN2UzODg3OGQxNWYxMGY3ZDM3ZDc5
+    OGQ0NGRjYjY1NmUxZDYxODJkYjg5NmU3MzQ3NTRkNzY5NzYxY2YyNDdmMzRj
+    NDlmZGM3YWM5ZmU2YTMxOGFiMzk3MzRkM2E2MmE5MzA4MzZkYjU=

data/README-cli.md

@@ -165,6 +165,7 @@ Usage:
            [-H host] [-n] <event>
   wavefront event close [-V] [-c file] [-P profile] [-E endpoint] [-t token]
            [<event>] [<timestamp>]
+  wavefront event delete [-V] <timestamp> <event>
   wavefront event show
   wavefront event --help
 
@@ -199,6 +200,11 @@ close <name>`, which will close the last event opened and called `name`.
 You can also specify the open-time when closing and event, bypassing
 the local caching mechanism altogether.
 
+When deleting an event you must supply the timestamp in epoch-milliseconds.
+This level of precision is required by Wavefront's API, and it is
+troublesome for the user to supply millisecond-accurate timestamps in any
+other format.
+
 The `wavefront event show` command lists the cached events. To
 properly query events, use the `events()` command in a `ts` query.
 
@@ -241,6 +247,12 @@ Closing event 'puppet_run'. [2016-06-27 19:25:16 +0100]
 Removing state file /var/tmp/wavefront/events/rob/1467051916712::puppet_run.
 ```
 
+Delete an event created in error.
+
+```
+$ wavefront delete 1476187357169 some_event
+```
+
 ## `write` Mode: Sending Points to Wavefront
 
 The `write` command is used to put data points into Wavefront. It is

data/bin/wavefront

@@ -103,6 +103,7 @@ Usage:
            [-H host] [-n] <event>
   #{ME} event close [-V] [-c file] [-P profile] [-E endpoint] [-t token]
            [<event>] [<timestamp>]
+  #{ME} event delete [-V] <timestamp> <event>
   #{ME} event show
   #{ME} event --help
 #{global_opts}

data/lib/wavefront/cli/events.rb

@@ -52,11 +52,35 @@ class Wavefront::Cli::Events < Wavefront::Cli
       close_event_handler
     elsif options[:show]
       show_open_events
+    elsif options[:delete]
+      delete_event
     else
       fail 'undefined event error.'
     end
   end
 
+  def delete_event
+    unless options[:'<timestamp>'] && options[:'<event>']
+      fail 'To delete an event you must supply its start time and name.'
+    end
+
+    begin
+      response = wf_event.delete({
+        startTime: options[:'<timestamp>'],
+        name: options[:'<event>'],
+      })
+    rescue RestClient::Unauthorized
+      raise 'Cannot connect to Wavefront API.'
+    rescue RestClient::ResourceNotFound
+      raise 'Cannot find that event.'
+    rescue => e
+      puts e
+      raise 'Cannot delete event.'
+    end
+
+    puts "Deleted event."
+  end
+
   def prep_time(t)
     #
     # Wavefront would like times in epoch milliseconds, so whatever
@@ -166,7 +190,11 @@ class Wavefront::Cli::Events < Wavefront::Cli
     # Everything we need to know about an event is in the name of
     # its state file.
     #
-    events = state_dir.children
+    begin
+      events = state_dir.children
+    rescue Errno::ENOENT
+      raise 'There is no event state directory on this host.'
+    end
 
     if events.length == 0
       puts 'No open events.'

data/lib/wavefront/client/version.rb

@@ -16,6 +16,6 @@ See the License for the specific language governing permissions and
 
 module Wavefront
   class Client
-    VERSION = "3.3.1"
+    VERSION = "3.4.0"
   end
 end

data/lib/wavefront/events.rb

@@ -35,6 +35,17 @@ module Wavefront
       make_call(close_uri(options), hash_to_qs(payload))
     end
 
+    def delete(payload = {}, options = {})
+      unless payload.has_key?(:startTime)  && payload.has_key?(:name)
+        raise 'invalid payload'
+      end
+
+      uri = create_uri(path: [DEFAULT_PATH, payload[:startTime],
+                       payload[:name]].join('/').squeeze('/'))
+
+      RestClient.delete(uri.to_s, headers)
+    end
+
     def create_uri(options = {})
       #
       # Build the URI we use to send a 'create' request.

data/wavefront-client.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |spec|
   spec.version       = Wavefront::Client::VERSION
   spec.authors       = ["Sam Pointer", "Louis McCormack", "Joshua McGhee", "Conor Beverland", "Salil Deshmukh", "Rob Fisher"]
   spec.email         = ["support@wavefront.com"]
-  spec.description   = %q{A simple abstraction for talking to wavefront in ruby}
-  spec.summary       = %q{A simple abstraction for talking to wavefront in ruby}
+  spec.description   = %q{A simple abstraction for talking to Wavefront in Ruby. Includes a command-line interface.}
+  spec.summary       = %q{A simple abstraction for talking to Wavefront in Ruby}
   spec.homepage      = "https://github.com/wavefrontHQ/ruby-client"
   spec.license       = "Apache License 2.0"
 
@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.5.0"
 
-  spec.add_dependency "rest-client", ">= 1.6.7", "<= 1.8"
+  spec.add_dependency "rest-client", ">= 1.6.7", "< 1.8"
   spec.add_dependency "docopt", "~> 0.5.0"
   spec.add_dependency 'inifile',  '3.0.0'
   spec.required_ruby_version = Gem::Requirement.new(">= 1.9.3")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-client
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.4.0
 platform: ruby
 authors:
 - Sam Pointer
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,7 +64,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.7
-    - - <=
+    - - <
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
@@ -74,7 +74,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.7
-    - - <=
+    - - <
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
@@ -105,7 +105,8 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.0.0
-description: A simple abstraction for talking to wavefront in ruby
+description: A simple abstraction for talking to Wavefront in Ruby. Includes a command-line
+  interface.
 email:
 - support@wavefront.com
 executables:
@@ -185,7 +186,7 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: A simple abstraction for talking to wavefront in ruby
+summary: A simple abstraction for talking to Wavefront in Ruby
 test_files:
 - spec/example_response.json
 - spec/spec_helper.rb