sensu 0.20.5 → 0.20.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8007404a6dd86529b0ec5641f44251fb1f66e381
-  data.tar.gz: 2169f30451c9c3fe065fee86698e9093d0edc33d
+  metadata.gz: 8db94deef76774c21c9200b21055c0cedc6c1907
+  data.tar.gz: 067c5f4dedbb6315d62c77a1dbe769bd18b6442d
 SHA512:
-  metadata.gz: 4b24da36fda299858ed7c49e484ff569ad0fb8050395093352e9768391480c90f136adb2339bfa7d7b82b6039fbcb7cda9236a598a19540b06de2a61de698c60
-  data.tar.gz: cee8022b8fcc784ff5fbf5b9fb6e92a1620549deac35c4728df69ee6cbaecdf314cdd24a7f59c5ede5cd0f53c8d18f5020c8feea2e2c1223d9719d0790f6c1d7
+  metadata.gz: 0a620e6977eabe3657cfa23409f5732fe9d7a79985752290eafd939b5f0966b3885ded2d47c14c9a9ade611a464cd9ff483fa8f79e14d5ccdd64ddb124c7b01a
+  data.tar.gz: 4d40cdcb998419822642090121c34aded2a47e7c094c4b084516ff0ad7893701ff0598cdaa6a0a5c4922bf686b099086bb9db7f3e739d52a11d7d090fd86a085

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.20.6 - 2015-09-22
+
+### Other
+
+Removed sensu-em as a dependency, now using upstream EventMachine 1.0.8.
+
+The Sensu API will remove a client immediately if there are no current
+events for it. The API will continue to monitor the current event count
+for the client to be deleted, deleting the client when there are no longer
+current events or after a timeout of 5 seconds.
+
+The Sensu API will no longer crash while fetching check result data for a
+client that is being deleted.
+
 ## 0.20.5 - 2015-09-09
 
 ### Other

data/lib/sensu/api/process.rb

@@ -337,9 +337,7 @@ module Sensu
                 unless client_json.nil?
                   response << MultiJson.load(client_json)
                 else
-                  settings.logger.error("client registry missing data for client", {
-                    :client_name => client_name
-                  })
+                  settings.logger.error("client data missing from registry", :client_name => client_name)
                   settings.redis.srem("clients", client_name)
                 end
                 if index == clients.size - 1
@@ -375,17 +373,19 @@ module Sensu
                   status.to_i
                 end
                 settings.redis.get("result:#{result_key}") do |result_json|
-                  result = MultiJson.load(result_json)
-                  last_execution = result[:executed]
-                  unless history.empty? || last_execution.nil?
-                    item = {
-                      :check => check_name,
-                      :history => history,
-                      :last_execution => last_execution.to_i,
-                      :last_status => history.last,
-                      :last_result => result
-                    }
-                    response << item
+                  unless result_json.nil?
+                    result = MultiJson.load(result_json)
+                    last_execution = result[:executed]
+                    unless history.empty? || last_execution.nil?
+                      item = {
+                        :check => check_name,
+                        :history => history,
+                        :last_execution => last_execution.to_i,
+                        :last_status => history.last,
+                        :last_result => result
+                      }
+                      response << item
+                    end
                   end
                   if index == checks.size - 1
                     body MultiJson.dump(response)
@@ -406,22 +406,31 @@ module Sensu
               events.each do |check_name, event_json|
                 resolve_event(event_json)
               end
-              EM::Timer.new(5) do
-                client = MultiJson.load(client_json)
-                settings.logger.info("deleting client", :client => client)
-                settings.redis.srem("clients", client_name) do
-                  settings.redis.del("client:#{client_name}")
-                  settings.redis.del("events:#{client_name}")
-                  settings.redis.smembers("result:#{client_name}") do |checks|
-                    checks.each do |check_name|
-                      result_key = "#{client_name}:#{check_name}"
-                      settings.redis.del("result:#{result_key}")
-                      settings.redis.del("history:#{result_key}")
+              delete_client = Proc.new do |attempts|
+                attempts += 1
+                settings.redis.hgetall("events:#{client_name}") do |events|
+                  if events.empty? || attempts == 5
+                    settings.logger.info("deleting client from registry", :client_name => client_name)
+                    settings.redis.srem("clients", client_name) do
+                      settings.redis.del("client:#{client_name}")
+                      settings.redis.del("events:#{client_name}")
+                      settings.redis.smembers("result:#{client_name}") do |checks|
+                        checks.each do |check_name|
+                          result_key = "#{client_name}:#{check_name}"
+                          settings.redis.del("result:#{result_key}")
+                          settings.redis.del("history:#{result_key}")
+                        end
+                        settings.redis.del("result:#{client_name}")
+                      end
+                    end
+                  else
+                    EM::Timer.new(1) do
+                      delete_client.call(attempts)
                     end
-                    settings.redis.del("result:#{client_name}")
                   end
                 end
               end
+              delete_client.call(0)
               issued!
             end
           else
@@ -744,8 +753,10 @@ module Sensu
                   checks.each_with_index do |check_name, check_index|
                     result_key = "result:#{client_name}:#{check_name}"
                     settings.redis.get(result_key) do |result_json|
-                      check = MultiJson.load(result_json)
-                      response << {:client => client_name, :check => check}
+                      unless result_json.nil?
+                        check = MultiJson.load(result_json)
+                        response << {:client => client_name, :check => check}
+                      end
                       if client_index == clients.size - 1 && check_index == checks.size - 1
                         body MultiJson.dump(response)
                       end
@@ -769,8 +780,10 @@ module Sensu
             checks.each_with_index do |check_name, check_index|
               result_key = "result:#{client_name}:#{check_name}"
               settings.redis.get(result_key) do |result_json|
-                check = MultiJson.load(result_json)
-                response << {:client => client_name, :check => check}
+                unless result_json.nil?
+                  check = MultiJson.load(result_json)
+                  response << {:client => client_name, :check => check}
+                end
                 if check_index == checks.size - 1
                   body MultiJson.dump(response)
                 end

data/lib/sensu/constants.rb

@@ -1,7 +1,7 @@
 module Sensu
   unless defined?(Sensu::VERSION)
     # Sensu release version.
-    VERSION = "0.20.5"
+    VERSION = "0.20.6"
 
     # Sensu check severities.
     SEVERITIES = %w[ok warning critical unknown]

data/lib/sensu/daemon.rb

@@ -1,14 +1,14 @@
 require "rubygems"
 
 gem "multi_json", "1.11.2"
+gem "eventmachine", "1.0.8"
 
-gem "sensu-em", "2.5.2"
-gem "sensu-logger", "1.0.0"
+gem "sensu-logger", "1.1.0"
 gem "sensu-settings", "3.1.0"
-gem "sensu-extension", "1.1.2"
-gem "sensu-extensions", "1.2.0"
-gem "sensu-transport", "3.2.1"
-gem "sensu-spawn", "1.4.0"
+gem "sensu-extension", "1.2.0"
+gem "sensu-extensions", "1.3.0"
+gem "sensu-transport", "3.3.0"
+gem "sensu-spawn", "1.5.0"
 
 require "time"
 require "uri"

data/lib/sensu/server/filter.rb

@@ -259,16 +259,17 @@ module Sensu
       def event_filtered?(handler, event, &callback)
         if handler.has_key?(:filters) || handler.has_key?(:filter)
           filter_list = Array(handler[:filters] || handler[:filter])
-          filter_results = EM::Iterator.new(filter_list)
-          run_filters = Proc.new do |filter_name, iterator|
-            event_filter(filter_name, event) do |filtered|
-              iterator.return(filtered)
+          filter = Proc.new do |filter_list|
+            filter_name = filter_list.shift
+            if filter_name.nil?
+              callback.call(false)
+            else
+              event_filter(filter_name, event) do |filtered|
+                filtered ? callback.call(true) : EM.next_tick { filter.call(filter_list) }
+              end
             end
           end
-          filtered = Proc.new do |results|
-            callback.call(results.any?)
-          end
-          filter_results.map(run_filters, filtered)
+          EM.next_tick { filter.call(filter_list) }
         else
           callback.call(false)
         end

data/sensu.gemspec

@@ -16,14 +16,13 @@ Gem::Specification.new do |s|
   s.add_dependency "json" if RUBY_VERSION < "1.9"
   s.add_dependency "multi_json", "1.11.2"
   s.add_dependency "uuidtools", "2.1.5"
-  s.add_dependency "eventmachine", "1.0.3"
-  s.add_dependency "sensu-em", "2.5.2"
-  s.add_dependency "sensu-logger", "1.0.0"
+  s.add_dependency "eventmachine", "1.0.8"
+  s.add_dependency "sensu-logger", "1.1.0"
   s.add_dependency "sensu-settings", "3.1.0"
-  s.add_dependency "sensu-extension", "1.1.2"
-  s.add_dependency "sensu-extensions", "1.2.0"
-  s.add_dependency "sensu-transport", "3.2.1"
-  s.add_dependency "sensu-spawn", "1.4.0"
+  s.add_dependency "sensu-extension", "1.2.0"
+  s.add_dependency "sensu-extensions", "1.3.0"
+  s.add_dependency "sensu-transport", "3.3.0"
+  s.add_dependency "sensu-spawn", "1.5.0"
   s.add_dependency "em-redis-unified", "1.0.0"
   s.add_dependency "sinatra", "1.4.6"
   s.add_dependency "async_sinatra", "1.2.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.20.5
+  version: 0.20.6
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -45,42 +45,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.3
-- !ruby/object:Gem::Dependency
-  name: sensu-em
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.5.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.5.2
+        version: 1.0.8
 - !ruby/object:Gem::Dependency
   name: sensu-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: sensu-settings
   requirement: !ruby/object:Gem::Requirement
@@ -101,56 +87,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: sensu-extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: sensu-transport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: sensu-spawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: em-redis-unified
   requirement: !ruby/object:Gem::Requirement
@@ -307,3 +293,4 @@ signing_key:
 specification_version: 4
 summary: A monitoring framework
 test_files: []
+has_rdoc: false