sensu 0.9.4.beta → 0.9.4.beta.1

data/README.org

@@ -6,8 +6,13 @@
   [[http://portertech.ca/2011/11/01/sensu-a-monitoring-framework][Blog post]]
 
   [[http://www.sonian.com/cloud-tools/cloud-monitoring-sensu/][Homepage]]
+
 * Documentation
-  Find it [[https://github.com/sonian/sensu/wiki][HERE]].
+  - [[https://github.com/sonian/sensu/wiki][Sensu Wiki]].
+  - [[http://joemiller.me/2012/01/19/getting-started-with-the-sensu-monitoring-framework/][Getting Started]]
+  - [[http://joemiller.me/2012/01/24/re-use-nagios-plugins-in-sensu-for-quick-profit/][How to reuse your existing Nagios plugins]]
+  - [[http://joemiller.me/2012/02/02/sensu-and-graphite/][Sensu and Graphite]]
+
 * Other Projects
   - [[https://github.com/sonian/sensu-community-plugins][Sensu Community Plugins]]
   - [[https://github.com/sonian/sensu-dashboard][Sensu Dashboard]]

data/lib/sensu.rb

@@ -1,3 +1,3 @@
 module Sensu
-  VERSION = "0.9.4.beta"
+  VERSION = "0.9.4.beta.1"
 end

data/lib/sensu/api.rb

@@ -68,10 +68,12 @@ module Sensu
     aget '/client/:name' do |client|
       $logger.debug('[client] -- ' + request.ip + ' -- GET -- request for client -- ' + client)
       $redis.get('client:' + client).callback do |client_json|
-        if client_json.nil?
+        unless client_json.nil?
+          body client_json
+        else
           status 404
+          body ''
         end
-        body client_json
       end
     end
 
@@ -102,11 +104,11 @@ module Sensu
               end
             end
             status 204
-            body nil
+            body ''
           end
         else
           status 404
-          body nil
+          body ''
         end
       end
     end
@@ -122,7 +124,7 @@ module Sensu
         body $settings.checks[check].to_json
       else
         status 404
-        body nil
+        body ''
       end
     end
 
@@ -132,7 +134,7 @@ module Sensu
         post_body = Hashie::Mash.new(JSON.parse(request.body.read))
       rescue JSON::ParserError
         status 400
-        body nil
+        body ''
       end
       if post_body.check.is_a?(String) && post_body.subscribers.is_a?(Array)
         post_body.subscribers.each do |exchange|
@@ -143,7 +145,7 @@ module Sensu
       else
         status 400
       end
-      body nil
+      body ''
     end
 
     aget '/events' do
@@ -187,7 +189,7 @@ module Sensu
         post_body = Hashie::Mash.new(JSON.parse(request.body.read))
       rescue JSON::ParserError
         status 400
-        body nil
+        body ''
       end
       if post_body.client.is_a?(String) && post_body.check.is_a?(String)
         $redis.hgetall('events:' + post_body.client).callback do |events|
@@ -205,11 +207,11 @@ module Sensu
           else
             status 404
           end
-          body nil
+          body ''
         end
       else
         status 400
-        body nil
+        body ''
       end
     end
 
@@ -219,12 +221,12 @@ module Sensu
         post_body = JSON.parse(request.body.read)
       rescue JSON::ParserError
         status 400
-        body nil
+        body ''
       end
       $redis.set('stash:' + path, post_body.to_json).callback do
         $redis.sadd('stashes', path).callback do
           status 201
-          body nil
+          body ''
         end
       end
     end
@@ -246,12 +248,12 @@ module Sensu
           $redis.srem('stashes', path).callback do
             $redis.del('stash:' + path).callback do
               status 204
-              body nil
+              body ''
             end
           end
         else
           status 404
-          body nil
+          body ''
         end
       end
     end
@@ -269,7 +271,7 @@ module Sensu
         post_body = JSON.parse(request.body.read)
       rescue JSON::ParserError
         status 400
-        body nil
+        body ''
       end
       response = Hash.new
       if post_body.is_a?(Array) && post_body.size > 0
@@ -285,7 +287,7 @@ module Sensu
         end
       else
         status 400
-        body nil
+        body ''
       end
     end
 

data/sensu.gemspec

@@ -19,8 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency("hashie")
   s.add_dependency("cabin", "0.1.8")
   s.add_dependency("ruby-redis")
-  s.add_dependency("rack", "~> 1.3.4")
-  s.add_dependency("async_sinatra")
+  s.add_dependency("async_sinatra", "1.0.0")
   s.add_dependency("thin")
 
   s.add_development_dependency("rake")

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 31098137
+  hash: 62196241
   prerelease: true
   segments: 
   - 0
   - 9
   - 4
   - beta
-  version: 0.9.4.beta
+  - 1
+  version: 0.9.4.beta.1
 platform: ruby
 authors: 
 - Sean Porter
@@ -17,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-13 00:00:00 -08:00
+date: 2012-02-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -127,23 +128,23 @@ dependencies:
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: async_sinatra
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 23
         segments: 
         - 1
-        - 3
-        - 4
-        version: 1.3.4
+        - 0
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: async_sinatra
+  name: thin
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -157,7 +158,7 @@ dependencies:
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: thin
+  name: rake
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -168,10 +169,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: em-spec
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -185,7 +186,7 @@ dependencies:
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: em-spec
+  name: em-http-request
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
@@ -198,20 +199,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: em-http-request
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id013
 description: A monitoring framework that aims to be simple, malleable, and scalable. Uses the publish/subscribe model.
 email: 
 - sean.porter@sonian.net