sensu 0.9.12 → 0.9.13.beta

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.9.13 - TBD
+
+### Features
+
+The Sensu API now provides /health, an endpoint for connection & queue
+monitoring. Monitor Sensu health with services like Pingdom.
+
+Sensu clients can configure their own keepalive handler(s) and thresholds.
+
 ## 0.9.12 - 2013-04-03
 
 ### Features

data/lib/sensu/api.rb

@@ -137,10 +137,14 @@ module Sensu
         env['rack.input'].rewind
       end
 
+      def integer_parameter(parameter)
+        parameter =~ /^[0-9]+$/ ? parameter.to_i : nil
+      end
+
       def pagination(items)
-        limit = params[:limit] =~ /^[0-9]+$/ ? params[:limit].to_i : 0
-        offset = params[:offset] =~ /^[0-9]+$/ ? params[:offset].to_i : 0
-        unless limit == 0
+        limit = integer_parameter(params[:limit])
+        offset = integer_parameter(params[:offset]) || 0
+        unless limit.nil?
           headers['X-Pagination'] = Oj.dump(
             :limit => limit,
             :offset => offset,
@@ -161,6 +165,10 @@ module Sensu
         ahalt 404
       end
 
+      def unavailable!
+        ahalt 503
+      end
+
       def created!(response)
         status 201
         body response
@@ -246,6 +254,33 @@ module Sensu
       end
     end
 
+    aget '/health' do
+      if $redis.connected? && $rabbitmq.connected?
+        healthy = Array.new
+        min_consumers = integer_parameter(params[:consumers])
+        max_messages = integer_parameter(params[:messages])
+        $amq.queue('keepalives').status do |messages, consumers|
+          if min_consumers
+            healthy << (consumers >= min_consumers)
+          end
+          if max_messages
+            healthy << (messages <= max_messages)
+          end
+          $amq.queue('results').status do |messages, consumers|
+            if min_consumers
+              healthy << (consumers >= min_consumers)
+            end
+            if max_messages
+              healthy << (messages <= max_messages)
+            end
+            healthy.all? ? no_content! : unavailable!
+          end
+        end
+      else
+        unavailable!
+      end
+    end
+
     aget '/clients' do
       response = Array.new
       $redis.smembers('clients') do |clients|
@@ -492,23 +527,15 @@ module Sensu
           aggregates.map! do |issued|
             issued.to_i
           end
-          valid_request = true
-          if params[:age]
-            if params[:age] =~ /^[0-9]+$/
-              timestamp = Time.now.to_i - params[:age].to_i
-              aggregates.reject! do |issued|
-                issued > timestamp
-              end
-            else
-              valid_request = false
+          age = integer_parameter(params[:age])
+          if age
+            timestamp = Time.now.to_i - age
+            aggregates.reject! do |issued|
+              issued > timestamp
             end
           end
-          if valid_request
-            aggregates = pagination(aggregates.sort.reverse)
-            body Oj.dump(aggregates)
-          else
-            bad_request!
-          end
+          aggregates = pagination(aggregates.sort.reverse)
+          body Oj.dump(aggregates)
         else
           not_found!
         end

data/lib/sensu/constants.rb

@@ -1,6 +1,6 @@
 module Sensu
   unless defined?(Sensu::VERSION)
-    VERSION = '0.9.12'
+    VERSION = '0.9.13.beta'
 
     LOG_LEVELS = [:debug, :info, :warn, :error, :fatal]
 

data/lib/sensu/server.rb

@@ -502,6 +502,16 @@ module Sensu
       end
     end
 
+    def valid_result?(result)
+      if result[:client].is_a?(String) && result[:check].is_a?(Hash)
+        result[:check][:name].is_a?(String) &&
+          result[:check][:output].is_a?(String) &&
+          result[:check][:status].is_a?(Integer)
+      else
+        false
+      end
+    end
+
     def setup_results
       @logger.debug('subscribing to results')
       @result_queue = @amq.queue!('results')
@@ -511,7 +521,13 @@ module Sensu
         @logger.debug('received result', {
           :result => result
         })
-        process_result(result)
+        if valid_result?(result)
+          process_result(result)
+        else
+          @logger.warn('invalid result', {
+            :result => result
+          })
+        end
         EM::next_tick do
           header.ack
         end
@@ -572,7 +588,7 @@ module Sensu
         :client => client[:name],
         :check => check
       }
