sensu 0.22.0 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc83c24129d23bc39b4f06d48b7cdba8abf0f851
-  data.tar.gz: 6aca4babe99fb2e63e610204532322af7714f726
+  metadata.gz: b102b675b0083c791f9b5bc753abac27d792d235
+  data.tar.gz: 6c15808db765bcb0e9afd3d772254ff1679109ef
 SHA512:
-  metadata.gz: dae436f84c219b052231da1d79be00a829f312c823020fa9e6c535555c1995ed69fec6c051da467ec3f7a8633333f1365b068e13f68da007d82f34e56a43af93
-  data.tar.gz: a164bcfc4ce2673eb3fafd41276d7074659893864f634de39a2832435f01469a4a3e49424ccd25ab5dc5d82b57aed7d86ffe3d5deb4d11404a310ece5c7c43f5
+  metadata.gz: 9492c11b9f2b3bd44c32174bd2a595206d04a45f4110fe71af625de0a073d7aa49605dc9a2c4ca9ca3764ac95079fea1a4580a3a2e49e85bf0c660546f7918f7
+  data.tar.gz: 513803cadf77b9d15cb1d0003d94be2435dfe932bb3835de34fdc206e1c0e92618dd5e6f9f20d74957870f528dd218827d043310fc9624ec567ba970e12033c5

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.22.1 - 2016-03-01
+
+### Other
+
+Performance improvements. Using frozen constants for common values and
+comparisons. Reduced the use of block arguments for callbacks.
+
+Improved RabbitMQ transport channel error handling.
+
+Fixed client signatures inspection/comparison when upgrading from a
+previous release.
+
 ## 0.22.0 - 2016-01-29
 
 ### Features

data/lib/sensu/api/process.rb

@@ -65,11 +65,11 @@ module Sensu
           @thin.start
         end
 
-        def stop_server(&callback)
+        def stop_server
           @thin.stop
           retry_until_true do
             unless @thin.running?
-              callback.call
+              yield
               true
             end
           end
@@ -171,7 +171,7 @@ module Sensu
           body ""
         end
 
-        def read_data(rules={}, &callback)
+        def read_data(rules={})
           begin
             data = MultiJson.load(env["rack.input"].read)
             valid = rules.all? do |key, rule|
@@ -181,7 +181,7 @@ module Sensu
                 (rule[:regex] && (value =~ rule[:regex]) == 0)
             end
             if valid
-              callback.call(data)
+              yield(data)
             else
               bad_request!
             end
@@ -210,7 +210,7 @@ module Sensu
           end
         end
 
