sensu 0.8.7 → 0.8.9

data/Gemfile.lock

@@ -1,20 +1,22 @@
 PATH
   remote: .
   specs:
-    sensu (0.8.5)
+    sensu (0.8.9)
       amqp (= 0.7.4)
       async_sinatra
       cabin (= 0.1.7)
-      em-hiredis
+      eventmachine (~> 1.0.0.beta.4)
       hashie
       json
       rack (~> 1.3.4)
+      ruby-redis
       thin
       uuidtools
 
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.2.6)
     amqp (0.7.4)
       eventmachine
     async_sinatra (0.5.0)
@@ -25,21 +27,23 @@ GEM
       json
     daemons (1.1.4)
     diff-lcs (1.1.3)
-    em-hiredis (0.1.0)
-      hiredis (~> 0.3.0)
+    em-http-request (0.3.0)
+      addressable (>= 2.0.0)
+      escape_utils
+      eventmachine (>= 0.12.9)
     em-spec (0.2.5)
       bacon
       eventmachine
       rspec (~> 2.6.0)
       test-unit
-    eventmachine (0.12.10)
+    escape_utils (0.2.4)
+    eventmachine (1.0.0.beta.4)
     hashie (1.2.0)
-    hiredis (0.3.2)
     json (1.6.1)
     rack (1.3.5)
     rack-protection (1.1.4)
       rack
-    rake (0.9.2)
+    rake (0.9.2.2)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -48,12 +52,14 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    ruby-redis (0.0.2)
+      eventmachine
     sinatra (1.3.1)
       rack (~> 1.3, >= 1.3.4)
       rack-protection (~> 1.1, >= 1.1.2)
       tilt (~> 1.3, >= 1.3.3)
-    test-unit (2.4.0)
-    thin (1.2.11)
+    test-unit (2.4.1)
+    thin (1.3.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
@@ -64,6 +70,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  em-http-request
   em-spec
   rake
   sensu!

data/Rakefile

@@ -9,9 +9,3 @@ task :test do
     require File.join(File.dirname(__FILE__), test)
   end
 end
-
-desc "Build Sensu for Windows"
-task :build_windows do
-  puts `sh -c 'BUILD=mswin gem build sensu.windows'`
-  puts `sh -c 'BUILD=mingw gem build sensu.windows'`
-end

data/bin/sensu-api

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-raise "The Sensu API does not run on Windows" if RUBY_PLATFORM.downcase =~ /mswin|mingw32|windows/
-
 $: << File.dirname(__FILE__) + '/../lib' unless $:.include?(File.dirname(__FILE__) + '/../lib/')
 require 'sensu/api'
 

data/bin/sensu-server

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-raise "The Sensu Server does not run on Windows" if RUBY_PLATFORM.downcase =~ /mswin|mingw32|windows/
-
 $: << File.dirname(__FILE__) + '/../lib' unless $:.include?(File.dirname(__FILE__) + '/../lib/')
 require 'sensu/server'
 

data/lib/sensu.rb

@@ -1,3 +1,3 @@
 module Sensu
-  VERSION = "0.8.7"
+  VERSION = "0.8.9"
 end

data/lib/sensu/api.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), 'config')
 require 'sinatra/async'
-require 'em-hiredis'
+require 'redis'
 
 module Sensu
   class API < Sinatra::Base
@@ -24,7 +24,7 @@ module Sensu
       @settings = config.settings
       $logger = config.logger
       $logger.debug('[setup] -- connecting to redis')
-      $redis = EM::Hiredis.connect('redis://' + @settings.redis.host + ':' + @settings.redis.port.to_s)
+      $redis = EM.connect(@settings.redis.host, @settings.redis.port, Redis::Client)
       $logger.debug('[setup] -- connecting to rabbitmq')
       connection = AMQP.connect(@settings.rabbitmq.to_hash.symbolize_keys)
       $amq = MQ.new(connection)
@@ -69,21 +69,13 @@ module Sensu
     adelete '/client/:name' do |client|
       $logger.debug('[client] -- ' + request.ip + ' -- DELETE -- request for client -- ' + client)
       $redis.sismember('clients', client).callback do |client_exists|