-      @logger.info('publishing check result', {
+      @logger.debug('publishing check result', {
         :payload => payload
       })
       @amq.direct('results').publish(Oj.dump(payload))
@@ -589,16 +605,31 @@ module Sensu
               :issued => Time.now.to_i,
               :executed => Time.now.to_i
             }
+            thresholds = {
+              :warning => 120,
+              :critical => 180
+            }
+            if client.has_key?(:keepalive)
+              if client[:keepalive].has_key?(:handler) || client[:keepalive].has_key?(:handlers)
+                check[:handlers] = Array(client[:keepalive][:handlers] || client[:keepalive][:handler])
+              end
+              if client[:keepalive].has_key?(:thresholds)
+                thresholds.merge!(client[:keepalive][:thresholds])
+              end
+            end
             time_since_last_keepalive = Time.now.to_i - client[:timestamp]
             case
-            when time_since_last_keepalive >= 180
-              check[:output] = 'No keep-alive sent from client in over 180 seconds'
+            when time_since_last_keepalive >= thresholds[:critical]
+              check[:output] = 'No keep-alive sent from client in over '
+              check[:output] << thresholds[:critical].to_s + ' seconds'
               check[:status] = 2
-            when time_since_last_keepalive >= 120
-              check[:output] = 'No keep-alive sent from client in over 120 seconds'
+            when time_since_last_keepalive >= thresholds[:warning]
+              check[:output] = 'No keep-alive sent from client in over '
+              check[:output] << thresholds[:warning].to_s + ' seconds'
               check[:status] = 1
             else
-              check[:output] = 'Keep-alive sent from client less than 120 seconds ago'
+              check[:output] = 'Keep-alive sent from client less than '
+              check[:output] << thresholds[:warning].to_s + ' seconds ago'
               check[:status] = 0
             end
             publish_result(client, check)

data/lib/sensu/settings.rb

@@ -390,6 +390,41 @@ module Sensu
           invalid('client subscriptions must each be a string')
         end
       end
+      if @settings[:client].has_key?(:keepalive)
+        unless @settings[:client][:keepalive].is_a?(Hash)
+          invalid('client keepalive must be a hash')
+        end
+        if @settings[:client][:keepalive].has_key?(:handler)
+          unless @settings[:client][:keepalive][:handler].is_a?(String)
+            invalid('client keepalive handler must be a string')
+          end
+        end
+        if @settings[:client][:keepalive].has_key?(:handlers)
+          handlers = @settings[:client][:keepalive][:handlers]
+          unless handlers.is_a?(Array)
+            invalid('client keepalive handlers must be an array')
+          end
+          handlers.each do |handler_name|
+            unless handler_name.is_a?(String)
+              invalid('client keepalive handlers must each be a string')
+            end
+          end
+        end
+        if @settings[:client][:keepalive].has_key?(:thresholds)
+          thresholds = @settings[:client][:keepalive][:thresholds]
+          unless thresholds.is_a?(Hash)
+            invalid('client keepalive thresholds must be a hash')
+          end
+          if thresholds.has_key?(:warning) || thresholds.has_key?(:critical)
+            unless thresholds[:warning].is_a?(Integer)
+              invalid('client keepalive warning threshold must be an integer')
+            end
+            unless thresholds[:critical].is_a?(Integer)
+              invalid('client keepalive critical threshold must be an integer')
+            end
+          end
+        end
+      end
     end
 
     def validate_api

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 35
-  prerelease: false
+  hash: -799367686
+  prerelease: true
   segments: 
   - 0
   - 9
-  - 12
-  version: 0.9.12
+  - 13
+  - beta
+  version: 0.9.13.beta
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-03 00:00:00 -07:00
+date: 2013-04-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -233,12 +234,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: