sensu-cli 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjQ1MjA2M2I2N2M1NDQ5MGQ5ZjJiZTZmOTVlMzNjYmIyNzRjZWM3Mg==
+    MzQyZTY3YzM1OTNlNzM3NzdmMWQ4MzcxN2E0MWQxOWQ1MjRhYzM1Nw==
   data.tar.gz: !binary |-
-    ZWE2ODk3Njg3YThlODFlZmU4ZjUwNzIyNTE3Y2ExZGM2Y2NkODg5Yw==
+    MzUyYzcwNjQ5MzA5MDE0ODIzYTFjZDdlODcxYTNkMDBlOTVhNDM3Ng==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODM5YzRiNDBjODQxOTgxN2Y2NDgxYzgyNmMwZTAxYjZhMGYyMDA5ZGU4YTc1
-    NDEzNWFlMzYwYmJiNGRmMjgxZDdkZDMxNWE2ZmJhODFmNTRjNmI5YmE3ZjE3
-    NTgxYjU5NDE5Nzk5ZDZmMjBkN2M2OGQ2NmZiZTZlNWMxMzgzNmQ=
+    NzEzOTlhNjk3MjNlMmU1NjZkYTk2M2ZmZjg2OGNkOWQ5OTU1M2UxOTIwNDQy
+    MWM2NmY2MGNkZDgxNmNlN2ZmMTkyZjljNTFkN2NlNjcwZmI3MjVlNWVlODBh
+    YWVkOGMxNTI0N2JjYWU4OTdkMTg3Y2I4OGJmZjAyOGQzZWQ0MWI=
   data.tar.gz: !binary |-
-    NGI1NTU0NGUyY2U0NWIwMTljMDZjM2YwZGJiMzM1NWI0ZjkxMTk3Y2ExNDg1
-    Yjc3MjNhMmIyODIzMmY3MWQ0MWY2YmIzMzIxZDI5ZGNlMjljZDMxY2ZkZmU4
-    NWE5YWRjNzI4MmE4YTIyZWU4NTAxMjdhZjg4MGRlZWFhMDQ3NDE=
+    ZWRjNjMwNGM3NDZmNTZkYTUyMGJkMDZlYTBkYWVjZmY4MzQ5M2Q5YmViZmU1
+    YmY0NGUzOGQ1ZjNhOTZiM2I5ZGQ4NTFkOWY4YzhiNjZkYjlhMDYyMzc5MGQw
+    NzYxZTE0NGQzZDZhNWZhZGUwMzdhMzJkOGIwZDViNjJlZDgzMDQ=

data/README.md

@@ -30,12 +30,14 @@ Usage and Configuration
 -----------------------
 * 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.
+* There is one settings file for host, port, ssl, and HTTP timeout that lives in your user directory ~/.sensu/settings.rb.  You can alternatively place this in /etc/sensu/sensu-cli/settings.rb.
 
 ````
 host  "127.0.0.1"
 port  "4567"
 ssl   false
+read_timeout 20
+open_timeout 20
 ````
 This format was chosen so you can do some ENV magic via your profile and setting up an alias. For details see the [wiki](https://github.com/agent462/sensu-cli/wiki)
 
@@ -48,12 +50,14 @@ ssl   false
 user "some_user"
 password "some_secret_password"
 ````
+If `read_timeout` and `open_timeout` are not set, they default to 15 and
+5 seconds respectively.
 
 Expire Silenced Hosts/Checks
 ----------------------------
-I added an expires option to `sensu-cli silence` to be used like `sensu-cli 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.   
+I added an expires option to `sensu-cli silence` to be used like `sensu-cli 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.   
+There is also a reason option `-r` available.  Be nice and use it so your colleagues know what you're doing.
 
 Examples
 -----------
@@ -106,12 +110,12 @@ sensu-cli resolve NODE CHECK
 Contributions
 -------------
 Please provide a pull request.  I'm an ops guy, not a developer, so if you're submitting code cleanup, all I ask is that you explain the improvement so I can learn.
-   
+
 TODO
 ----
 * cleanup the cli
 * Once complete api support is implemented I'll add other features like filtering or issuing a event.
-   
+
 License and Author
 ==================
 I'm releasing this under the MIT or Apache 2.0 license.  You pick.

data/lib/sensu-cli/api.rb

@@ -7,8 +7,8 @@ module SensuCli
 
     def request(opts)
       http = Net::HTTP.new(opts[:host], opts[:port])
-      http.read_timeout = 15
-      http.open_timeout = 5
+      http.read_timeout = opts[:read_timeout]
+      http.open_timeout = opts[:open_timeout]
       if opts[:ssl]
         http.use_ssl = true
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE

data/lib/sensu-cli/base.rb

@@ -38,6 +38,8 @@ module SensuCli
         :port => Config.port,
         :ssl => Config.ssl || false,
         :user => Config.user || nil,
+        :read_timeout => Config.read_timeout || 15,
+        :open_timeout => Config.open_timeout || 5,
         :password => Config.password || nil
       }
       api = Api.new

data/lib/sensu-cli/path.rb

@@ -56,9 +56,10 @@ module SensuCli
     end
 
     def silence(cli)
-      payload = { :content => { :timestamp => Time.now.to_i } }
-      payload.merge!({ :owner => cli[:fields][:owner] }) if cli[:fields][:owner]
-      payload.merge!({ :reason => cli[:fields][:reason] }) if cli[:fields][:reason]
+      content = { :timestamp => Time.now.to_i }
+      content.merge!({ :owner => cli[:fields][:owner] }) if cli[:fields][:owner]
+      content.merge!({ :reason => cli[:fields][:reason] }) if cli[:fields][:reason]
+      payload = { :content =>  content }
       payload.merge!({ :expire => cli[:fields][:expire].to_i }) if cli[:fields][:expire]
       silence_path = 'silence'
       silence_path << "/#{cli[:fields][:client]}" if cli[:fields][:client]

data/lib/sensu-cli/version.rb

@@ -1,3 +1,3 @@
 module SensuCli
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Bryan Brandau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow