sensu 0.6.4-x86-mingw32 → 0.6.5-x86-mingw32

data/lib/sensu.rb

@@ -1,3 +1,3 @@
 module Sensu
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/lib/sensu/api.rb

@@ -54,13 +54,53 @@ module Sensu
       end
     end
 
-    aget '/client/:id' do |client|
+    aget '/client/:name' do |client|
       conn.redis.get('client:' + client).callback do |client_json|
         status 404 if client_json.nil?
         body client_json
       end
     end
 
+    adelete '/client/:name' do |client|
+      conn.redis.sismember('clients', client).callback do |client_exists|
+        unless client_exists == 0
+          conn.redis.exists('events:' + client).callback do |events_exist|
+            unless events_exist == 0
+              conn.redis.hgetall('events:' + client).callback do |events|
+                Hash[*events].keys.each do |check_name|
+                  check = {'name' => check_name, 'issued' => Time.now.to_i, 'status' => 0, 'output' => 'Client is being removed'}
+                  conn.amq.queue('results').publish({'client' => client, 'check' => check}.to_json)
+                end
+                EM.add_timer(5) do
+                  conn.redis.srem('clients', client)
+                  conn.redis.del('events:' + client)
+                  conn.redis.del('client:' + client)
+                end
+              end
+            else
+              conn.redis.srem('clients', client)
+              conn.redis.del('events:' + client)
+              conn.redis.del('client:' + client)
+            end
+            status 204
+            body nil
+          end
+        else
+          status 404
+          body nil
+        end
+      end
+    end
+
+    aget '/event/:client/:check' do |client, check|
+      conn.redis.hgetall('events:' + client).callback do |events|
+        client_events = Hash[*events]
+        event = client_events[check]
+        status 404 if event.nil?
+        body event
+      end
+    end
+
     aget '/events' do
       current_events = Hash.new
       conn.redis.smembers('clients').callback do |clients|
@@ -81,39 +121,36 @@ module Sensu
       end
     end
 
-    adelete '/client/:id' do |client|
-      conn.redis.sismember('clients', client).callback do |client_exists|
-        unless client_exists == 0
-          conn.redis.exists('events:' + client).callback do |events_exist|
-            unless events_exist == 0
-              conn.redis.hgetall('events:' + client).callback do |events|
-                Hash[*events].keys.each do |check_name|
-                  check = {'name' => check_name, 'issued' => Time.now.to_i, 'status' => 0, 'output' => 'client is being removed...'}
-                  conn.amq.queue('results').publish({'client' => client, 'check' => check}.to_json)
-                end
-                EM.add_timer(8) do
-                  conn.redis.srem('clients', client)
-                  conn.redis.del('events:' + client)
-                  conn.redis.del('client:' + client)
-                end
-              end
-            else
-              conn.redis.srem('clients', client)
-              conn.redis.del('events:' + client)
-              conn.redis.del('client:' + client)
-            end
+    apost '/stash/*' do |path|
+      conn.redis.set('stash:' + path, params[:data]).callback do
+        status 201
+        body nil
+      end
+    end
+
+    aget '/stash/*' do |path|
+      conn.redis.get('stash:' + path).callback do |stash|
+        status 404 if stash.nil?
+        body stash
+      end
+    end
+
+    adelete '/stash/*' do |path|
+      conn.redis.exists('stash:' + path).callback do |stash_exist|
+        unless stash_exist == 0
+          conn.redis.del('stash:' + path).callback do
             status 204
-            body ''
+            body nil
           end
         else
           status 404
-          body ''
+          body nil
         end
       end
     end
 
-    apost '/test/client' do
-      attributes = '{
+    apost '/test' do
+      client = '{
         "name": "test",
         "address": "localhost",
         "subscriptions": [
@@ -121,17 +158,15 @@ module Sensu
           "bar"
         ]
       }'
-      conn.redis.set('client:test', attributes).callback do
-        conn.redis.sadd('clients', 'test')
-        status 201
-        body ''
-      end
-    end
-
-    apost '/test/event' do
-      conn.redis.hset('events:test', 'test', {'status' => 2, 'output' => 'CRITICAL :: test', 'occurrences' => 1}.to_json).callback do
-        status 201
-        body ''
+      conn.redis.set('client:test', client).callback do
+        conn.redis.sadd('clients', 'test').callback do
+          conn.redis.hset('events:test', 'test', {'status' => 2, 'output' => 'CRITICAL', 'occurrences' => 1}.to_json).callback do
+            conn.redis.set('stash:test/test', '{"key": "value"}').callback do
+              status 201
+              body nil
+            end
+          end
+        end
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: sensu
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.4
+  version: 0.6.5
 platform: x86-mingw32
 authors: 
 - Sean Porter
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-27 00:00:00 Z
+date: 2011-09-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine