sensu-cli 0.0.7 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDRkNzYxOGQyMmRkM2QzMjZhMmFhNDAyYjRjYWYzNWNkYmJmYWYyYg==
+    ZDU2NGQ5NmQyOGQ1NzNhMmY0NmY3ZDFkZDIyNWI5OGQzZjBjZjU4MQ==
   data.tar.gz: !binary |-
-    YjA0OGMyMTk2YjI4MTkyNjc1YmUwZTU3ZDQ1OWE5YTI2MjllZjMyMA==
+    MjM1ODMzYjQ2YTcwZjMzYzNkZjgxYTU4MmY1OWZmNGU1ZDUxYmI3NQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTU0MTUxMjk5ODY0YjkxZDQ5ODY5ZjYxOGMzOWY1ZWFlOTZlZWY4NjFjMmFh
-    ODQ1MGYyNDk2ZTZiMDJhNDIwZTY4MzZhODJmMmNiYzQwZWQxOTg5OTgzNjRh
-    OTAwNmNhY2M1N2YyN2FiNmY1OGEzNTk3NjcwNjhhMzNjMGIxMGM=
+    ODJjNmRjYTAxZGU1ODFiNTdhZTgzYzk2MmQ4ZGZmNWNhNTgwM2ZjNjg2YzA5
+    NzQ2MTFjZTg1OGY3YzhmNGMwNWE2NDY0MWE0MGIzMDZmMDRlMDkxMTMxYmFk
+    NjIwYjIxZmM2YjNkYWU4ODBiMjkwNTM0MzU1MDJjNjU2OTZlNjI=
   data.tar.gz: !binary |-
-    NzY1ZjEyNzRjZjEzOGRhYmIwZjcxM2Q2Mzk0OWU1NjU0MTFiYjc2YzY3YWFm
-    NDZiMjEyNGY1NjQ3NTMwOWFiYzI4ZTdhYjNhNzY1YTg2OGNkZmJiY2IxN2Mw
-    YjVjMDY3OGE4YzIyYmY3OTY2OTJjODBhNjMyZDVhNWMzYThlNGE=
+    NGNhNTMyNDNmZTkwM2VjMGIxNmM4ODljMzE2ZTMwYjkxNDAwNTljODNlMjBk
+    N2E2MTlkZGZkMzk4ZTE5ZDg3MmU3YzkzMDA0Y2ZlOGUzNTRmYmU0NjNkN2Nm
+    NjVhMWIyMjRkYmZhN2YzYmEyNDQ3MmE2ZWJjYmQ0ODM0YTJlZTM=

data/README.md

@@ -23,13 +23,12 @@ Features
 * Resolve Events
 * Silence clients and checks
 * Get Requests (get clients, stashes, events, etc.)
-* Delete Requests (delete clients, stashes and events)
+* Delete Requests (delete clients, stashes, aggregates and events)
 
 
 Usage and Configuration
 -----------------------
-* gem build sensu-cli.gemspec
-* gem install ./{gem file created}
+* gem install sensu-cli
 
 * There is one settings file for host, port and ssl that lives in your user directory ~/.sensu/settings.rb.  You can alternatively place this in /etc/sensu/sensu-cli/settings.rb.
 
@@ -58,7 +57,8 @@ Available subcommands: (for details, sensu SUB-COMMAND --help)
 
 ** Aggregate Commands **
 sensu aggregate list (OPTIONS)
-sensu aggregate show CHECK
+sensu aggregate show CHECK (OPTIONS)
+sensu aggregate delete CHECK
 
 ** Check Commands **
 sensu check list
@@ -103,7 +103,6 @@ Please provide a pull request.  I'm an ops guy, not a developer, so if you're su
    
 TODO
 ----
-* support deletion of aggregate check
 * cleanup the cli
 * Once complete api support is implemented I'll add other features like filtering or issuing a event.
    

data/lib/sensu-cli/cli.rb

@@ -8,7 +8,7 @@ module SensuCli
     CHECK_COMMANDS  = %w(list show request)
     EVENT_COMMANDS  = %w(list show delete)
     STASH_COMMANDS  = %w(list show delete)
-    AGG_COMMANDS    = %w(list show)
+    AGG_COMMANDS    = %w(list show delete)
     SIL_COMMANDS    = ""
     RES_COMMANDS    = ""
     INFO_COMMANDS   = ""
@@ -52,10 +52,9 @@ module SensuCli
     AGG_BANNER = <<-EOS.gsub(/^ {10}/, '')
           ** Aggregate Commands **
           sensu aggregate list (OPTIONS)
-          sensu aggregate show CHECK\n\r
+          sensu aggregate show CHECK (OPTIONS)
+          sensu aggregate delete CHECK\n\r
         EOS
-        #sensu aggregate delete CHECK\n\r
-        #aget %r{/aggregates?/([\w\.-]+)/([\w\.-]+)$} do |check_name, check_issued|
     SIL_BANNER = <<-EOS.gsub(/^ {10}/, '')
           ** Silence Commands **
           sensu silence NODE (OPTIONS)\n\r
@@ -251,6 +250,7 @@ module SensuCli
         cli = {:command => 'aggregates', :method => 'Get', :fields => p}
       when 'show'
         p = Trollop::options do
+          opt :id, "The id of the check issued.", :short=>"i", :type => :integer
           opt :limit, "The number of aggregates to return", :short => "l", :type => :string
           opt :offset, "The number of aggregates to offset before returning", :short => "o", :type => :string
         end

data/lib/sensu-cli/sensu.rb

@@ -56,10 +56,10 @@ module SensuCli
         payload = {:client => cli[:fields][:client], :check => cli[:fields][:check]}.to_json
         path = "/event/resolve"
       when 'silence'
-         cli[:fields][:reason] ? payload = ({:reason => cli[:fields][:reason],:timestamp => Time.now.to_i}).to_json : payload = {:timestamp => Time.now.to_i}.to_json
+        cli[:fields][:reason] ? payload = ({:reason => cli[:fields][:reason],:timestamp => Time.now.to_i}).to_json : payload = {:timestamp => Time.now.to_i}.to_json
         path = "/stashes/silence" << (cli[:fields][:client] ? "/#{cli[:fields][:client]}" : "") << (cli[:fields][:check] ? "/#{cli[:fields][:check]}" : "")
       when 'aggregates'
-        path = "/aggregates" << (cli[:fields][:check] ? "/#{cli[:fields][:check]}" : "")
+        path = "/aggregates" << (cli[:fields][:check] ? "/#{cli[:fields][:check]}" : "") << (cli[:fields][:id] ? "/#{cli[:fields][:id]}" : "")
       end
       path << pagination(cli) if ["stashes","clients","aggregates"].include?(@command)
       @api = {:path => path, :method => cli[:method], :command => cli[:command], :payload => (payload || false)}

data/lib/sensu-cli/version.rb

@@ -1,3 +1,3 @@
 module SensuCli
-    VERSION = '0.0.7'
+    VERSION = '0.0.9'
 end

data/sensu-cli.gemspec

@@ -4,13 +4,12 @@ Gem::Specification.new do |s|
   s.name        = 'sensu-cli'
   s.version     = SensuCli::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.date        = '2013-03-30'
   s.summary     = "A command line utility for Sensu."
   s.description = "A command line utility for interacting with the Sensu api."
   s.authors     = ["Bryan Brandau"]
   s.email       = 'agent462@gmail.com'
   s.has_rdoc    = false
-
+  s.licenses    = ['MIT','APACHE']
   s.homepage    ='http://github.com/agent462/sensu-cli'
   s.add_dependency('rainbow', '1.1.4')
   s.add_dependency('trollop', '2.0')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Bryan Brandau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2013-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -69,7 +69,9 @@ files:
 - README.md
 - settings.example.rb
 homepage: http://github.com/agent462/sensu-cli
-licenses: []
+licenses:
+- MIT
+- APACHE
 metadata: {}
 post_install_message: 
 rdoc_options: []