-        def transport_info(&callback)
+        def transport_info
           info = {
             :keepalives => {
               :messages => nil,
@@ -227,11 +227,11 @@ module Sensu
               info[:keepalives] = stats
               settings.transport.stats("results") do |stats|
                 info[:results] = stats
-                callback.call(info)
+                yield(info)
               end
             end
           else
-            callback.call(info)
+            yield(info)
           end
         end
 

data/lib/sensu/client/process.rb

@@ -369,13 +369,13 @@ module Sensu
       # check the condition every 0.5 seconds until `true` is
       # returned.
       #
-      # @param callback [Proc] called when there are no check
+      # @yield [] callback/block called when there are no check
       #   executions in progress.
-      def complete_checks_in_progress(&callback)
+      def complete_checks_in_progress
         @logger.info("completing checks in progress", :checks_in_progress => @checks_in_progress)
         retry_until_true do
           if @checks_in_progress.empty?
-            callback.call
+            yield
             true
           end
         end

data/lib/sensu/client/socket.rb

@@ -68,6 +68,9 @@ module Sensu
       # chunks of data in this mode, the connection is being closed.
       MODE_REJECT = :REJECT
 
+      # PING request string, identifying a connection ping request.
+      PING_REQUEST = "ping".freeze
+
       # Initialize instance variables that will be used throughout the
       # lifetime of the connection. This method is called when the
       # network connection has been established, and immediately after
@@ -184,7 +187,7 @@ module Sensu
       #
       # @param [String] data to be processed.
       def process_data(data)
-        if data.strip == "ping"
+        if data.strip == PING_REQUEST
           @logger.debug("socket received ping")
           respond("pong")
         else

data/lib/sensu/constants.rb

@@ -1,12 +1,12 @@
 module Sensu
   unless defined?(Sensu::VERSION)
     # Sensu release version.
-    VERSION = "0.22.0"
+    VERSION = "0.22.1".freeze
 
     # Sensu check severities.
-    SEVERITIES = %w[ok warning critical unknown]
+    SEVERITIES = %w[ok warning critical unknown].freeze
 
     # Process signals that trigger a Sensu process stop.
-    STOP_SIGNALS = %w[INT TERM]
+    STOP_SIGNALS = %w[INT TERM].freeze
   end
 end

data/lib/sensu/daemon.rb

@@ -1,14 +1,14 @@
 require "rubygems"
 
 gem "multi_json", "1.11.2"
-gem "eventmachine", "1.0.8"
+gem "eventmachine", "1.0.9.1"
 
 gem "sensu-logger", "1.1.0"
 gem "sensu-settings", "3.3.0"
 gem "sensu-extension", "1.3.0"
 gem "sensu-extensions", "1.4.0"
-gem "sensu-transport", "3.3.0"
-gem "sensu-spawn", "1.6.0"
+gem "sensu-transport", "4.0.0"
+gem "sensu-spawn", "1.7.0"
 
 require "time"
 require "uri"

data/lib/sensu/server/filter.rb

@@ -228,21 +228,24 @@ module Sensu
       #
       # @param filter_name [String]
       # @param event [Hash]
-      # @param callback [Proc]
-      def event_filter(filter_name, event, &callback)
+      # @yield [filtered] callback/block called with a single
+      #   parameter to indicate if the event was filtered.
+      # @yieldparam filtered [TrueClass,FalseClass] indicating if the
+      #   event was filtered.
+      def event_filter(filter_name, event)
         case
         when @settings.filter_exists?(filter_name)
           filter = @settings[:filters][filter_name]
           matched = filter_attributes_match?(filter[:attributes], event)
-          callback.call(filter[:negate] ? matched : !matched)
+          yield(filter[:negate] ? matched : !matched)
         when @extensions.filter_exists?(filter_name)
           extension = @extensions[:filters][filter_name]
           extension.safe_run(event) do |output, status|
-            callback.call(status == 0)
+            yield(status == 0)
           end
         else
           @logger.error("unknown filter", :filter_name => filter_name)
-          callback.call(false)
+          yield(false)
         end
       end
 
@@ -255,23 +258,26 @@ module Sensu
       #
       # @param handler [Hash] definition.
       # @param event [Hash]
-      # @param callback [Proc]
-      def event_filtered?(handler, event, &callback)
+      # @yield [filtered] callback/block called with a single
+      #   parameter to indicate if the event was filtered.
+      # @yieldparam filtered [TrueClass,FalseClass] indicating if the
+      #   event was filtered.
+      def event_filtered?(handler, event)
         if handler.has_key?(:filters) || handler.has_key?(:filter)
           filter_list = Array(handler[:filters] || handler[:filter]).dup
           filter = Proc.new do |filter_list|
             filter_name = filter_list.shift
             if filter_name.nil?
-              callback.call(false)
+              yield(false)
             else
               event_filter(filter_name, event) do |filtered|
-                filtered ? callback.call(true) : EM.next_tick { filter.call(filter_list) }
+                filtered ? yield(true) : EM.next_tick { filter.call(filter_list) }
               end
             end
           end
-          EM.next_tick { filter.call(filter_list) }
+          filter.call(filter_list)
         else
-          callback.call(false)
+          yield(false)
         end
       end
 
@@ -283,8 +289,10 @@ module Sensu
       #
       # @param handler [Hash] definition.
       # @param event [Hash]
-      # @param callback [Proc]
-      def filter_event(handler, event, &callback)
+      # @yield [event] callback/block called if the event has not been
+      #   filtered.
+      # @yieldparam event [Hash]
+      def filter_event(handler, event)
         details = {:handler => handler, :event => event}
         filter_message = case
         when handling_disabled?(event)
@@ -302,7 +310,7 @@ module Sensu
         else
           event_filtered?(handler, event) do |filtered|
             unless filtered
-              callback.call(event)
+              yield(event)
             else
               @logger.info("event was filtered", details)
               @handling_event_count -= 1 if @handling_event_count

data/lib/sensu/server/process.rb

@@ -13,6 +13,12 @@ module Sensu
 
       attr_reader :is_leader, :handling_event_count
 
+      METRIC_CHECK_TYPE = "metric".freeze
+
+      EVENT_FLAPPING_ACTION = "flapping".freeze
+
+      DEFAULT_HANDLER_NAME = "default".freeze
+
       # Create an instance of the Sensu server process, start the
       # server within the EventMachine event loop, and set up server
       # process signal traps (for stopping).
@@ -105,24 +111,25 @@ module Sensu
       # used for the stored client data.
       #
       # @param client [Hash]
-      # @param callback [Proc] to call with the success status
-      # (true/false) indicating if the client data has been added to
-      # (or updated) the registry or discarded due to client signature
-      # mismatch.
-      def update_client_registry(client, &callback)
+      # @yield [success] passes success status to optional
+      #   callback/block.
+      # @yieldparam success [TrueClass,FalseClass] indicating if the
+      #   client registry update was a success or the client data was
+      #   discarded due to client signature mismatch.
+      def update_client_registry(client)
         @logger.debug("updating client registry", :client => client)
         client_key = "client:#{client[:name]}"
         signature_key = "#{client_key}:signature"
         @redis.setnx(signature_key, client[:signature]) do |created|
           process_client_registration(client) if created
           @redis.get(signature_key) do |signature|
-            if signature.empty? && client[:signature]
+            if (signature.nil? || signature.empty?) && client[:signature]
               @redis.set(signature_key, client[:signature])
             end
-            if signature.empty? || (client[:signature] == signature)
+            if signature.nil? || signature.empty? || (client[:signature] == signature)
               @redis.set(client_key, MultiJson.dump(client)) do
                 @redis.sadd("clients", client[:name]) do
-                  callback.call(true) if callback
+                  yield(true) if block_given?
                 end
               end
             else
@@ -131,7 +138,7 @@ module Sensu
                 :signature => signature
               })
               @logger.warn("not updating client in the registry", :client => client)
-              callback.call(false) if callback
+              yield(false) if block_given?
             end
           end
         end
@@ -218,9 +225,9 @@ module Sensu
       #
       # @param event [Hash]
       def process_event(event)
-        log_level = event[:check][:type] == "metric" ? :debug : :info
+        log_level = event[:check][:type] == METRIC_CHECK_TYPE ? :debug : :info
         @logger.send(log_level, "processing event", :event => event)
-        handler_list = Array((event[:check][:handlers] || event[:check][:handler]) || "default")
+        handler_list = Array((event[:check][:handlers] || event[:check][:handler]) || DEFAULT_HANDLER_NAME)
         handlers = derive_handlers(handler_list)
         handlers.each do |handler|
           @handling_event_count += 1
@@ -291,7 +298,7 @@ module Sensu
       # @return [Hash] check with truncated output.
       def truncate_check_output(check)
         case check[:type]
-        when "metric"
+        when METRIC_CHECK_TYPE
           output_lines = check[:output].split("\n")
           output = output_lines.first || check[:output]
           if output_lines.size > 1 || output.length > 255
@@ -312,9 +319,9 @@ module Sensu
       #
       # @param client [Hash]
       # @param check [Hash]
-      # @param callback [Proc] to call when the check result data has
-      #   been stored (history, etc).
-      def store_check_result(client, check, &callback)
+      # @yield [] callback/block called after the check data has been
+      # stored (history, etc).
+      def store_check_result(client, check)
         @logger.debug("storing check result", :check => check)
         @redis.sadd("result:#{client[:name]}", check[:name])
         result_key = "#{client[:name]}:#{check[:name]}"
@@ -323,7 +330,7 @@ module Sensu
           history_key = "history:#{result_key}"
           @redis.rpush(history_key, check[:status]) do
             @redis.ltrim(history_key, -21, -1)
-            callback.call
+            yield
           end
         end
       end
@@ -337,9 +344,14 @@ module Sensu
       #
       # @param client [Hash]
       # @param check [Hash]
-      # @param callback [Proc] to be called with the check history and
-      #   total state change value.
-      def check_history(client, check, &callback)
+      # @yield [history, total_state_change] callback/block to call
+      #   with the check history and calculated total state change
+      #   value.
+      # @yieldparam history [Array] containing the last 21 check
+      #   result exit status codes.
+      # @yieldparam total_state_change [Float] percentage for the
+      #   check history (exit status codes).
+      def check_history(client, check)
         history_key = "history:#{client[:name]}:#{check[:name]}"
         @redis.lrange(history_key, -21, -1) do |history|
           total_state_change = 0
@@ -356,7 +368,7 @@ module Sensu
             end
             total_state_change = (state_changes.fdiv(20) * 100).to_i
           end
-          callback.call(history, total_state_change)
+          yield(history, total_state_change)
         end
       end
 
@@ -380,7 +392,7 @@ module Sensu
       # @return [TrueClass, FalseClass]
       def check_flapping?(stored_event, check)
         if check.has_key?(:low_flap_threshold) && check.has_key?(:high_flap_threshold)
-          was_flapping = stored_event && stored_event[:action] == "flapping"
+          was_flapping = stored_event && stored_event[:action] == EVENT_FLAPPING_ACTION
           if was_flapping
             check[:total_state_change] > check[:low_flap_threshold]
           else
@@ -409,10 +421,11 @@ module Sensu
       #
       # @param client [Hash]
       # @param check [Hash]
-      # @param callback [Proc] to be called with the resulting event
-      #   data if the event registry is updated, or the check is of
-      #   type `:metric`.
-      def update_event_registry(client, check, &callback)
+      # @yield callback [event] callback/block called with the
+      #   resulting event data if the event registry is updated, or
+      #   the check is of type `:metric`.
+      # @yieldparam event [Hash]
+      def update_event_registry(client, check)
         @redis.hget("events:#{client[:name]}", check[:name]) do |event_json|
           stored_event = event_json ? MultiJson.load(event_json) : nil
           flapping = check_flapping?(stored_event, check)
@@ -429,18 +442,18 @@ module Sensu
               event[:occurrences] = stored_event[:occurrences] + 1
             end
             @redis.hset("events:#{client[:name]}", check[:name], MultiJson.dump(event)) do
-              callback.call(event)
+              yield(event)
             end
           elsif stored_event
             event[:occurrences] = stored_event[:occurrences]
             event[:action] = :resolve
             unless check[:auto_resolve] == false && !check[:force_resolve]
               @redis.hdel("events:#{client[:name]}", check[:name]) do
-                callback.call(event)
+                yield(event)
               end
             end
-          elsif check[:type] == "metric"
-            callback.call(event)
+          elsif check[:type] == METRIC_CHECK_TYPE
+            yield(event)
           end
           event_bridges(event)
         end
@@ -454,9 +467,10 @@ module Sensu
       # `false`.
       #
       # @param name [Hash] to use for the client.
-      # @param callback [Proc] to be called with the dynamically
-      #   created client data.
-      def create_client(name, &callback)
+      # @yield [client] callback/block to be called with the
+      #   dynamically created client data.
+      # @yieldparam client [Hash]
+      def create_client(name)
         client = {
           :name => name,
           :address => "unknown",
@@ -465,7 +479,7 @@ module Sensu
           :version => VERSION
         }
         update_client_registry(client) do
-          callback.call(client)
+          yield(client)
         end
       end
 
@@ -477,16 +491,17 @@ module Sensu
       # result must have a matching signature or it is discarded.
       #
       # @param result [Hash] data.
-      # @param callback [Proc] to be called with client data, either
-      #   retrieved from Redis, or dynamically created.
-      def retrieve_client(result, &callback)
+      # @yield [client] callback/block to be called with client data,
+      #   either retrieved from Redis, or dynamically created.
+      # @yieldparam client [Hash]
+      def retrieve_client(result)
         client_key = result[:check][:source] || result[:client]
         @redis.get("client:#{client_key}") do |client_json|
           unless client_json.nil?
             client = MultiJson.load(client_json)
             if client[:signature]
               if client[:signature] == result[:signature]
-                callback.call(client)
+                yield(client)
               else
                 @logger.warn("invalid check result signature", {
                   :result => result,
@@ -495,10 +510,12 @@ module Sensu
                 @logger.warn("not retrieving client from the registry", :result => result)
               end
             else
-              callback.call(client)
+              yield(client)
             end
           else
-            create_client(client_key, &callback)
+            create_client(client_key) do |client|
+              yield(client)
+            end
           end
         end
       end
@@ -1014,15 +1031,15 @@ module Sensu
       # is complete, when it is equal to `0`. The provided callback is
       # called when handling is complete.
       #
-      # @param callback [Proc] to call when event handling is
+      # @yield [] callback/block to call when event handling is
       #   complete.
-      def complete_event_handling(&callback)
+      def complete_event_handling
         @logger.info("completing event handling in progress", {
           :handling_event_count => @handling_event_count
         })
         retry_until_true do
           if @handling_event_count == 0
-            callback.call
+            yield
             true
           end
         end

data/sensu.gemspec

@@ -16,13 +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.8"
+  s.add_dependency "eventmachine", "1.0.9.1"
   s.add_dependency "sensu-logger", "1.1.0"
   s.add_dependency "sensu-settings", "3.3.0"
   s.add_dependency "sensu-extension", "1.3.0"
   s.add_dependency "sensu-extensions", "1.4.0"
-  s.add_dependency "sensu-transport", "3.3.0"
-  s.add_dependency "sensu-spawn", "1.6.0"
+  s.add_dependency "sensu-transport", "4.0.0"
+  s.add_dependency "sensu-spawn", "1.7.0"
   s.add_dependency "em-redis-unified", "1.0.1"
   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.22.0
+  version: 0.22.1
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.9.1
 - !ruby/object:Gem::Dependency
   name: sensu-logger
   requirement: !ruby/object:Gem::Requirement
@@ -115,28 +115,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: sensu-spawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: em-redis-unified
   requirement: !ruby/object:Gem::Requirement