sensu 0.9.12.beta.5 → 0.9.12.beta.6

data/CHANGELOG.md

@@ -12,6 +12,8 @@ Check extensions.
 
 ### Non-backwards compatible changes
 
+Stashes API routes changed, no longer using POST multi-get.
+
 No longer defaults to or enforces a specific config file or directory.
 
 ### Other

data/lib/sensu/api.rb

@@ -2,6 +2,7 @@ require File.join(File.dirname(__FILE__), 'base')
 require File.join(File.dirname(__FILE__), 'redis')
 
 gem 'thin', '1.5.0'
+gem 'sinatra', '1.3.5'
 gem 'async_sinatra', '1.0.0'
 
 require 'thin'
@@ -136,6 +137,22 @@ module Sensu
         env['rack.input'].rewind
       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
+          headers['X-Pagination'] = Oj.dump(
+            :limit => limit,
+            :offset => offset,
+            :total => items.size
+          )
+          paginated = items.slice(offset, limit)
+          Array(paginated)
+        else
+          items
+        end
+      end
+
       def bad_request!
         ahalt 400
       end
@@ -154,6 +171,10 @@ module Sensu
         body response
       end
 
+      def issued!
+        accepted!(Oj.dump(:issued => Time.now.to_i))
+      end
+
       def no_content!
         status 204
         body ''
@@ -228,6 +249,7 @@ module Sensu
     aget '/clients' do
       response = Array.new
       $redis.smembers('clients') do |clients|
+        clients = pagination(clients)
         unless clients.empty?
           clients.each_with_index do |client_name, index|
             $redis.get('client:' + client_name) do |client_json|
@@ -309,7 +331,7 @@ module Sensu
                 $redis.del('history:' + client_name)
               end
             end
-            accepted!(Oj.dump({:issued => Time.now.to_i}))
+            issued!
           end
         else
           not_found!
@@ -334,7 +356,7 @@ module Sensu
       begin
         post_body = Oj.load(request.body.read)
         check_name = post_body[:check]
-        subscribers = post_body[:subscribers] || Array.new
+        subscribers = post_body[:subscribers]
         if check_name.is_a?(String) && subscribers.is_a?(Array)
           if $settings.check_exists?(check_name)
             check = $settings[:checks][check_name]
@@ -353,7 +375,7 @@ module Sensu
             subscribers.uniq.each do |exchange_name|
               $amq.fanout(exchange_name).publish(Oj.dump(payload))
             end
-            created!(Oj.dump(payload))
+            issued!
           else
             not_found!
           end
@@ -410,7 +432,7 @@ module Sensu
       $redis.hgetall('events:' + client_name) do |events|
         if events.include?(check_name)
           resolve_event(event_hash(events[check_name], client_name, check_name))
-          accepted!(Oj.dump({:issued => Time.now.to_i}))
+          issued!
         else
           not_found!
         end
@@ -426,7 +448,7 @@ module Sensu
           $redis.hgetall('events:' + client_name) do |events|
             if events.include?(check_name)
               resolve_event(event_hash(events[check_name], client_name, check_name))
-              accepted!(Oj.dump({:issued => Time.now.to_i}))
+              issued!
             else
               not_found!
             end
@@ -445,6 +467,9 @@ module Sensu
         unless checks.empty?
           checks.each_with_index do |check_name, index|
             $redis.smembers('aggregates:' + check_name) do |aggregates|
+              aggregates.map! do |issued|
+                issued.to_i
+              end
               item = {
                 :check => check_name,
                 :issued => aggregates.sort.reverse
@@ -464,27 +489,23 @@ module Sensu
     aget %r{/aggregates/([\w\.-]+)$} do |check_name|
       $redis.smembers('aggregates:' + check_name) do |aggregates|
         unless aggregates.empty?
+          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.to_i > timestamp
+                issued > timestamp
               end
             else
               valid_request = false
             end
           end
-          limit = 10
-          if params[:limit]
-            if params[:limit] =~ /^[0-9]+$/
-              limit = params[:limit].to_i
-            else
-              valid_request = false
-            end
-          end
           if valid_request
-            body Oj.dump(aggregates.sort.reverse.take(limit))
+            aggregates = pagination(aggregates.sort.reverse)
+            body Oj.dump(aggregates)
           else
             bad_request!
           end
@@ -552,7 +573,7 @@ module Sensu
         post_body = Oj.load(request.body.read)
         $redis.set('stash:' + path, Oj.dump(post_body)) do
           $redis.sadd('stashes', path) do
-            created!(Oj.dump({:issued => Time.now.to_i}))
+            created!(Oj.dump(:path => path))
           end
         end
       rescue Oj::ParseError
@@ -585,24 +606,39 @@ module Sensu
     end
 
     aget '/stashes' do
+      response = Array.new
       $redis.smembers('stashes') do |stashes|
-        body Oj.dump(stashes)
+        stashes = pagination(stashes)
+        unless stashes.empty?
+          stashes.each_with_index do |path, index|
+            $redis.get('stash:' + path) do |stash_json|
+              unless stash_json.nil?
+                item = {
+                  :path => path,
+                  :content => Oj.load(stash_json)
+                }
+                response << item
+              end
+              if index == stashes.size - 1
+                body Oj.dump(response)
+              end
+            end
+          end
+        else
+          body Oj.dump(response)
+        end
       end
     end
 
     apost '/stashes' do
       begin
         post_body = Oj.load(request.body.read)
-        if post_body.is_a?(Array) && post_body.size > 0
-          response = Hash.new
-          post_body.each_with_index do |path, index|
-            $redis.get('stash:' + path) do |stash_json|
-              unless stash_json.nil?
-                response[path] = Oj.load(stash_json)
-              end
-              if index == post_body.size - 1
-                body Oj.dump(response)
-              end
+        path = post_body[:path]
+        content = post_body[:content]
+        if path.is_a?(String) && content.is_a?(Hash)
+          $redis.set('stash:' + path, Oj.dump(content)) do
+            $redis.sadd('stashes', path) do
+              created!(Oj.dump(:path => path))
             end
           end
         else

data/lib/sensu/constants.rb

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

data/sensu.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency('amqp', '0.9.10')
   s.add_dependency('em-redis-unified', '0.4.1')
   s.add_dependency('thin', '1.5.0')
+  s.add_dependency('sinatra', '1.3.5')
   s.add_dependency('async_sinatra', '1.0.0')
 
   s.add_development_dependency('rake')

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: -1667026956
+  hash: -2966743116
   prerelease: true
   segments: 
   - 0
   - 9
   - 12
   - beta
-  - 5
-  version: 0.9.12.beta.5
+  - 6
+  version: 0.9.12.beta.6
 platform: ruby
 authors: 
 - Sean Porter
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-14 00:00:00 -07:00
+date: 2013-03-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -102,9 +102,25 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: async_sinatra
+  name: sinatra
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 3
+        - 5
+        version: 1.3.5
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: async_sinatra
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -116,11 +132,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -130,11 +146,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -144,11 +160,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: em-http-request
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -158,7 +174,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 description: A monitoring framework that aims to be simple, malleable, and scalable. Uses the publish/subscribe model.
 email: 
 - portertech@gmail.com