sensu-cli 0.0.9 → 0.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDU2NGQ5NmQyOGQ1NzNhMmY0NmY3ZDFkZDIyNWI5OGQzZjBjZjU4MQ==
+    ZjkwOGFmNTA0OWM4MzZhNThkNjE1NDkwYTZjMGNmNzY2YmYyOWQ3NA==
   data.tar.gz: !binary |-
-    MjM1ODMzYjQ2YTcwZjMzYzNkZjgxYTU4MmY1OWZmNGU1ZDUxYmI3NQ==
+    MjRkNzBkMTQ0ZWRhNGVkNTRlN2Y5YWVhNjVlODViZmJmNzllMGFmNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODJjNmRjYTAxZGU1ODFiNTdhZTgzYzk2MmQ4ZGZmNWNhNTgwM2ZjNjg2YzA5
-    NzQ2MTFjZTg1OGY3YzhmNGMwNWE2NDY0MWE0MGIzMDZmMDRlMDkxMTMxYmFk
-    NjIwYjIxZmM2YjNkYWU4ODBiMjkwNTM0MzU1MDJjNjU2OTZlNjI=
+    ZWE3ZGZiODZhNzdhNTdhZmM3NjU4Zjk1YzRkNGQzNDZmNjQwMjcxNzE2OWZk
+    ZWE2ZWQzZmNkYTY0OTA5MjU5ODhlMTI4ZThmNDNkYmY2N2JiZWYyZGI1ZDk0
+    MWNhMzMyNTg3NGMzMzBjNWFjMjVkMGExYTMyZjMzOTg4NDc2NWI=
   data.tar.gz: !binary |-
-    NGNhNTMyNDNmZTkwM2VjMGIxNmM4ODljMzE2ZTMwYjkxNDAwNTljODNlMjBk
-    N2E2MTlkZGZkMzk4ZTE5ZDg3MmU3YzkzMDA0Y2ZlOGUzNTRmYmU0NjNkN2Nm
-    NjVhMWIyMjRkYmZhN2YzYmEyNDQ3MmE2ZWJjYmQ0ODM0YTJlZTM=
+    NTQ3ZjMzMWEyZDliNDk0NGU2NzhiZWU0YjI4NjEzZGEyN2M1MTJjYTg3YTU1
+    ZDk1ODQ4M2ExZWE3ODg1ZjcwOGMwZTE3ZGJkMTVkOWIxMDJiNmQ5YmI3ODZj
+    Y2Y0YTUzMzBlOTZhMmI0ZTdkMGYzMmQyMTBhNzdkOTM2NjliN2Y=

data/README.md

@@ -49,6 +49,11 @@ user "some_user"
 password "some_secret_password"
 ````
 
+Expire Silenced Hosts/Checks
+----------------------------
+I added an expires option to `sensu silence` to be used like `sensu silence HOST -e 30` where `-e` denotes the number of minutes from now a host/checks silence should expire.  This won't work by itself.  We add a key to the silence stash with a time in the future.  If you run [check-stashes](https://github.com/agent462/sensu-check-stashes) on your sensu-server it will check for expired stashes and delete them.   
+
+There is also a reason option `-r` available.  Be nice and use it so your colleagues know what you're doing.   
 
 Examples
 -----------
@@ -108,6 +113,7 @@ TODO
    
 License and Author
 ==================
+I'm releasing this under the MIT or Apache 2.0 license.  You pick.
 
 Author:: Bryan Brandau <agent462@gmail.com>
 

data/lib/sensu-cli/cli.rb

@@ -253,6 +253,7 @@ module SensuCli
           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
+          #opt :results, "Include the check results", :short => "r", :type => :boolean
         end
         Trollop::die :offset, "Offset depends on the limit option --limit ( -l )".color(:red) if p[:offset] && !p[:limit]
         item = next_argv
@@ -271,6 +272,7 @@ module SensuCli
       p = Trollop::options do
         opt :check, "The check to silence (requires --client)", :short => 'k', :type => :string
         opt :reason, "The reason this check/node is being silenced", :short => 'r', :type => :string
+        opt :expires, "The number of minutes the silenced event is valid (must use with check-stashes plugin)", :short => 'e', :type => :integer
       end
       command = next_argv
       explode(opts) if command == nil

data/lib/sensu-cli/sensu.rb

@@ -56,7 +56,13 @@ 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
+        payload = {:timestamp => Time.now.to_i}
+        payload.merge!({:reason => cli[:fields][:reason]}) if cli[:fields][:reason]
+        if cli[:fields][:expires]
+          expires = Time.now.to_i + (cli[:fields][:expires] * 60)
+          payload.merge!({:expires => expires})
+        end
+        payload = payload.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]}" : "") << (cli[:fields][:id] ? "/#{cli[:fields][:id]}" : "")
@@ -89,7 +95,7 @@ module SensuCli
       when 'Delete'
         req =  Net::HTTP::Delete.new(@api[:path])
       when 'Post'
-        req =  Net::HTTP::Post.new(@api[:path],initheader = {'Content-Type' =>'application/json'})
+        req =  Net::HTTP::Post.new(@api[:path],initheader = {'Content-Type' => 'application/json'})
         req.body = @api[:payload]
       end
       req.basic_auth(Config.user, Config.password) if Config.user && Config.password

data/lib/sensu-cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Bryan Brandau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-11 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow