sensu 0.9.7.beta.1 → 0.9.7.beta.2

data/CHANGELOG.md

@@ -5,6 +5,10 @@
 Event data mutators, manipulate event data and its format prior to
 sending to a handler.
 
+TCP and UDP handler types, for writing event data to sockets.
+
+API resources now support singular & plural, Rails friendly.
+
 ### Non-backwards compatible changes
 
 AMQP handlers can no longer use `"send_only_check_output": true`, but
@@ -13,6 +17,8 @@ instead have access to the built-in mutators `"mutator": "only_check_output"` an
 
 ### Other
 
+Redis client connection heartbeat.
+
 Improved graceful process termination.
 
 Improved client socket ping/pong.

data/lib/sensu/api.rb

@@ -63,25 +63,6 @@ module Sensu
       end
     end
 
-    def healthy?
-      unless $redis.connected?
-        unless env['REQUEST_PATH'] == '/info'
-          halt 500
-        end
-      end
-    end
-
-    def request_log
-      $logger.info([env['REQUEST_METHOD'], env['REQUEST_PATH']].join(' '), {
-        :remote_address => env['REMOTE_ADDR'],
-        :user_agent => env['HTTP_USER_AGENT'],
-        :request_method => env['REQUEST_METHOD'],
-        :request_uri => env['REQUEST_URI'],
-        :request_body =>  env['rack.input'].read
-      })
-      env['rack.input'].rewind
-    end
-
     configure do
       disable :protection
       disable :show_exceptions
@@ -95,10 +76,55 @@ module Sensu
       ''
     end
 
+    helpers do
+      def request_log_line
+        $logger.info([env['REQUEST_METHOD'], env['REQUEST_PATH']].join(' '), {
+          :remote_address => env['REMOTE_ADDR'],
+          :user_agent => env['HTTP_USER_AGENT'],
+          :request_method => env['REQUEST_METHOD'],
+          :request_uri => env['REQUEST_URI'],
+          :request_body => env['rack.input'].read
+        })
+        env['rack.input'].rewind
+      end
+
+      def health_filter
+        unless $redis.connected?
+          unless env['REQUEST_PATH'] == '/info'
+            halt 500
+          end
+        end
+      end
+
+      def event_hash(event_json, client_name, check_name)
+        JSON.parse(event_json, :symbolize_names => true).merge(
+          :client => client_name,
+          :check => check_name
+        )
+      end
+
+      def resolve_event(client_name, check_name)
+        payload = {
+          :client => client_name,
+          :check => {
+            :name => check_name,
+            :output => 'Resolving on request of the API',
+            :status => 0,
+            :issued => Time.now.to_i,
+            :force_resolve => true
+          }
+        }
+        $logger.info('publishing check result', {
+          :payload => payload
+        })
+        $amq.queue('results').publish(payload.to_json)
+      end
+    end
+
     before do
       content_type 'application/json'
-      request_log
-      healthy?
+      request_log_line
+      health_filter
     end
 
     aget '/info' do
@@ -132,7 +158,7 @@ module Sensu
       end
     end
 
-    aget '/client/:name' do |client_name|
+    aget %r{/clients?/([\w\.-]+)$} do |client_name|
       $redis.get('client:' + client_name).callback do |client_json|
         unless client_json.nil?
           body client_json
@@ -143,31 +169,18 @@ module Sensu
       end
     end
 
-    adelete '/client/:name' do |client_name|
+    adelete %r{/clients?/([\w\.-]+)$} do |client_name|
       $redis.get('client:' + client_name).callback do |client_json|
         unless client_json.nil?
-          client = JSON.parse(client_json, :symbolize_names => true)
-          $logger.info('deleting client', {
-            :client => client
-          })
           $redis.hgetall('events:' + client_name).callback do |events|
             events.each_key do |check_name|
-              payload = {
-                :client => client_name,
-                :check => {
-                  :name => check_name,
-                  :output => 'Client is being removed on request of the API',
-                  :status => 0,
-                  :issued => Time.now.to_i,
-                  :force_resolve => true
-                }
-              }
-              $logger.info('publishing check result', {
-                :payload => payload
-              })
-              $amq.queue('results').publish(payload.to_json)
+              resolve_event(client_name, check_name)
             end
             EM::Timer.new(5) do
+              client = JSON.parse(client_json, :symbolize_names => true)
+              $logger.info('deleting client', {
+                :client => client
+              })
               $redis.srem('clients', client_name)
               $redis.del('events:' + client_name)
               $redis.del('client:' + client_name)
@@ -178,7 +191,7 @@ module Sensu
                 $redis.del('history:' + client_name)
               end
             end
-            status 204
+            status 202
             body ''
           end
         else
@@ -192,7 +205,7 @@ module Sensu
       body $settings.checks.to_json
     end
 
-    aget '/check/:name' do |check_name|
+    aget %r{/checks?/([\w\.-]+)$} do |check_name|
       if $settings.check_exists?(check_name)
         response = $settings[:checks][check_name].merge(:name => check_name)
         body response.to_json
@@ -202,23 +215,25 @@ module Sensu
       end
     end
 
-    apost '/check/request' do
+    apost %r{/(?:check/)?request$} do
       begin
         post_body = JSON.parse(request.body.read, :symbolize_names => true)
-      rescue JSON::ParserError
+        check_name = post_body[:check]
+        subscribers = post_body[:subscribers]
+      rescue JSON::ParserError, TypeError
         status 400
         body ''
       end
-      if post_body.is_a?(Hash) && post_body[:check].is_a?(String) && post_body[:subscribers].is_a?(Array)
+      if check_name.is_a?(String) && subscribers.is_a?(Array)
         payload = {
-          :name => post_body[:check],
+          :name => check_name,
           :issued => Time.now.to_i
         }
         $logger.info('publishing check request', {
           :payload => payload,
-          :subscribers => post_body[:subscribers]
+          :subscribers => subscribers
         })
-        post_body[:subscribers].uniq.each do |exchange_name|
+        subscribers.uniq.each do |exchange_name|
           $amq.fanout(exchange_name).publish(payload.to_json)
         end
         status 201
@@ -235,7 +250,7 @@ module Sensu
           clients.each_with_index do |client_name, index|
             $redis.hgetall('events:' + client_name).callback do |events|
               events.each do |check_name, event_json|
-                response.push(JSON.parse(event_json).merge(:client => client_name, :check => check_name))
+                response.push(event_hash(event_json, client_name, check_name))
               end
               if index == clients.size - 1
                 body response.to_json
@@ -248,12 +263,21 @@ module Sensu
       end
     end
 
-    aget '/event/:client/:check' do |client_name, check_name|
+    aget %r{/events/([\w\.-]+)$} do |client_name|
+      response = Array.new
+      $redis.hgetall('events:' + client_name).callback do |events|
+        events.each do |check_name, event_json|
+          response.push(event_hash(event_json, client_name, check_name))
+        end
+        body response.to_json
+      end
+    end
+
+    aget %r{/events?/([\w\.-]+)/([\w\.-]+)$} do |client_name, check_name|
       $redis.hgetall('events:' + client_name).callback do |events|
         event_json = events[check_name]
         unless event_json.nil?
-          response = JSON.parse(event_json).merge(:client => client_name, :check => check_name)
-          body response.to_json
+          body event_hash(event_json, client_name, check_name).to_json
         else
           status 404
           body ''
@@ -261,31 +285,32 @@ module Sensu
       end
     end
 
-    apost '/event/resolve' do
+    adelete %r{/events?/([\w\.-]+)/([\w\.-]+)$} do |client_name, check_name|
+      $redis.hgetall('events:' + client_name).callback do |events|
+        if events.include?(check_name)
+          resolve_event(client_name, check_name)
+          status 202
+        else
+          status 404
+        end
+        body ''
+      end
+    end
+
+    apost %r{/(?:event/)?resolve$} do
       begin
         post_body = JSON.parse(request.body.read, :symbolize_names => true)
-      rescue JSON::ParserError
+        client_name = post_body[:client]
+        check_name = post_body[:check]
+      rescue JSON::ParserError, TypeError
         status 400
         body ''
       end