-        unless client_exists == 0
-          $redis.exists('events:' + client).callback do |events_exist|
-            unless events_exist == 0
-              $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'}
-                  $amq.queue('results').publish({:client => client, :check => check}.to_json)
-                end
-                EM.add_timer(5) do
-                  $redis.srem('clients', client)
-                  $redis.del('events:' + client)
-                  $redis.del('client:' + client)
-                end
-              end
-            else
+        if client_exists
+          $redis.hgetall('events:' + client).callback do |events|
+            events.keys.each do |check_name|
+              check = {:name => check_name, :issued => Time.now.to_i, :status => 0, :output => 'Client is being removed'}
+              $amq.queue('results').publish({:client => client, :check => check}.to_json)
+            end
+            EM.add_timer(5) do
               $redis.srem('clients', client)
               $redis.del('events:' + client)
               $redis.del('client:' + client)
@@ -105,7 +97,7 @@ module Sensu
         unless clients.empty?
           clients.each_with_index do |client, index|
             $redis.hgetall('events:' + client).callback do |events|
-              client_events = Hash[*events]
+              client_events = events
               client_events.each do |key, value|
                 client_events[key] = JSON.parse(value)
               end
@@ -122,7 +114,7 @@ module Sensu
     aget '/event/:client/:check' do |client, check|
       $logger.debug('[event] -- ' + request.ip + ' -- GET -- request for event -- ' + client + ' -- ' + check)
       $redis.hgetall('events:' + client).callback do |events|
-        client_events = Hash[*events]
+        client_events = events
         event = client_events[check]
         status 404 if event.nil?
         body event
@@ -139,7 +131,7 @@ module Sensu
       end
       if event.has_key?('client') && event.has_key?('check')
         $redis.hgetall('events:' + event['client']).callback do |events|
-          if Hash[*events][event['check']]
+          if events.has_key?(event['check'])
             check = {:name => event['check'], :issued => Time.now.to_i, :status => 0, :output => 'Resolving on request of the API'}
             $amq.queue('results').publish({:client => event['client'], :check => check}.to_json)
             status 201
@@ -177,7 +169,7 @@ module Sensu
         body nil
       end
       stashes = Hash.new
-      if paths.is_a?(Array)
+      if paths.is_a?(Array) && paths.size > 0
         paths.each_with_index do |path, index|
           $redis.get('stash:' + path).callback do |stash|
             stashes[path] = JSON.parse(stash) unless stash.nil?
@@ -201,7 +193,7 @@ module Sensu
     adelete '/stash/*' do |path|
       $logger.debug('[stash] -- ' + request.ip + ' -- DELETE -- request for stash -- ' + path)
       $redis.exists('stash:' + path).callback do |stash_exist|
-        unless stash_exist == 0
+        if stash_exist
           $redis.del('stash:' + path).callback do
             status 204
             body nil
@@ -215,7 +207,7 @@ module Sensu
 
     def self.test(options={})
       self.setup(options)
-      $redis.set('client:test', @settings.client).callback do
+      $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', {
             :status => 2,
@@ -223,11 +215,12 @@ module Sensu
             :flapping => false,
             :occurrences => 1
           }.to_json).callback do
-            $redis.set('stash:test/test', '{"key": "value"}')
+            $redis.set('stash:test/test', '{"key": "value"}').callback do
+              self.run!(:port => @settings.api.port)
+            end
           end
         end
       end
-      self.run!(:port => @settings.api.port)
     end
   end
 end

data/lib/sensu/config.rb

@@ -1,4 +1,5 @@
 require 'rubygems' if RUBY_VERSION < '1.9.0'
+gem 'eventmachine', '~> 1.0.0.beta.4'
 require 'optparse'
 require 'json'
 require 'hashie'

data/lib/sensu/server.rb

@@ -1,5 +1,5 @@
 require File.join(File.dirname(__FILE__), 'config')
-require 'em-hiredis'
+require 'redis'
 
 module Sensu
   class Server
@@ -43,7 +43,7 @@ module Sensu
 
     def setup_redis
       @logger.debug('[redis] -- connecting to redis')
-      @redis = EM::Hiredis.connect('redis://' + @settings.redis.host + ':' + @settings.redis.port.to_s)
+      @redis = EM.connect(@settings.redis.host, @settings.redis.port, Redis::Client)
     end
 
     def setup_amqp
@@ -229,7 +229,7 @@ module Sensu
                 @result_queue.publish(result.to_json)
               else
                 @redis.hexists('events:' + client_id, 'keepalive').callback do |exists|
-                  if exists == 1
+                  if exists
                     result.check.status = 0
                     result.check.output = 'Keep-alive sent from host'
                     @result_queue.publish(result.to_json)

data/sensu.gemspec

@@ -7,23 +7,25 @@ Gem::Specification.new do |s|
   s.authors     = ["Sean Porter", "Justin Kolberg"]
   s.email       = ["sean.porter@sonian.net", "justin.kolberg@sonian.net"]
   s.homepage    = "https://github.com/sonian/sensu"
-  s.summary     = %q{A monitoring framework}
-  s.description = %q{A monitoring framework that aims to be simple, malleable, and scalable. Uses the publish/subscribe model.}
+  s.summary     = "A monitoring framework"
+  s.description = "A monitoring framework that aims to be simple, malleable, and scalable. Uses the publish/subscribe model."
   s.license     = "MIT"
   s.has_rdoc    = false
 
+  s.add_dependency("eventmachine", "~> 1.0.0.beta.4")
   s.add_dependency("amqp", "0.7.4")
   s.add_dependency("json")
   s.add_dependency("hashie")
   s.add_dependency("uuidtools")
   s.add_dependency("cabin", "0.1.7")
-  s.add_dependency("em-hiredis")
+  s.add_dependency("ruby-redis")
   s.add_dependency("rack", "~> 1.3.4")
   s.add_dependency("async_sinatra")
   s.add_dependency("thin")
 
   s.add_development_dependency("rake")
   s.add_development_dependency("em-spec")
+  s.add_development_dependency("em-http-request")
 
   s.files         = `git ls-files`.split("\n").reject {|f| f =~ /(dist|test|png)/}
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 45
   prerelease: false
   segments: 
   - 0
   - 8
-  - 7
-  version: 0.8.7
+  - 9
+  version: 0.8.9
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,13 +16,31 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-14 00:00:00 -08:00
+date: 2011-11-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: amqp
+  name: eventmachine
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 62196363
+        segments: 
+        - 1
+        - 0
+        - 0
+        - beta
+        - 4
+        version: 1.0.0.beta.4
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: amqp
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -34,11 +52,11 @@ dependencies:
         - 4
         version: 0.7.4
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,11 +66,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hashie
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,11 +80,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: uuidtools
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -76,11 +94,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: cabin
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -92,11 +110,11 @@ dependencies:
         - 7
         version: 0.1.7
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: em-hiredis
+  name: ruby-redis
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -106,11 +124,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -122,11 +140,11 @@ dependencies:
         - 4
         version: 1.3.4
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: async_sinatra
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -136,11 +154,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: thin
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -150,11 +168,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -164,11 +182,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: em-spec
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -178,7 +196,21 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: em-http-request
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id013
 description: A monitoring framework that aims to be simple, malleable, and scalable. Uses the publish/subscribe model.
 email: 
 - sean.porter@sonian.net
@@ -209,7 +241,6 @@ files:
 - lib/sensu/helpers.rb
 - lib/sensu/server.rb
 - sensu.gemspec
-- sensu.windows
 has_rdoc: true
 homepage: https://github.com/sonian/sensu
 licenses: 

data/sensu.windows

@@ -1,31 +0,0 @@
-require File.expand_path("../lib/sensu", __FILE__)
-
-Gem::Specification.new do |s|
-  s.name        = "sensu"
-  s.version     = Sensu::VERSION
-  s.authors     = ["Sean Porter", "Justin Kolberg"]
-  s.email       = ["sean.porter@sonian.net", "justin.kolberg@sonian.net"]
-  s.homepage    = "https://github.com/sonian/sensu"
-  s.summary     = %q{A monitoring framework}
-  s.description = %q{A monitoring framework that aims to be simple, malleable, and scalable. Uses the publish/subscribe model.}
-  s.license     = "MIT"
-  s.has_rdoc    = false
-
-  s.platform = case ENV['BUILD']
-  when "mswin"
-    "x86-mswin32"
-  when "mingw"
-    "x86-mingw32"
-  end
-
-  s.add_dependency("eventmachine", "1.0.0.beta.4.1")
-  s.add_dependency("amqp", "0.7.4")
-  s.add_dependency("json")
-  s.add_dependency("hashie")
-  s.add_dependency("uuidtools")
-  s.add_dependency("cabin", "0.1.7")
-
-  s.files         = `git ls-files`.split("\n").reject {|f| f =~ /(dist|test|server|api|png)/}
-  s.executables   = "sensu-client"
-  s.require_paths = ["lib"]
-end