sensu 0.16.0 → 0.17.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91fb6d60e337aca88549d8d25f0d4480ce91ad0d
-  data.tar.gz: 627a57a4f255613f0d72cc01e610858a7cf7f6bd
+  metadata.gz: 353194762fe5d578ba9a0fab7a901d3d33dd2cce
+  data.tar.gz: 5a9eeacb29a9dce4103c3847181959bb431e9cf2
 SHA512:
-  metadata.gz: cbd22b0ead3162029d213afaffeaf6932f26a9573987b44c85fb31d99b7bfa7265c32f381e819e1007ccd1b397571c5ce370f90f8dd908a44f71c66389746205
-  data.tar.gz: e3b2ac67a7c19276243ca3ae055c651c8d388e23d498a8d0426d2675c415bd09404651f746c82576140d0de823303b5ff6a472077af3b46c9b2f836a0424f2fc
+  metadata.gz: 4945f1f379551daefb88be0a0b4ede8d82719f829b414410d5e66f65f069a482d62ec7718468b98379eede3e06941a9784ae663885a68aa359d336719f7459e1
+  data.tar.gz: 9db84ddb99d930aa80f632215616985a98f8b58a2c50078d1b4fc8896013b425329b60682759238c1b34c667d92b63f6425303a04ef6dca735bab7e5d8f8c47e

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 0.17.0 - TBD
+
+### Features
+
+Improved Sensu client keepalive event check output.
+
+Hashed initial check request/execution scheduling splay, consistent over
+process restarts/reloads.
+
+Sensu event ID logged for event handler output.
+
+### Other
+
+Fixed TLS/SSL on Windows.
+
+Fixed event filtering with event action, eg. `"action": "create"`.
+
 ## 0.16.0 - 2014-10-31
 
 ### Other

data/lib/sensu/client.rb

@@ -184,18 +184,24 @@ module Sensu
       end
     end
 
+    def calculate_execution_splay(check)
+      key = [@settings[:client][:name], check[:name]].join(':')
+      splay_hash = Digest::MD5.digest(key).unpack('Q<').first
+      current_time = (Time.now.to_f * 1000).to_i
+      (splay_hash - current_time) % (check[:interval] * 1000) / 1000.0
+    end
+
     def schedule_checks(checks)
-      check_count = 0
-      stagger = testing? ? 0 : 2
       checks.each do |check|
-        check_count += 1
-        scheduling_delay = stagger * check_count % 30
-        @timers[:run] << EM::Timer.new(scheduling_delay) do
-          interval = testing? ? 0.5 : check[:interval]
-          @timers[:run] << EM::PeriodicTimer.new(interval) do
-            check[:issued] = Time.now.to_i
-            process_check(check.dup)
-          end
+        execute_check = Proc.new do
+          check[:issued] = Time.now.to_i
+          process_check(check.dup)
+        end
+        execution_splay = testing? ? 0 : calculate_execution_splay(check)
+        interval = testing? ? 0.5 : check[:interval]
+        @timers[:run] << EM::Timer.new(execution_splay) do
+          execute_check.call
+          @timers[:run] << EM::PeriodicTimer.new(interval, &execute_check)
         end
       end
     end

data/lib/sensu/constants.rb

@@ -1,6 +1,6 @@
 module Sensu
   unless defined?(Sensu::VERSION)
-    VERSION = '0.16.0'
+    VERSION = '0.17.0.beta'
 
     SEVERITIES = %w[ok warning critical unknown]
 

data/lib/sensu/daemon.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 
 gem 'multi_json', '1.10.1'
 
-gem 'sensu-em', '2.4.0'
+gem 'sensu-em', '2.4.1'
 gem 'sensu-logger', '1.0.0'
 gem 'sensu-settings', '1.2.0'
 gem 'sensu-extension', '1.0.0'

data/lib/sensu/server.rb

@@ -94,6 +94,8 @@ module Sensu
           true
         when hash_one[key].is_a?(Hash) && hash_two[key].is_a?(Hash)
           filter_attributes_match?(hash_one[key], hash_two[key])
+        when hash_one[key].to_s == hash_two[key].to_s
+          true
         when hash_one[key].is_a?(String) && hash_one[key].start_with?('eval:')
           begin
             expression = hash_one[key].gsub(/^eval:(\s+)?/, '')
@@ -263,12 +265,11 @@ module Sensu
           when 'pipe'
             options = {:data => event_data, :timeout => handler[:timeout]}
             Spawn.process(handler[:command], options) do |output, status|
-              output.each_line do |line|
-                @logger.info('handler output', {
-                  :handler => handler,
-                  :output => line
-                })
-              end
+              @logger.info('handler output', {
+                :handler => handler,
+                :output => output.lines,
+                :event_id => event[:id]
+              })
               @handlers_in_progress_count -= 1
             end
           when 'tcp'
@@ -313,12 +314,11 @@ module Sensu
             @handlers_in_progress_count -= 1
           when 'extension'
             handler.safe_run(event_data) do |output, status|
-              output.each_line do |line|
-                @logger.info('handler extension output', {
-                  :extension => handler.definition,
-                  :output => line
-                })
-              end
+              @logger.info('handler extension output', {
+                :extension => handler.definition,
+                :output => output,
+                :event_id => event[:id]
+              })
               @handlers_in_progress_count -= 1
             end
           end
@@ -506,24 +506,29 @@ module Sensu
       end
     end
 
+    def calculate_execution_splay(check)
+      splay_hash = Digest::MD5.digest(check[:name]).unpack('Q<').first
+      current_time = (Time.now.to_f * 1000).to_i
+      (splay_hash - current_time) % (check[:interval] * 1000) / 1000.0
+    end
+
     def schedule_checks(checks)
-      check_count = 0
-      stagger = testing? ? 0 : 2
       checks.each do |check|
-        check_count += 1
-        scheduling_delay = stagger * check_count % 30
-        @timers[:master] << EM::Timer.new(scheduling_delay) do
-          interval = testing? ? 0.5 : check[:interval]
-          @timers[:master] << EM::PeriodicTimer.new(interval) do
-            unless check_request_subdued?(check)
-              publish_check_request(check)
-            else
-              @logger.info('check request was subdued', {
-                :check => check
-              })
-            end
+        process_check_request = Proc.new do
+          unless check_request_subdued?(check)
+            publish_check_request(check)
+          else
+            @logger.info('check request was subdued', {
+              :check => check
+            })
           end
         end
+        execution_splay = testing? ? 0 : calculate_execution_splay(check)
+        interval = testing? ? 0.5 : check[:interval]
+        @timers[:master] << EM::Timer.new(execution_splay) do
+          process_check_request.call
+          @timers[:master] << EM::PeriodicTimer.new(interval, &process_check_request)
+        end
       end
     end
 
@@ -580,18 +585,18 @@ module Sensu
               check[:issued] = Time.now.to_i
               check[:executed] = Time.now.to_i
               time_since_last_keepalive = Time.now.to_i - client[:timestamp]
+              check[:output] = 'No keepalive sent from client for '
+              check[:output] << time_since_last_keepalive.to_s + ' seconds'
               case
               when time_since_last_keepalive >= check[:thresholds][:critical]
-                check[:output] = 'No keep-alive sent from client in over '
-                check[:output] << check[:thresholds][:critical].to_s + ' seconds'
+                check[:output] << ' (>=' + check[:thresholds][:critical].to_s + ')'
                 check[:status] = 2
               when time_since_last_keepalive >= check[:thresholds][:warning]
-                check[:output] = 'No keep-alive sent from client in over '
-                check[:output] << check[:thresholds][:warning].to_s + ' seconds'
+                check[:output] << ' (>=' + check[:thresholds][:warning].to_s + ')'
                 check[:status] = 1
               else
-                check[:output] = 'Keep-alive sent from client less than '
-                check[:output] << check[:thresholds][:warning].to_s + ' seconds ago'
+                check[:output] = 'Keepalive sent from client '
+                check[:output] << time_since_last_keepalive.to_s + ' seconds ago'
                 check[:status] = 0
               end
               publish_result(client, check)

data/sensu.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency('json') if RUBY_VERSION < "1.9"
   s.add_dependency('multi_json', '1.10.1')
   s.add_dependency('uuidtools', '2.1.4')
-  s.add_dependency('sensu-em', '2.4.0')
+  s.add_dependency('sensu-em', '2.4.1')
   s.add_dependency('sensu-logger', '1.0.0')
   s.add_dependency('sensu-settings', '1.2.0')
   s.add_dependency('sensu-extension', '1.0.0')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0.beta
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: sensu-logger
   requirement: !ruby/object:Gem::Requirement
@@ -279,9 +279,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2