sensu 0.9.10 → 0.9.11

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 0.9.11 - 2013-02-22
+
+### Features
+
+API aggregate age filter parameter.
+
+### Non-backwards compatible changes
+
+Removed /info "health" in favour of RabbitMQ & Redis "connected".
+
+### Other
+
+No longer using the default AMQP exchange or publishing directly to queues.
+
+Removed API health filter, as the Redis connection now recovers.
+
+Fixed config & extension directory loading on Windows.
+
+Client socket handles non-ascii input.
+
 ## 0.9.10 - 2013-01-30
 
 ### Features

data/README.md

@@ -1,9 +1,8 @@
-# Sensu
-  A monitoring framework that aims to be simple, malleable, and scalable.
+![sensu](https://raw.github.com/sensu/sensu/master/sensu-logo.png)
 
-  ![sensu](https://raw.github.com/sensu/sensu/master/sensu-logo.png)
+A monitoring framework that aims to be simple, malleable, and scalable.
 
-  ![travis](https://secure.travis-ci.org/sensu/sensu.png)
+![travis](https://secure.travis-ci.org/sensu/sensu.png)
 
 ## Documentation
   Please refer to the [Sensu Wiki](https://github.com/sensu/sensu/wiki).

data/lib/sensu/api.rb

@@ -128,22 +128,12 @@ module Sensu
         env['rack.input'].rewind
       end
 
-      def health_filter
-        unless $redis.connected?
-          unless env['REQUEST_PATH'] == '/info'
-            halt 500
-          end
-        end
-      end
-
       def bad_request!
-        status 400
-        body ''
+        ahalt 400
       end
 
       def not_found!
-        status 404
-        body ''
+        ahalt 404
       end
 
       def created!
@@ -183,14 +173,13 @@ module Sensu
         $logger.info('publishing check result', {
           :payload => payload
         })
-        $amq.queue('results').publish(payload.to_json)
+        $amq.direct('results').publish(payload.to_json)
       end
     end
 
     before do
-      content_type 'application/json'
       request_log_line
-      health_filter
+      content_type 'application/json'
     end
 
     aget '/info' do
@@ -206,11 +195,11 @@ module Sensu
           :results => {
             :messages => nil,
             :consumers => nil
-          }
+          },
+          :connected => $rabbitmq.connected?
         },
-        :health => {
-          :redis => $redis.connected? ? 'ok' : 'down',
-          :rabbitmq => $rabbitmq.connected? ? 'ok' : 'down'
+        :redis => {
+          :connected => $redis.connected?
         }
       }
       if $rabbitmq.connected?
@@ -412,25 +401,17 @@ module Sensu
       response = Array.new
       $redis.smembers('aggregates') do |checks|
         unless checks.empty?
-          limit = 10
-          if params[:limit]
-            limit = params[:limit] =~ /^[0-9]+$/ ? params[:limit].to_i : nil
-          end
-          unless limit.nil?
-            checks.each_with_index do |check_name, index|
-              $redis.smembers('aggregates:' + check_name) do |aggregates|
-                collection = {
-                  :check => check_name,
-                  :issued => aggregates.sort.reverse.take(limit)
-                }
-                response.push(collection)
-                if index == checks.size - 1
-                  body response.to_json
-                end
+          checks.each_with_index do |check_name, index|
+            $redis.smembers('aggregates:' + check_name) do |aggregates|
+              collection = {
+                :check => check_name,
+                :issued => aggregates.sort.reverse
+              }
+              response.push(collection)
+              if index == checks.size - 1
+                body response.to_json
               end
             end
-          else
-            bad_request!
           end
         else
           body response.to_json
@@ -441,11 +422,26 @@ module Sensu
     aget %r{/aggregates/([\w\.-]+)$} do |check_name|
       $redis.smembers('aggregates:' + check_name) do |aggregates|
         unless aggregates.empty?
+          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.to_i > timestamp
+              end
+            else
+              valid_request = false
+            end
+          end
           limit = 10
           if params[:limit]
-            limit = params[:limit] =~ /^[0-9]+$/ ? params[:limit].to_i : nil
+            if params[:limit] =~ /^[0-9]+$/
+              limit = params[:limit].to_i
+            else
+              valid_request = false
+            end
           end
-          unless limit.nil?
+          if valid_request
             body aggregates.sort.reverse.take(limit).to_json
           else
             bad_request!

data/lib/sensu/client.rb

@@ -50,7 +50,7 @@ module Sensu
       @logger.debug('publishing keepalive', {
         :payload => payload
       })
-      @amq.queue('keepalives').publish(payload.to_json)
+      @amq.direct('keepalives').publish(payload.to_json)
     end
 
     def setup_keepalives
@@ -71,7 +71,7 @@ module Sensu
       @logger.info('publishing check result', {
         :payload => payload
       })
-      @amq.queue('results').publish(payload.to_json)
+      @amq.direct('results').publish(payload.to_json)
     end
 
     def execute_check(check)

data/lib/sensu/constants.rb

@@ -1,6 +1,6 @@
 module Sensu
   unless defined?(Sensu::VERSION)
-    VERSION = '0.9.10'
+    VERSION = '0.9.11'
 
     DEFAULT_OPTIONS = {
       :config_file => '/etc/sensu/config.json',

data/lib/sensu/extensions.rb

@@ -19,7 +19,8 @@ module Sensu
     end
 
     def require_directory(directory)
-      Dir.glob(File.join(directory, '**/*.rb')).each do |file|
+      path = directory.gsub(/\\(?=\S)/, '/')
+      Dir.glob(File.join(path, '**/*.rb')).each do |file|
         begin
           require file
         rescue ScriptError => error

data/lib/sensu/server.rb

@@ -81,6 +81,7 @@ module Sensu
         consumer.cancel
       end
       @keepalive_queue = @amq.queue!('keepalives')
+      @keepalive_queue.bind(@amq.direct('keepalives'))
       @keepalive_queue.subscribe(:ack => true) do |header, payload|
         client = JSON.parse(payload, :symbolize_names => true)
         @logger.debug('received keepalive', {
@@ -518,6 +519,7 @@ module Sensu
         consumer.cancel
       end
       @result_queue = @amq.queue!('results')
+      @result_queue.bind(@amq.direct('results'))
       @result_queue.subscribe(:ack => true) do |header, payload|
         result = JSON.parse(payload, :symbolize_names => true)
         @logger.debug('received result', {
@@ -577,7 +579,7 @@ module Sensu
       @logger.info('publishing check result', {
         :payload => payload
       })
-      @amq.queue('results').publish(payload.to_json)
+      @amq.direct('results').publish(payload.to_json)
     end
 
     def determine_stale_clients

data/lib/sensu/settings.rb

@@ -104,7 +104,8 @@ module Sensu
     end
 
     def load_directory(directory)
-      Dir.glob(File.join(directory, '**/*.json')).each do |file|
+      path = directory.gsub(/\\(?=\S)/, '/')
+      Dir.glob(File.join(path, '**/*.json')).each do |file|
         load_file(file)
       end
     end

data/lib/sensu/socket.rb

@@ -9,7 +9,10 @@ module Sensu
     end
 
     def receive_data(data)
-      if data.strip == 'ping'
+      if data =~ /[\x80-\xff]/
+        @logger.warn('socket received non-ascii characters')
+        reply('invalid')
+      elsif data.strip == 'ping'
         @logger.debug('socket received ping')
         reply('pong')
       else
@@ -31,7 +34,7 @@ module Sensu
             @logger.info('publishing check result', {
               :payload => payload
             })
-            @amq.queue('results').publish(payload.to_json)
+            @amq.direct('results').publish(payload.to_json)
             reply('ok')
           else
             @logger.warn('invalid check result', {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: false
   segments: 
   - 0
   - 9
-  - 10
-  version: 0.9.10
+  - 11
+  version: 0.9.11
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-30 00:00:00 -08:00
+date: 2013-02-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency