sensu 0.8.13 → 0.8.16

data/Gemfile

@@ -5,7 +5,6 @@ gem("eventmachine", "~> 1.0.0.beta.4")
 gem("amqp", "0.7.4")
 gem("json")
 gem("hashie")
-gem("uuidtools")
 gem("cabin", "0.1.7")
 gem("ruby-redis-portertech")
 gem("rack", "~> 1.3.4")

data/Gemfile.lock

@@ -27,7 +27,7 @@ GEM
     eventmachine (1.0.0.beta.4)
     hashie (1.2.0)
     http_parser.rb (0.5.3)
-    json (1.6.1)
+    json (1.6.3)
     rack (1.3.5)
     rack-protection (1.1.4)
       rack
@@ -46,13 +46,12 @@ GEM
       rack (~> 1.3, >= 1.3.4)
       rack-protection (~> 1.1, >= 1.1.2)
       tilt (~> 1.3, >= 1.3.3)
-    test-unit (2.4.1)
+    test-unit (2.4.2)
     thin (1.3.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     tilt (1.3.3)
-    uuidtools (2.1.2)
 
 PLATFORMS
   ruby
@@ -71,4 +70,3 @@ DEPENDENCIES
   rake
   ruby-redis-portertech
   thin
-  uuidtools

data/lib/sensu.rb

@@ -1,3 +1,3 @@
 module Sensu
-  VERSION = "0.8.13"
+  VERSION = "0.8.16"
 end

data/lib/sensu/client.rb

@@ -55,7 +55,7 @@ module Sensu
     end
 
     def publish_result(check)
-      @logger.info('[result] -- publishing check result -- ' + check.name)
+      @logger.info('[result] -- publishing check result -- ' + check.status.to_s + ' -- ' + check.name)
       @result_queue ||= @amq.queue('results')
       @result_queue.publish({
         :client => @settings.client.name,
@@ -110,7 +110,7 @@ module Sensu
 
     def setup_subscriptions
       @logger.debug('[subscribe] -- setup subscriptions')
-      @check_queue = @amq.queue(UUIDTools::UUID.random_create.to_s, :exclusive => true)
+      @check_queue = @amq.queue(String.unique, :exclusive => true)
       @settings.client.subscriptions.push('uchiwa')
       @settings.client.subscriptions.each do |exchange|
         @logger.debug('[subscribe] -- queue binding to exchange -- ' + exchange)

data/lib/sensu/config.rb

@@ -1,4 +1,5 @@
 require 'rubygems' if RUBY_VERSION < '1.9.0'
+require 'bundler'
 require 'bundler/setup'
 
 require File.join(File.dirname(__FILE__), 'helpers')
@@ -8,7 +9,6 @@ gem 'eventmachine', '~> 1.0.0.beta.4'
 require 'optparse'
 require 'json'
 require 'hashie'
-require 'uuidtools'
 require 'amqp'
 require 'cabin'
 require 'cabin/outputs/em-stdlib-logger'
@@ -26,7 +26,10 @@ module Sensu
         invalid_config('log file is not writable: ' + log_file)
       end
       @logger.subscribe(Cabin::Outputs::EmStdlibLogger.new(ruby_logger))
-      @logger.level = options[:verbose] ? 'debug' : 'info'
+      @logger.level = options[:verbose] ? :debug : :info
+      Signal.trap('USR1') do
+        @logger.level = @logger.level == :info ? :debug : :info
+      end
       config_file = options[:config_file] || '/etc/sensu/config.json'
       if File.readable?(config_file)
         begin

data/lib/sensu/helpers.rb

@@ -1,5 +1,5 @@
 class Hash
-  def symbolize_keys(item = self)
+  def symbolize_keys(item=self)
     case item
     when Array
       item.map do |i|
@@ -18,3 +18,9 @@ class Hash
     end
   end
 end
+
+class String
+  def self.unique(chars=32)
+    rand(36**chars).to_s(36)
+  end
+end

data/lib/sensu/server.rb

@@ -101,7 +101,7 @@ module Sensu
     end
 
     def process_result(result)
-      @logger.debug('[result] -- processing result for ' + [result.client, result.check.name].join(' -- '))
+      @logger.debug('[result] -- processing result -- ' + result.client + ' -- ' + result.check.name)
       @redis.get('client:' + result.client).callback do |client_json|
         unless client_json.nil?
           client = Hashie::Mash.new(JSON.parse(client_json))
@@ -132,20 +132,21 @@ module Sensu
                   total_state_change = (state_changes.fdiv(20) * 100).to_i
                   @redis.lpop(history_key)
                 end
-                high_flap_threshold = check.high_flap_threshold || 50
-                low_flap_threshold = check.low_flap_threshold || 40
                 @redis.hget('events:' + client.name, check.name).callback do |event_json|
-                  previous_event = event_json ? Hashie::Mash.new(JSON.parse(event_json)) : false
-                  is_flapping = previous_event ? previous_event.flapping : false
-                  is_flapping = case
-                  when total_state_change >= high_flap_threshold
-                    true
-                  when is_flapping && total_state_change <= low_flap_threshold
-                    false
-                  else
-                    is_flapping
+                  previous_occurrence = event_json ? Hashie::Mash.new(JSON.parse(event_json)) : false
+                  is_flapping = false
+                  if check.key?('low_flap_threshold') && check.key?('high_flap_threshold')
+                    was_flapping = previous_occurrence ? previous_occurrence.flapping : false
+                    is_flapping = case
+                    when total_state_change >= check.high_flap_threshold
+                      true
+                    when was_flapping && total_state_change <= check.low_flap_threshold
+                      false
+                    else
+                      was_flapping
+                    end
                   end
-                  if previous_event && check.status == 0
+                  if previous_occurrence && check.status == 0
                     unless is_flapping
                       unless check.auto_resolve == false && !check.force_resolve
                         @redis.hdel('events:' + client.name, check.name).callback do
@@ -157,11 +158,11 @@ module Sensu
                       end
                     else
                       @logger.debug('[result] -- check is flapping -- ' + client.name + ' -- ' + check.name)
-                      @redis.hset('events:' + client.name, check.name, previous_event.merge({'flapping' => true}).to_json)
+                      @redis.hset('events:' + client.name, check.name, previous_occurrence.merge({'flapping' => true}).to_json)
                     end
                   elsif check['status'] != 0
-                    if previous_event && check.status == previous_event.status
-                      event.occurrences = previous_event.occurrences += 1
+                    if previous_occurrence && check.status == previous_occurrence.status
+                      event.occurrences = previous_occurrence.occurrences += 1
                     end
                     @redis.hset('events:' + client.name, check.name, {
                       :status => check.status,
@@ -201,7 +202,7 @@ module Sensu
       @settings.checks.each_with_index do |(name, details), index|
         check = Hashie::Mash.new
         check.name = name
-        unless details.enabled == false
+        unless details.publish == false
           EM.add_timer(stagger*index) do
             details.subscribers.each do |subscriber|
               if subscriber.is_a?(Hash)

data/sensu.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
   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("ruby-redis-portertech")
   s.add_dependency("rack", "~> 1.3.4")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sensu
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 8
-  - 13
-  version: 0.8.13
+  - 16
+  version: 0.8.16
 platform: ruby
 authors: 
 - Sean Porter
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-22 00:00:00 -08:00
+date: 2011-12-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,24 +95,10 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: uuidtools
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: cabin
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -124,11 +110,11 @@ dependencies:
         - 7
         version: 0.1.7
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: ruby-redis-portertech
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -138,11 +124,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -154,11 +140,11 @@ dependencies:
         - 4
         version: 1.3.4
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: async_sinatra
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -168,11 +154,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: thin
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -182,11 +168,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id011
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -196,11 +182,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id012
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: em-spec
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -210,11 +196,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id013
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: em-http-request
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -224,7 +210,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id014
+  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