-      if post_body.is_a?(Hash) && post_body[:client].is_a?(String) && post_body[:check].is_a?(String)
-        $redis.hgetall('events:' + post_body[:client]).callback do |events|
-          if events.include?(post_body[:check])
-            payload = {
-              :client => post_body[:client],
-              :check => {
-                :name => post_body[:check],
-                :output => 'Resolving on request of the API',
-                :status => 0,
-                :issued => Time.now.to_i,
-                :force_resolve => true
-              }
-            }
-            $logger.info('publishing check result', {
-              :payload => payload
-            })
-            $amq.queue('results').publish(payload.to_json)
-            status 201
+      if client_name.is_a?(String) && check_name.is_a?(String)
+        $redis.hgetall('events:' + client_name).callback do |events|
+          if events.include?(check_name)
+            resolve_event(client_name, check_name)
+            status 202
           else
             status 404
           end
@@ -297,7 +322,7 @@ module Sensu
       end
     end
 
-    apost '/stash/*' do |path|
+    apost %r{/stash(?:es)?/(.*)} do |path|
       begin
         post_body = JSON.parse(request.body.read)
       rescue JSON::ParserError
@@ -312,7 +337,7 @@ module Sensu
       end
     end
 
-    aget '/stash/*' do |path|
+    aget %r{/stash(?:es)?/(.*)} do |path|
       $redis.get('stash:' + path).callback do |stash_json|
         if stash_json.nil?
           status 404
@@ -323,7 +348,7 @@ module Sensu
       end
     end
 
-    adelete '/stash/*' do |path|
+    adelete %r{/stash(?:es)?/(.*)} do |path|
       $redis.exists('stash:' + path).callback do |stash_exists|
         if stash_exists
           $redis.srem('stashes', path).callback do
@@ -376,17 +401,17 @@ module Sensu
       $redis.set('client:' + $settings[:client][:name], $settings[:client].to_json).callback do
         $redis.sadd('clients', $settings[:client][:name]).callback do
           $redis.hset('events:' + $settings[:client][:name], 'test', {
-            :output => "CRITICAL\n",
+            :output => 'CRITICAL',
             :status => 2,
             :issued => Time.now.to_i,
             :flapping => false,
             :occurrences => 1
           }.to_json).callback do
-            $redis.set('stash:test/test', '{"key": "value"}').callback do
+            $redis.set('stash:test/test', {:key => 'value'}.to_json).callback do
               $redis.sadd('stashes', 'test/test').callback do
                 Thin::Logging.silent = true
                 Thin::Server.start(self, $settings[:api][:port])
-                EM::add_timer(0.5) do
+                EM::Timer.new(0.5) do
                   block.call
                 end
               end

data/lib/sensu/client.rb

@@ -284,7 +284,7 @@ module Sensu
     end
 
     def retry_until_true(wait=0.5, &block)
-      EM::add_timer(wait) do
+      EM::Timer.new(wait) do
         unless block.call
           retry_until_true(wait, &block)
         end

data/lib/sensu/constants.rb

@@ -1,6 +1,6 @@
 module Sensu
   unless defined?(Sensu::VERSION)
-    VERSION = '0.9.7.beta.1'
+    VERSION = '0.9.7.beta.2'
   end
 
   unless defined?(Sensu::DEFAULT_OPTIONS)

data/lib/sensu/redis.rb

@@ -12,6 +12,14 @@ module Sensu
       @closing_connection = false
     end
 
+    def setup_heartbeat
+      @heartbeat ||= EM::PeriodicTimer.new(10) do
+        if connected?
+          ping
+        end
+      end
+    end
+
     def connection_completed
       @connection_established = true
       @connected = true
@@ -30,6 +38,7 @@ module Sensu
           close_connection
         end
       end
+      setup_heartbeat
     end
 
     def reconnect!

data/lib/sensu/server.rb

@@ -647,7 +647,7 @@ module Sensu
     end
 
     def retry_until_true(wait=0.5, &block)
-      EM::add_timer(wait) do
+      EM::Timer.new(wait) do
         unless block.call
           retry_until_true(wait, &block)
         end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 62196233
+  hash: 62196239
   prerelease: true
   segments: 
   - 0
   - 9
   - 7
   - beta
-  - 1
-  version: 0.9.7.beta.1
+  - 2
+  version: 0.9.7.beta.2
 platform: ruby
 authors: 
 - Sean Porter
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-06 00:00:00 -07:00
+date: 2012-08-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency